muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EM-60 Additional changes

Browse Source
This commit is contained in:
saifullah-N
2023-01-22 09:11:33 +05:30
parent f632293aca
commit ed1a72479a
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/avr/src/spindle.c
View File

@@ -33,6 +33,7 @@
#include "config.h" #include "config.h"
#include "command.h" #include "command.h"
#include "exec.h" #include "exec.h"
#include "estop.h"
#include "util.h" #include "util.h"
#include "state.h" #include "state.h"
@@ -94,6 +95,8 @@ static void _set_speed(float speed) {
float power = _speed_to_power(speed); float power = _speed_to_power(speed);
if (estop_triggered()) power = 0;
switch (spindle.type) { switch (spindle.type) {
case SPINDLE_TYPE_DISABLED: break; case SPINDLE_TYPE_DISABLED: break;

2
src/js/modbus-reg.js
View File

@@ -8,7 +8,7 @@ module.exports = {
computed: { computed: {
has_user_value: function() { has_user_value: function() {
const type = this.model["reg-type"]; const type = this.model["reg-type"];
return type.indexOf("write") != -1 || type.indexOf("fixed") != -1; return type.includes("write") || type.includes("fixed") || type.includes("scaled");
} }
}, },

2
src/pug/templates/tool-view.pug
View File

@@ -43,7 +43,7 @@ script#tool-view-template(type="text/x-template")
label.units RPM label.units RPM
fieldset.modbus-program( fieldset.modbus-program(
v-if="is_modbus && this.tool_type != 'HUANYANG VFD'") v-if="is_modbus && tool_type != 'HUANYANG VFD' && tool_type != 'EM60'")
h2 Active Modbus Program h2 Active Modbus Program
p(v-if="$root.modified") p(v-if="$root.modified")
| (Click #[tt(class="save") Save] to activate the selected | (Click #[tt(class="save") Save] to activate the selected