pull out version and move configs

openppg · Apr 20, 2024 · 2594bb6 · 2594bb6
1 parent b129f07
commit 2594bb6
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 33 deletions.
diff --git a/inc/sp140/rp2040-config.h b/inc/sp140/rp2040-config.h
@@ -21,4 +21,36 @@ struct HardwareConfig {
   bool enable_vib;
 };
 
+
+// V2 configuration
+HardwareConfig v2_config = {
+  .button_top = 7,
+  .buzzer_pin = 2,
+  .led_sw = LED_BUILTIN,
+  .throttle_pin = A2,
+  .serial_esc = &Serial1,
+  .tft_rst = 6,
+  .tft_cs = 4,
+  .tft_dc = 5,
+  .tft_lite = A3,
+  .esc_pin = 3,
+  .enable_vib = true
+};
+
+// V1 configuration
+HardwareConfig v1_config = {
+  .button_top = 15,
+  .buzzer_pin = 10,
+  .led_sw = 12,
+  .throttle_pin = A0,
+  .bmp_pin = 9,
+  .serial_esc = &Serial1,
+  .tft_rst = 5,
+  .tft_cs = 13,
+  .tft_dc = 11,
+  .tft_lite = 25,
+  .esc_pin = 14,
+  .enable_vib = false
+};
+
 #endif  // INC_SP140_RP2040_CONFIG_H_
diff --git a/inc/sp140/shared-config.h b/inc/sp140/shared-config.h
@@ -1,4 +1,6 @@
 // Copyright 2021 <Zach Whitehead>
+#include "../version.h"
+
 #ifndef INC_SP140_SHARED_CONFIG_H_
 #define INC_SP140_SHARED_CONFIG_H_
 
@@ -9,8 +11,6 @@
 #define MAMP_OFFSET 200
 #define VOLT_OFFSET 1.5
 
-#define VERSION_MAJOR 6
-#define VERSION_MINOR 1
 
 #define CRUISE_GRACE 1.5  // 1.5 sec period to get off throttle
 #define POT_SAFE_LEVEL 0.05 * 4096  // 5% or less

diff --git a/inc/version.h b/inc/version.h
@@ -0,0 +1,5 @@
+// Copyright <Zach Whitehead>
+#pragma once
+
+#define VERSION_MAJOR 6
+#define VERSION_MINOR 1
diff --git a/src/sp140/display.cpp b/src/sp140/display.cpp
@@ -2,7 +2,7 @@
 
 #include <Fonts/FreeSansBold12pt7b.h>
 
-#include "../../inc/sp140/rp2040-config.h"         // device config
+#include "../../inc/version.h"
 #include "sp140/structs.h"
 
 // DEBUG WATCHDOG

diff --git a/src/sp140/sp140.ino b/src/sp140/sp140.ino
@@ -85,36 +85,6 @@ TaskHandle_t watchdogTaskHandle = NULL;
 SemaphoreHandle_t eepromSemaphore;
 SemaphoreHandle_t tftSemaphore;
 
-// V2 configuration
-HardwareConfig v2_config = {
-  .button_top = 7,
-  .buzzer_pin = 2,
-  .led_sw = LED_BUILTIN,
-  .throttle_pin = A2,
-  .serial_esc = &Serial1,
-  .tft_rst = 6,
-  .tft_cs = 4,
-  .tft_dc = 5,
-  .tft_lite = A3,
-  .esc_pin = 3,
-  .enable_vib = true
-};
-
-// V1 configuration
-HardwareConfig v1_config = {
-  .button_top = 15,
-  .buzzer_pin = 10,
-  .led_sw = 12,
-  .throttle_pin = A0,
-  .bmp_pin = 9,
-  .serial_esc = &Serial1,
-  .tft_rst = 5,
-  .tft_cs = 13,
-  .tft_dc = 11,
-  .tft_lite = 25,
-  .esc_pin = 14,
-  .enable_vib = false
-};
 
 #pragma message "Warning: OpenPPG software is in beta"