1.0.0

digistump · Mar 13, 2016 · c12dc1cad274b1487153b6e012aac52db100935b · c12dc1c
1 parent 0c2a0b0
commit c12dc1cad274b1487153b6e012aac52db100935b
Unified Split

Showing with 11 additions and 10 deletions.

+9 −8 cores/oak/OakParticle/particle_core.cpp

+2 −2 cores/oak/OakParticle/particle_globals.h
diff --git a/cores/oak/OakParticle/particle_core.cpp b/cores/oak/OakParticle/particle_core.cpp
@@ -1722,16 +1722,17 @@ bool handle_update_begin(msg& message)
                 deviceConfig->system_update_pending = 1;
                 writeDeviceConfig();
               }
-              else if(deviceConfig->system_update_pending == 1){
-                set_oakboot_defaults(0);
-                deviceConfig->system_update_pending = 2;
-                writeDeviceConfig();
-              }
-              else{
+            }
+              //else if(deviceConfig->system_update_pending == 1){
+              //  set_oakboot_defaults(0);
+              //  deviceConfig->system_update_pending = 2;
+              //  writeDeviceConfig();
+              //}
+              /*else{
                 reboot_to_fallback_updater();
-              }
+              }*/
 
-            }
+           // }
 
         }
     }

diff --git a/cores/oak/OakParticle/particle_globals.h b/cores/oak/OakParticle/particle_globals.h
@@ -8,10 +8,10 @@
 
 #define PRODUCT_ID 82
 #define PLATFORM_ID 82
-#define OAK_SYSTEM_VERSION_INTEGER 5
+#define OAK_SYSTEM_VERSION_INTEGER 6
 #define OAK_SYSTEM_VERSION_MAJOR 1
 #define OAK_SYSTEM_VERSION_MINOR 0
-#define OAK_SYSTEM_VERSION_RELEASE 2
+#define OAK_SYSTEM_VERSION_RELEASE 0
 
 
 typedef enum