Merge branch 'master' into master

SooDragon · web-flow · commit a037ef169bf8 · 2024-04-15T23:03:00.000+09:00
diff --git a/libraries/Update/src/Updater.cpp b/libraries/Update/src/Updater.cpp
@@ -228,7 +228,7 @@ bool UpdateClass::setCryptMode(const int cryptMode){
     if(cryptMode >= U_AES_DECRYPT_NONE && cryptMode <= U_AES_DECRYPT_ON){
         _cryptMode = cryptMode;
     }else{
-        log_e("bad crypt mode arguement %i", cryptMode);
+        log_e("bad crypt mode argument %i", cryptMode);
         return false;
     }
     return true;
diff --git a/libraries/WiFi/src/WiFiGeneric.cpp b/libraries/WiFi/src/WiFiGeneric.cpp
@@ -686,6 +686,7 @@ bool WiFiGenericClass::initiateFTM(uint8_t frm_count, uint16_t burst_period, uin
     .channel = channel,
     .frm_count = frm_count,
     .burst_period = burst_period,
+    .use_get_report_api = true
   };
   if(mac != NULL){
     memcpy(ftmi_cfg.resp_mac, mac, 6);
diff --git a/variants/roboheart_hercules/pins_arduino.h b/variants/roboheart_hercules/pins_arduino.h
@@ -15,7 +15,7 @@
 
 #define SLEEP_MOTOR_ABC 2  //  nSLEEP 
 
-#define LED_ROBOHEART 14  // Built in LED
+#define LED_ROBOHEART 13  // Built in LED
 #define BUILTIN_LED LED_ROBOHEART // backward compatibility
 #define LED_BUILTIN LED_ROBOHEART
 

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ bool UpdateClass::setCryptMode(const int cryptMode){`
`228`	`228`	`if(cryptMode >= U_AES_DECRYPT_NONE && cryptMode <= U_AES_DECRYPT_ON){`
`229`	`229`	`_cryptMode = cryptMode;`
`230`	`230`	`}else{`
`231`		`- log_e("bad crypt mode arguement %i", cryptMode);`
	`231`	`+ log_e("bad crypt mode argument %i", cryptMode);`
`232`	`232`	`return false;`
`233`	`233`	`}`
`234`	`234`	`return true;`