dok-net
diff --git a/‎cores/esp8266/core_esp8266_main.cpp
Copy file name to clipboardExpand all lines: cores/esp8266/core_esp8266_main.cpp
+17-5Lines changed: 17 additions & 5 deletions b/‎cores/esp8266/core_esp8266_main.cpp
Copy file name to clipboardExpand all lines: cores/esp8266/core_esp8266_main.cpp
+17-5Lines changed: 17 additions & 5 deletions
diff --git a/‎cores/esp8266/core_esp8266_phy.cpp
Copy file name to clipboardExpand all lines: cores/esp8266/core_esp8266_phy.cpp
+7-2Lines changed: 7 additions & 2 deletions b/‎cores/esp8266/core_esp8266_phy.cpp
Copy file name to clipboardExpand all lines: cores/esp8266/core_esp8266_phy.cpp
+7-2Lines changed: 7 additions & 2 deletions
@@ -424,6 +424,8 @@ extern "C" uint8_t uart_rx_one_char_block();
 #include "flash_hal.h"
 #endif
 
+extern "C" void user_rf_pre_init();
+
 extern "C" void ICACHE_FLASH_ATTR user_pre_init(void)
 {
     const char *flash_map_str = NULL;
@@ -623,16 +625,26 @@ extern "C" void ICACHE_FLASH_ATTR user_pre_init(void)
             uart_rx_one_char_block(); // Someone said hello - repeat message
         } while(true);
     }
+    /*
+      The function user_rf_pre_init() is no longer called from SDK 3.0 and up.
+      The SDK manual and release notes skipped this detail. The 2023 ESP-FAQ
+      hints at the change with "* Call system_phy_set_powerup_option(3) in
+      function user_pre_init or user_rf_pre_init"
+      https://docs.espressif.com/_/downloads/espressif-esp-faq/en/latest/pdf/#page=14
+
+      Add call to user_rf_pre_init(), so we can still perform early calls like
+      system_phy_set_rfoption(rf_mode), system_phy_set_powerup_option(2), etc.
+
+      Placement, should this be at the beginning or end of user_pre_init()?
+      By the end, we have registered the PHY_DATA partition; however, PHY_DATA
+      read occurs after return and before user_init() is called.
+    */
+    user_rf_pre_init();
 }
 #endif // #if (NONOSDK >= (0x30000))
 
 extern "C" void user_init(void) {
 
-#if (NONOSDK >= (0x30000))
-    extern void user_rf_pre_init();
-    user_rf_pre_init(); // Stop spoofing logic
-#endif
-
     struct rst_info *rtc_info_ptr = system_get_rst_info();
     memcpy((void *) &resetInfo, (void *) rtc_info_ptr, sizeof(resetInfo));
 
 
@@ -320,6 +320,9 @@ extern int IRAM_ATTR __wrap_spi_flash_read(uint32_t addr, uint32_t* dst, size_t
         return __real_spi_flash_read(addr, dst, size);
     }
 
+#if (NONOSDK >= (0x30000))
+    spoof_init_data = false;
+#endif
     memcpy(dst, phy_init_data, sizeof(phy_init_data));
     ((uint8_t*)dst)[107] = __get_adc_mode();
     return 0;
@@ -340,13 +343,13 @@ extern int __get_adc_mode(void)
 extern void __run_user_rf_pre_init(void) __attribute__((weak));
 extern void __run_user_rf_pre_init(void)
 {
-    return; // default do noting
+    return; // default do nothing
 }
 
 #if (NONOSDK >= (0x30000))
 void sdk3_begin_phy_data_spoof(void)
 {
-   spoof_init_data = true;
+    spoof_init_data = true;
 }
 #else
 uint32_t user_rf_cal_sector_set(void)
@@ -359,7 +362,9 @@ uint32_t user_rf_cal_sector_set(void)
 void user_rf_pre_init()
 {
     // *((volatile uint32_t*) 0x60000710) = 0;
+#if (NONOSDK < (0x30000))
     spoof_init_data = false;
+#endif
 
     int rf_mode = __get_rf_mode();
     if (rf_mode >= 0) {
Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,9 @@ extern int IRAM_ATTR __wrap_spi_flash_read(uint32_t addr, uint32_t* dst, size_t`
`320`	`320`	`return __real_spi_flash_read(addr, dst, size);`
`321`	`321`	`}`
`322`	`322`
	`323`	`+#if (NONOSDK >= (0x30000))`
	`324`	`+ spoof_init_data = false;`
	`325`	`+#endif`
`323`	`326`	`memcpy(dst, phy_init_data, sizeof(phy_init_data));`
`324`	`327`	`((uint8_t*)dst)[107] = __get_adc_mode();`
`325`	`328`	`return 0;`
`@@ -340,13 +343,13 @@ extern int __get_adc_mode(void)`
`340`	`343`	`extern void __run_user_rf_pre_init(void) __attribute__((weak));`
`341`	`344`	`extern void __run_user_rf_pre_init(void)`
`342`	`345`	`{`
`343`		`- return; // default do noting`
	`346`	`+ return; // default do nothing`
`344`	`347`	`}`
`345`	`348`
`346`	`349`	`#if (NONOSDK >= (0x30000))`
`347`	`350`	`void sdk3_begin_phy_data_spoof(void)`
`348`	`351`	`{`
`349`		`- spoof_init_data = true;`
	`352`	`+ spoof_init_data = true;`
`350`	`353`	`}`
`351`	`354`	`#else`
`352`	`355`	`uint32_t user_rf_cal_sector_set(void)`
`@@ -359,7 +362,9 @@ uint32_t user_rf_cal_sector_set(void)`
`359`	`362`	`void user_rf_pre_init()`
`360`	`363`	`{`
`361`	`364`	`// ((volatile uint32_t) 0x60000710) = 0;`
	`365`	`+#if (NONOSDK < (0x30000))`
`362`	`366`	`spoof_init_data = false;`
	`367`	`+#endif`
`363`	`368`
`364`	`369`	`int rf_mode = __get_rf_mode();`
`365`	`370`	`if (rf_mode >= 0) {`