From c12dc1cad274b1487153b6e012aac52db100935b Mon Sep 17 00:00:00 2001 From: Erik Kettenburg Date: Sun, 13 Mar 2016 04:57:08 -0700 Subject: [PATCH] 1.0.0 --- cores/oak/OakParticle/particle_core.cpp | 17 +++++++++-------- cores/oak/OakParticle/particle_globals.h | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cores/oak/OakParticle/particle_core.cpp b/cores/oak/OakParticle/particle_core.cpp index 7fd5d33..372dd63 100644 --- 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 index 91ae831..d563dd9 100644 --- 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