Skip to content

Commit ddc2979

Browse files
committed
Fix Issues from testing
1 parent 05efb83 commit ddc2979

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

targets/ESP32/CMakePresets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@
707707
"hidden": false,
708708
"cacheVariables": {
709709
"TARGET_NAME": "${presetName}",
710-
"SDK_CONFIG_FILE": "",
710+
"SDK_CONFIG_FILE": "sdkconfig.default_nopsram.esp32",
711711
"NF_BUILD_RTM": "OFF",
712712
"NF_FEATURE_DEBUGGER": "ON",
713713
"NF_FEATURE_RTC": "ON",
@@ -729,7 +729,7 @@
729729
"hidden": false,
730730
"cacheVariables": {
731731
"TARGET_NAME": "${presetName}",
732-
"SDK_CONFIG_FILE": "",
732+
"SDK_CONFIG_FILE": "sdkconfig.default_nopsram.esp32",
733733
"NF_BUILD_RTM": "OFF",
734734
"NF_FEATURE_DEBUGGER": "ON",
735735
"NF_FEATURE_RTC": "ON",

targets/ESP32/_IDF/esp32/partitions_nanoclr_16mb.csv

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
###############################################################################################################################
77
nvs, data, nvs, 0x9000, 0x6000,
88
phy_init, data, phy, 0xf000, 0x1000,
9-
# Factory area for nanoCLR - 1728k
10-
factory, app, factory, 0x10000, 0x1C0000,
11-
# Deployment area for Managed code 2816K, Mapping issues with deployment areas over 3.5Mb, see issue #691
12-
deploy, data, 0x84, 0x1D0000, 0x2C0000,
9+
# Factory area for nanoCLR - 1856k
10+
factory, app, factory, 0x10000, 0x1D0000,
11+
# Deployment area for Managed code 2752K, Mapping issues with deployment areas over 3.5Mb, see issue #691
12+
deploy, data, 0x84, 0x1E0000, 0x2B0000,
1313
# Config data for Network, Wireless, certificates, user data 3MB
1414
config, data, littlefs, 0x490000, 0x300000,
1515
##########################################

targets/ESP32/_IDF/esp32/partitions_nanoclr_2mb.csv

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
###############################################################################################################################
77
nvs, data, nvs, 0x9000, 0x6000,
88
phy_init, data, phy, 0xf000, 0x1000,
9-
# Factory area for nanoCLR - 1728k
10-
factory, app, factory, 0x10000, 0x1B0000,
11-
# Deployment area for Managed code 192k
12-
deploy, data, 0x84, 0x1C0000, 0x30000,
9+
# Factory area for nanoCLR - 1856k
10+
factory, app, factory, 0x10000, 0x1D0000,
11+
# Deployment area for Managed code 64k
12+
deploy, data, 0x84, 0x1E0000, 0x10000,
1313
# Config data for Network, Wireless, certificates, user data 64k
1414
config, data, littlefs, 0x1F0000, 0x10000,
1515
#################################

targets/ESP32/_IDF/esp32/partitions_nanoclr_4mb.csv

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
###############################################################################################################################
77
nvs, data, nvs, 0x9000, 0x6000,
88
phy_init, data, phy, 0xf000, 0x1000,
9-
# Factory area for nanoCLR - 1728k
10-
factory, app, factory, 0x10000, 0x1C0000,
11-
# Deployment area for Managed code 1856k
12-
deploy, data, 0x84, 0x1D0000, 0x1D0000,
9+
# Factory area for nanoCLR - 1856k
10+
factory, app, factory, 0x10000, 0x1D0000,
11+
# Deployment area for Managed code 1792k
12+
deploy, data, 0x84, 0x1E0000, 0x1C0000,
1313
# Config data for Network, Wireless, certificates, user data 256k
1414
config, data, littlefs, 0x3C0000, 0x40000,
1515
#################################

targets/ESP32/_IDF/esp32/partitions_nanoclr_8mb.csv

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
###############################################################################################################################
77
nvs, data, nvs, 0x9000, 0x6000,
88
phy_init, data, phy, 0xf000, 0x1000,
9-
# Factory area for nanoCLR - 1728k
10-
factory, app, factory, 0x10000, 0x1C0000,
11-
# Deployment area for Managed code 2816K, Mapping issues with deployment areas over 3.5Mb, see issue #691
12-
deploy, data, 0x84, 0x1D0000, 0x2C0000,
9+
# Factory area for nanoCLR - 1856k
10+
factory, app, factory, 0x10000, 0x1D0000,
11+
# Deployment area for Managed code 2752K, Mapping issues with deployment areas over 3.5Mb, see issue #691
12+
deploy, data, 0x84, 0x1E0000, 0x2B0000,
1313
# Config data for Network, Wireless, certificates, user data 2Mb
1414
config, data, littlefs, 0x490000, 0x200000,
1515
##########################################

targets/ESP32/_common/targetHAL_Network.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ static void event_handler(void *arg, esp_event_base_t event_base, int32_t event_
378378
if (result != ESP_OK)
379379
{
380380
#ifdef PRINT_NET_EVENT
381-
ets_printf("Failed to configure network for ethernet on connect: %d\n", err);
381+
ets_printf("Failed to configure network for ethernet on connect: %d\n", result);
382382
#endif
383383
}
384384

0 commit comments

Comments
 (0)