fix mem init

README.md

@@ -43,7 +43,7 @@ Open it using eg. `picocom`, or with the included `debug.sh` script.
 
 For dependencies to compile, on Arch install these.
 
-    sudo pacman -S arm-none-eabi-gcc arm-none-eabi-newlib picocom cmake
+    sudo pacman -S arm-none-eabi-gcc arm-none-eabi-newlib picocom cmake cxxtest
 
 ## Proper Debugging
 

src/console.c

@@ -103,6 +103,7 @@ static void cnsl_interpret(const char *line) {
         println("  mount - make mass storage medium (un)available");
         println("  power - show Lipo battery status");
         println("   memr - reset flash memory config");
+        println("     bl - print backlight pwm level");
         println("");
         println("   scan - start or stop BLE scan");
         println("scanres - print list of found BLE devices");
@@ -156,6 +157,8 @@ static void cnsl_interpret(const char *line) {
     } else if (strcmp(line, "memr") == 0) {
         mem_load_defaults();
         mem_write();
+    } else if (strcmp(line, "bl") == 0) {
+        println("bl: 0x%04X", mem_data()->backlight);
     } else if (strcmp(line, "scan") == 0) {
         ble_scan(BLE_SCAN_TOGGLE);
     } else if (strcmp(line, "scanres") == 0) {

src/mem.c

@@ -48,7 +48,8 @@ struct mem_contents {
     .data = MEM_DATA_INIT,  \
 }
 
-static struct mem_contents data_ram = MEM_CONTENTS_INIT;
+static const struct mem_contents data_defaults = MEM_CONTENTS_INIT;
+static struct mem_contents data_ram = data_defaults;
 static const uint8_t *data_flash = (const uint8_t *)(XIP_BASE + FLASH_OFFSET);
 
 static_assert(sizeof(struct mem_contents) < FLASH_SECTOR_SIZE,
@@ -78,6 +79,8 @@ static uint32_t calc_checksum(const struct mem_contents *data) {
 }
 
 void mem_load_defaults(void) {
+    data_ram = data_defaults;
+
     data_ram.data.wf_count = wf_default_count;
     for (uint16_t i = 0; i < wf_default_count; i++) {
         data_ram.data.wf[i] = wf_default_data[i];