From 7375f9ff58d9df1d9d74e4d466206a8bea172cda Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Wed, 26 Feb 2020 14:29:17 +0800 Subject: [PATCH] feat(wear_levelling): modify wear_levelling for ESP8266 --- components/wear_levelling/crc32.cpp | 2 +- components/wear_levelling/test/test_wl.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/components/wear_levelling/crc32.cpp b/components/wear_levelling/crc32.cpp index 982c5b1c..52147f4e 100644 --- a/components/wear_levelling/crc32.cpp +++ b/components/wear_levelling/crc32.cpp @@ -12,7 +12,7 @@ // limitations under the License. #include "crc32.h" -#include "esp32/rom/crc.h" +#include "rom/crc.h" unsigned int crc32::crc32_le(unsigned int crc, unsigned char const *buf, unsigned int len) { diff --git a/components/wear_levelling/test/test_wl.c b/components/wear_levelling/test/test_wl.c index 63b44951..ecbf7e08 100644 --- a/components/wear_levelling/test/test_wl.c +++ b/components/wear_levelling/test/test_wl.c @@ -2,17 +2,25 @@ #include #include "unity.h" #include "wear_levelling.h" +#include "esp_system.h" +#include "esp_timer.h" #include "test_utils.h" #include "freertos/FreeRTOS.h" -#include "freertos/portable.h" +//#include "freertos/portable.h" #include "freertos/task.h" #include "freertos/semphr.h" #ifdef CONFIG_IDF_TARGET_ESP32 #include "esp32/clk.h" +#include "soc/cpu.h" #elif defined(CONFIG_IDF_TARGET_ESP32S2BETA) #include "esp32s2beta/clk.h" -#endif #include "soc/cpu.h" +#elif CONFIG_IDF_TARGET_ESP8266 +#include "esp_clk.h" +#endif + +#define xPortGetFreeHeapSize() esp_get_free_heap_size() +#define RSR(_c, _t) _t = (uint32_t) esp_timer_get_time() TEST_CASE("wl_unmount doesn't leak memory", "[wear_levelling]") { @@ -101,7 +109,7 @@ static void read_write_task(void* param) esp_err_t err; srand(args->seed); for (size_t i = 0; i < args->word_count; ++i) { - uint32_t val = rand(); + uint32_t val = i * 77; if (args->write) { err = wl_write(args->handle, args->offset + i * sizeof(val), &val, sizeof(val)); if (err != ESP_OK) {