Fix flags reg

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d508babb25ba9bba41e53c03d2bd88f259a729d..276b46553e9542a27a2f5cda7937f5513f7651c8 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Buildbotics CNC Controller Firmware Change Log
 ==============================================
 
+## v0.3.8
+ -
+
 ## v0.3.7
  - Allow blocking error dialog for a period of time
  - Show actual error message on planner errors
@@ -47,3 +50,6 @@ Buildbotics CNC Controller Firmware Change Log
  - Search and latch velocity mm/min -> m/min
  - Fixed password update (broken in last version)
  - Start Web server eariler in case of Python coding errors
+
+
+Change log not maintained in previous versions.  See git commit log.

diff --git a/package.json b/package.json
index b6fd328859b314c720960ace2307a6bb628de582..6de87946d5d82a535b8bce0168c20a74b7a87da6 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bbctrl",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "homepage": "http://buildbotics.com/",
   "repository": "https://github.com/buildbotics/bbctrl-firmware",
   "license": "GPL-3.0+",

diff --git a/src/pwr/main.c b/src/pwr/main.c
index 42eae1d14db07d946a8766efbcd2c4e5433e7af8..c722b5853c1a61731ca4dd38608820e36febeade 100644 (file)
--- a/src/pwr/main.c
+++ b/src/pwr/main.c
@@ -378,8 +378,6 @@ void init() {
 
 
 static void shutdown(uint16_t flags) {
-  regs[FLAGS_REG] = flags;
-
   // Disable timers
   TCCR0B = TCCR1B = 0;
 
@@ -437,6 +435,7 @@ int main() {
     if (loads[0].limit) flags |= LOAD1_LIMITING_FLAG;
     if (loads[1].limit) flags |= LOAD2_LIMITING_FLAG;
 
+    regs[FLAGS_REG] = flags;
     if (flags & FATAL_FLAG_MASK) shutdown(flags);
   }