Fixed pwr flags display

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 276b46553e9542a27a2f5cda7937f5513f7651c8..d27a69a6a4c0fee866df541fa9dee952b50b5f3b 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ Buildbotics CNC Controller Firmware Change Log
 ==============================================
 
 ## v0.3.8
- -
+ - Fixed pwr flags display
 
 ## v0.3.7
  - Allow blocking error dialog for a period of time

diff --git a/src/pwr/main.c b/src/pwr/main.c
index c722b5853c1a61731ca4dd38608820e36febeade..9ab2509b85e7edfe9ee315829d3f0ff764c8565a 100644 (file)
--- a/src/pwr/main.c
+++ b/src/pwr/main.c
@@ -245,9 +245,9 @@ static void read_conversion(uint8_t ch) {
   uint16_t data = ADC;
 
   switch (ch) {
-  case TEMP_ADC: regs[TEMP_REG]  = data; break; // in Kelvin
-  case VIN_ADC:  regs[VIN_REG]   = convert_voltage(data); break;
-  case VOUT_ADC: regs[VOUT_REG]  = convert_voltage(data); break;
+  case TEMP_ADC: regs[TEMP_REG] = data; break; // in Kelvin
+  case VIN_ADC:  regs[VIN_REG]  = convert_voltage(data); break;
+  case VOUT_ADC: regs[VOUT_REG] = convert_voltage(data); break;
 
   case CS1_ADC:
     regs[MOTOR_REG] = convert_current(data);

diff --git a/src/py/bbctrl/Pwr.py b/src/py/bbctrl/Pwr.py
index 30798ec08a9e55c8e6b365de9b9a71c7f136c11b..aa3e7b9d6fbf7f65e371a2e7fde8e3de73a04766 100644 (file)
--- a/src/py/bbctrl/Pwr.py
+++ b/src/py/bbctrl/Pwr.py
@@ -124,6 +124,7 @@ class Pwr():
                 value = self.ctrl.i2c.read_word(self.i2c_addr + i)
 
                 if i == TEMP_REG: value -= 273
+                elif i == FLAGS_REG: pass
                 else: value /= 100.0
 
                 key = reg_names[i]
@@ -140,10 +141,10 @@ class Pwr():
             self.ctrl.ioloop.call_later(1, self._update)
             return
 
-        self.lcd_page.text('%3dC   Tmp'   % self.regs[TEMP_REG], 0, 0)
-        self.lcd_page.text('%5.1fV  In'   % self.regs[VIN_REG],  0, 1)
-        self.lcd_page.text('%5.1fV Out'   % self.regs[VOUT_REG], 0, 2)
-        self.lcd_page.text(' %02d    Flg' % self.regs[FLAGS_REG], 0, 3)
+        self.lcd_page.text('%3dC   Tmp' % self.regs[TEMP_REG],  0, 0)
+        self.lcd_page.text('%5.1fV  In' % self.regs[VIN_REG],   0, 1)
+        self.lcd_page.text('%5.1fV Out' % self.regs[VOUT_REG],  0, 2)
+        self.lcd_page.text(' %04x  Flg' % self.regs[FLAGS_REG], 0, 3)
 
         self.lcd_page.text('%5.1fA Mot' % self.regs[MOTOR_REG], 10, 0)
         self.lcd_page.text('%5.1fA Ld1' % self.regs[LOAD1_REG], 10, 1)