From e8c333ab19a34faaa9b92b06420d85650c2f7e24 Mon Sep 17 00:00:00 2001 From: Joseph Coffland Date: Sat, 21 Jul 2018 17:35:02 -0700 Subject: [PATCH] Reset VFD failures --- src/avr/src/vars.def | 2 +- src/avr/src/vfd_spindle.c | 5 +++++ src/jade/templates/tool-view.jade | 4 +++- src/js/tool-view.js | 8 ++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/avr/src/vars.def b/src/avr/src/vars.def index 6ba73c0..d16957c 100644 --- a/src/avr/src/vars.def +++ b/src/avr/src/vars.def @@ -109,7 +109,7 @@ VAR(vfd_status, vs, u16, 0, 0, 1) // VFD status VAR(vfd_reg_type, vt, u8, VFDREG, 1, 1) // VFD register type VAR(vfd_reg_addr, va, u16, VFDREG, 1, 1) // VFD register address VAR(vfd_reg_val, vv, u16, VFDREG, 1, 1) // VFD register value -VAR(vfd_reg_fails, vr, u8, VFDREG, 0, 1) // VFD register fail count +VAR(vfd_reg_fails, vr, u8, VFDREG, 1, 1) // VFD register fail count // Huanyang spindle VAR(hy_freq, hz, f32, 0, 0, 1) // Huanyang actual freq diff --git a/src/avr/src/vfd_spindle.c b/src/avr/src/vfd_spindle.c index f70e1d2..53bec20 100644 --- a/src/avr/src/vfd_spindle.c +++ b/src/avr/src/vfd_spindle.c @@ -402,3 +402,8 @@ void set_vfd_reg_val(int reg, uint16_t value) { uint8_t get_vfd_reg_fails(int reg) {return regs[reg].fails;} + + +void set_vfd_reg_fails(int reg, uint8_t value) { + regs[reg].fails = value; +} diff --git a/src/jade/templates/tool-view.jade b/src/jade/templates/tool-view.jade index cc27e19..e889502 100644 --- a/src/jade/templates/tool-view.jade +++ b/src/jade/templates/tool-view.jade @@ -73,7 +73,9 @@ script#tool-view-template(type="text/x-template") td.reg-fails {{get_reg_fails(reg)}} button.pure-button-secondary(@click="customize") Customize - button.pure-button-secondary(@click="clear") Clear + button.pure-button-secondary(@click="clear", + v-if="tool_type == 'CUSTOM MODBUS VFD'") Clear + button.pure-button-secondary(@click="reset_failures") Reset Failures fieldset(v-if="tool_type == 'CUSTOM MODBUS VFD'") h2 Edit Modbus Program diff --git a/src/js/tool-view.js b/src/js/tool-view.js index 485290b..fab70c8 100644 --- a/src/js/tool-view.js +++ b/src/js/tool-view.js @@ -133,6 +133,14 @@ module.exports = { } this.$dispatch('config-changed'); + }, + + + reset_failures: function (e) { + e.preventDefault(); + var regs = this.config['modbus-spindle'].regs; + for (var reg = 0; reg < regs.length; reg++) + this.$dispatch('send', '\$' + reg + 'vr=0'); } } } -- 2.27.0