Tested configuration loading

scottbez1 · May 14, 2024 · 3f06e88 · 3f06e88
1 parent 802aaca
commit 3f06e88
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/arduino/splitflap/Splitflap/config.h b/arduino/splitflap/Splitflap/config.h
@@ -21,22 +21,22 @@
 #define HOME_CALIBRATION_ENABLED true
 
 // 3) Flap Contents & Order
-#define NUM_FLAPS (40)
+#define NUM_FLAPS (52)
 
 // This should match the order of flaps on the spool, with the first being the
 // "home" flap.
-// const uint8_t flaps[NUM_FLAPS] = {
-//   ' ', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
-//   'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
-//   'Z', 'g', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'r',
-//   '.', '?', '-', '$', '\'', '#', 'y', 'p', ',', '!', '~', '&', 'w'
-// };
 const uint8_t flaps[NUM_FLAPS] = {
   ' ', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
   'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
   'Z', 'g', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'r',
-  '.',
+  '.', '?', '-', '$', '\'', '#', 'y', 'p', ',', '!', '~', '&', 'w'
 };
+// const uint8_t flaps[NUM_FLAPS] = {
+//   ' ', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+//   'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
+//   'Z', 'g', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'r',
+//   '.',
+// };
 
 // 4) Hardware configuration and features
 #ifndef SPLITFLAP_PIO_HARDWARE_CONFIG

diff --git a/arduino/splitflap/esp32/core/configuration.cpp b/arduino/splitflap/esp32/core/configuration.cpp
@@ -70,6 +70,26 @@ bool Configuration::loadFromDisk() {
         pb_buffer_.module_offset_steps_count
     );
     log(buf);
+
+    uint8_t previewN = min(pb_buffer_.module_offset_steps_count, static_cast<pb_size_t>(6));
+    snprintf(
+        buf,
+        sizeof(buf),
+        "First %u offsets:",
+        previewN
+    );
+    log(buf);
+    for (uint8_t i = 0; i < previewN; i++) {
+        snprintf(
+            buf,
+            sizeof(buf),
+            "  %u: %u",
+            i,
+            pb_buffer_.module_offset_steps[i]
+        );
+        log(buf);
+    }
+
     return true;
 }
 

diff --git a/arduino/splitflap/esp32/core/splitflap_task.cpp b/arduino/splitflap/esp32/core/splitflap_task.cpp
@@ -210,7 +210,7 @@ void SplitflapTask::processQueue() {
                 uint16_t offsets[NUM_MODULES];
                 for (uint8_t i = 0; i < NUM_MODULES; i++) {
                     // Make sure all modules are stopped, since writing to config may take a while
-                    if (modules[i]->state != NORMAL || modules[i]->current_accel_step != 0) {
+                    if (modules[i]->current_accel_step != 0) {
                         snprintf(buffer, sizeof(buffer), "Can't save offsets; module %u isn't idle", i);
                         log(buffer);
                         return;