From 1a40bc8a94986efc98d0b24f29299f468b5a0180 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Wed, 22 Sep 2021 18:24:31 +0100 Subject: [PATCH] split config write --- testlib/esp_dut.py | 11 ++++++----- testlib/testconfig/testconfig.json | 1 + testlib/tests/test_basic.py | 9 +++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 testlib/testconfig/testconfig.json diff --git a/testlib/esp_dut.py b/testlib/esp_dut.py index 8e3070b..b77faea 100644 --- a/testlib/esp_dut.py +++ b/testlib/esp_dut.py @@ -35,17 +35,18 @@ class EspDut: self.serial = None self.flash = EspFlash(self.port) - def writeFlash(self, bin_dir, fs_path=None): + def writeFlash(self, bin_dir): self.flash.erase() - if fs_path: - fs_bin = "spiffs.bin" - self.flash.make_spiffs(fs_path, fs_bin) - self.flash.write("2686976", fs_bin) self.flash.write("0x1000", f"{bin_dir}/bootloader_dio_40m.bin") self.flash.write("0x8000", f"{bin_dir}/partitions.bin") self.flash.write("0xe000", f"{bin_dir}/boot_app0.bin") self.flash.write("0x10000", f"{bin_dir}/firmware.bin") + def writeConfig(self, fs_path): + fs_bin = "spiffs.bin" + self.flash.make_spiffs(fs_path, fs_bin) + self.flash.write("0x290000", fs_bin) + def openPort(self): self.serial = serial.Serial(self.port, 115200, timeout=0) diff --git a/testlib/testconfig/testconfig.json b/testlib/testconfig/testconfig.json new file mode 100644 index 0000000..fe51488 --- /dev/null +++ b/testlib/testconfig/testconfig.json @@ -0,0 +1 @@ +[] diff --git a/testlib/tests/test_basic.py b/testlib/tests/test_basic.py index 28d7b79..31f675d 100644 --- a/testlib/tests/test_basic.py +++ b/testlib/tests/test_basic.py @@ -1,4 +1,5 @@ from testlib.esp_dut import ESP +from testlib.aprs_con import APRSIS def test_basic_port(ESP): @@ -13,6 +14,14 @@ def test_flash(ESP): ESP.flash.verify("0x8000", f"{bin_dir}/partitions.bin") ESP.flash.verify("0xe000", f"{bin_dir}/boot_app0.bin") ESP.flash.verify("0x10000", f"{bin_dir}/firmware.bin") + + +def test_flash_config(ESP): + config_dir = "testconfig" + ESP.writeConfig(config_dir) + + +def test_erase(ESP): ESP.flash.erase()