Beta 5

boards.txt

@@ -9,53 +9,7 @@ menu.RomConfig=ROM Config
 
 ##############################################################
 
-oak6.name=Oak by Digistump (Pin 6 Safe Mode - Default)
-
-oak6.upload.tool=oak_ota
-oak6.upload.speed=115200
-oak6.upload.resetmethod=ck
-oak6.upload.maximum_size=1040368
-oak6.upload.maximum_data_size=81920
-oak6.upload.wait_for_upload_port=false
-oak6.serial.disableDTR=true
-oak6.serial.disableRTS=true
-
-oak6.build.mcu=esp8266
-oak6.build.f_cpu=80000000L
-oak6.build.board=ESP8266_OAK
-oak6.build.core=oak
-oak6.build.variant=oak6
-oak6.build.flash_mode=qio
-oak6.build.flash_freq=40
-oak6.build.spiffs_pagesize=256
-
-
-oak6.menu.CpuFrequency.80=80 MHz
-oak6.menu.CpuFrequency.80.build.f_cpu=80000000L
-oak6.menu.CpuFrequency.160=160 MHz
-oak6.menu.CpuFrequency.160.build.f_cpu=160000000L
-
-oak6.menu.UploadTool.oak_ota=Particle OTA
-oak6.menu.UploadTool.oak_ota.upload.tool=oak_ota
-oak6.menu.UploadTool.oak_ota.upload.verbose=-vv
-oak6.menu.UploadTool.esptool_py=Serial (Expert Use Only - Requires Python)
-oak6.menu.UploadTool.esptool_py.upload.tool=esptool_py
-oak6.menu.UploadTool.esptool_py.upload.verbose=-vv
-
-oak6.menu.FlashSize.OAK=OAK (4M/1M SPIFFS)
-#this is in megabits - only needed for serial upload
-oak6.menu.FlashSize.OAK.build.flash_size=32m
-oak6.menu.FlashSize.OAK.build.spiffs_start=0x300000
-oak6.menu.FlashSize.OAK.build.spiffs_end=0x3FB000
-oak6.menu.FlashSize.OAK.build.spiffs_blocksize=8192
-oak6.menu.FlashSize.OAK.build.spiffs_pagesize=256
-
-oak6.menu.RomConfig.Full=Single - 1MB (Fullsize)
-oak6.menu.RomConfig.Full.build.flash_ld=oak_full.ld
-oak6.menu.RomConfig.Full.upload.maximum_size=1040368
-oak6.menu.RomConfig.Full.upload.flash_address=0x0002000
-
-oak1.name=Oak by Digistump (Pin 1 Safe Mode - Alternative)
+oak1.name=Oak by Digistump (Pin 1 Safe Mode - Default)
 
 oak1.upload.tool=oak_ota
 oak1.upload.speed=115200

cores/oak/OakParticle/particle_core.cpp

@@ -3505,8 +3505,8 @@ String info_response(void){
   else
     response += "-1,";
 
-    response += ",\"firmware_version\":";
-  response += deviceConfig->firmware_version;
+    response += ",\"system_version\":";
+  response += deviceConfig->system_version;
     response += ",\"version_string\":\"";
   response += deviceConfig->version_string;
   response += "\",\"meta_id\":";
@@ -3880,7 +3880,7 @@ void check_safe_mode(void){
   pinMode(SAFE_MODE_PIN,INPUT_PULLUP);
   if(digitalRead(SAFE_MODE_PIN) == LOW){
       uint32_t startHold = millis();
-      while(millis() - startHold < 100){
+      while(millis() - startHold < 50){
           if(digitalRead(SAFE_MODE_PIN) == HIGH)
               return;
       }

cores/oak/core_esp8266_main.cpp

@@ -100,6 +100,7 @@ extern "C" void optimistic_yield(uint32_t interval_us) {
 static void loop_wrapper() {
     static bool setup_done = false;
     if(!setup_done) {
+        checkSafeMode();
         Particle.connect(true);
         setup();
         setup_done = true;
@@ -143,7 +144,7 @@ extern "C" void user_init(void) {
 
     init();
 
-    checkSafeMode();
+    //checkSafeMode();
 
     initVariant();