logging and dumping from FRAM working

UMDBPP · Mar 7, 2024 · e2f2923 · e2f2923
1 parent 1b3c91f
commit e2f2923
Show file tree

Hide file tree

Showing 9 changed files with 19,925 additions and 19,920 deletions.
diff --git a/Code/BITS/BITSv5/test/build/CMakeFiles/test.dir/test.cpp.obj b/Code/BITS/BITSv5/test/build/CMakeFiles/test.dir/test.cpp.obj
diff --git a/Code/BITS/BITSv5/test/build/test.bin b/Code/BITS/BITSv5/test/build/test.bin
diff --git a/Code/BITS/BITSv5/test/build/test.dis b/Code/BITS/BITSv5/test/build/test.dis
diff --git a/Code/BITS/BITSv5/test/build/test.elf b/Code/BITS/BITSv5/test/build/test.elf
diff --git a/Code/BITS/BITSv5/test/build/test.elf.map b/Code/BITS/BITSv5/test/build/test.elf.map
diff --git a/Code/BITS/BITSv5/test/build/test.hex b/Code/BITS/BITSv5/test/build/test.hex
diff --git a/Code/BITS/BITSv5/test/build/test.uf2 b/Code/BITS/BITSv5/test/build/test.uf2
diff --git a/Code/BITS/BITSv5/test/build/test.uf2.textClipping b/Code/BITS/BITSv5/test/build/test.uf2.textClipping
diff --git a/Code/BITS/BITSv5/test/test.cpp b/Code/BITS/BITSv5/test/test.cpp
@@ -25,9 +25,9 @@ DRF1262 radio(spi1, RADIO_CS, SCK_PIN, MOSI_PIN, MISO_PIN, TXEN_PIN, DIO1_PIN,
 MB85RS1MT mem(spi1, FRAM_CS, SCK_PIN, MOSI_PIN, MISO_PIN);
 
 static uint32_t log_addr = LOG_INIT_ADDR;
-char log_str[11] = "a b c d ef";
-char log_str1[11] = "h i j k lm";
-uint8_t log_buf[11] = {0};
+char log_str[] = "BITSv5,PRESS,TEMP,LAT,LONG,TIME\n";  // "a b c d ef"
+char log_str1[] = "0,0,0,99.9999,99.9999,0000.00\n";   //"h i j k lm"
+uint8_t log_buf = 0;
 
 Config test_config;
 
@@ -104,39 +104,47 @@ int main() {
     write_config(NAME, test_config, (uint8_t *)test_config.name,
                  sizeof(test_config.name), &mem);
 
-    printf("\n%s %s\n", __DATE__, __TIME__);
-
     printf("BITSv5 Test (Compiled %s %s)\n", __DATE__, __TIME__);
     printf("Device ID: %d\n", mem.device_id);
     read_config(NAME, test_config, (uint8_t *)test_config.name,
                 sizeof(test_config.name), &mem);
     printf("DEVICE NAME: %s\n", test_config.name);
 
     printf("Dumping FRAM\n");
-    for (log_addr = LOG_INIT_ADDR; log_addr <= LOG_INIT_ADDR + 1 + 20 * (11);
-         log_addr = log_addr + sizeof(log_buf)) {  //= log_addr + sizeof(log_buf)
+    for (log_addr = LOG_INIT_ADDR;
+         log_addr <= LOG_INIT_ADDR + 1 + 20 * (sizeof(log_str1));
+         log_addr++) {  //= log_addr + sizeof(log_buf)
         watchdog_update();
-        mem.read_memory(log_addr, log_buf, sizeof(log_buf));  // sizeof(log_buf)
-        printf("%d - %s\n", log_addr, log_buf);
-        memset(log_buf, 0, sizeof(log_buf));
+        mem.read_memory(log_addr, &log_buf, 1);  // sizeof(log_buf)
+        if (log_buf != 0) printf("%c", log_buf);
+        // printf("%d - %c\n", log_addr, log_buf);
+        // memset(log_buf, 0, sizeof(log_buf));
+        log_buf = 0;
     }
 
-    printf("Writing FRAM\n");
-    for (log_addr = LOG_INIT_ADDR; log_addr <= LOG_INIT_ADDR + 1 + 20 * (11);
-         log_addr = log_addr + sizeof(log_str)) {
+    log_addr = LOG_INIT_ADDR;
+    printf("\n\nWriting FRAM\n");
+    mem.write_memory(log_addr, (uint8_t *)log_str, sizeof(log_str));
+    printf("%d - %s\n", log_addr, log_str);
+    for (log_addr = LOG_INIT_ADDR + sizeof(log_str);
+         log_addr <= LOG_INIT_ADDR + 1 + 20 * (sizeof(log_str1));
+         log_addr = log_addr + sizeof(log_str1)) {
         // printf("%d\n", log_addr);
         watchdog_update();
 
-        log_str[1] = (char)get_rand_32();
-        log_str1[1] = (char)get_rand_32();
+        // log_str[1] = (char)get_rand_32();
+        log_str1[0] = (char)get_rand_32();
 
-        if (log_addr % 2 != 0) {
-            mem.write_memory(log_addr, (uint8_t *)log_str, sizeof(log_str));
-            printf("%d - %s\n", log_addr, log_str);
-        } else {
-            mem.write_memory(log_addr, (uint8_t *)log_str1, sizeof(log_str1));
-            printf("%d - %s\n", log_addr, log_str1);
-        }
+        mem.write_memory(log_addr, (uint8_t *)log_str1, sizeof(log_str1));
+        printf("%d - %s\n", log_addr, log_str1);
+
+        // if (log_addr % 2 != 0) {
+        //     mem.write_memory(log_addr, (uint8_t *)log_str, sizeof(log_str));
+        //     printf("%d - %s\n", log_addr, log_str);
+        // } else {
+        //     mem.write_memory(log_addr, (uint8_t *)log_str1,
+        //     sizeof(log_str1)); printf("%d - %s\n", log_addr, log_str1);
+        // }
     }
 
     read_config(NAME, test_config, (uint8_t *)test_config.name,