Explorar o código

DK-4 fix test cleanup & sdkconfig

Bence Balint %!s(int64=3) %!d(string=hai) anos
pai
achega
8c389f40a1
Modificáronse 3 ficheiros con 16 adicións e 8 borrados
  1. 4 2
      components/dk/test/test_settings_manager.cpp
  2. 6 0
      partitions.csv
  3. 6 6
      sdkconfig

+ 4 - 2
components/dk/test/test_settings_manager.cpp

@@ -23,12 +23,14 @@ void stage1() {
     cout << "restarting in 1..." << endl;
     kbf::sleep(1000);
     esp_restart();
-};
+}
 
 void stage2() {
     auto settingsManager = SettingsManager::instance();
-
     TEST_ASSERT_FALSE(settingsManager->softAPEnabled());
+
+    settingsManager->setSoftAPEnabled(true);
+    TEST_ASSERT_TRUE(settingsManager->softAPEnabled())
 }
 
 TEST_CASE_MULTIPLE_STAGES("SettingsManager", "[settings_manager]", stage1, stage2)

+ 6 - 0
partitions.csv

@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
+nvs,      data, nvs,     0x9000,  0x6000,
+phy_init, data, phy,     0xf000,  0x1000,
+factory,  app,  factory, 0x10000, 2M,
+storage,  data, spiffs,  ,        0xF0000,

+ 6 - 6
sdkconfig

@@ -87,11 +87,11 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ="40m"
 # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
-# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
 CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
@@ -114,11 +114,11 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 #
 # Partition Table
 #
-CONFIG_PARTITION_TABLE_SINGLE_APP=y
+# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
-# CONFIG_PARTITION_TABLE_CUSTOM is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table