Merge pull request #46 from openppg/rp2040-module

Support multiple RP2040 boards

Author: zjwhitehead

inc/sp140/altimeter.h

@@ -6,7 +6,7 @@
 #include "sp140/structs.h"
 
 // Set up the barometer
-void setupAltimeter();
+bool setupAltimeter(bool alt_wire = false);
 
 // Get the altitude (in meters)
 float getAltitude(const STR_DEVICE_DATA_140_V1& deviceData);

inc/sp140/display.h

@@ -4,6 +4,13 @@
 #include <Arduino.h>
 
 #include "sp140/structs.h"
+
+#ifdef M0_PIO
+  #include "../../inc/sp140/m0-config.h"
+#else
+  #include "../../inc/sp140/rp2040-config.h"
+#endif
+
 #include <Adafruit_ST7735.h>
 #include "utilities.h"
 
@@ -55,7 +62,7 @@ extern float watts;
 extern float wattHoursUsed;
 
 // Set up the display and show splash screen
-void setupDisplay(const STR_DEVICE_DATA_140_V1& deviceData);
+void setupDisplay(const STR_DEVICE_DATA_140_V1& deviceData, const HardwareConfig& board_config);
 
 void displayMeta(const STR_DEVICE_DATA_140_V1& deviceData, int duration = 2000);
 

inc/sp140/globals.h

@@ -5,18 +5,11 @@
 byte escData[ESC_DATA_SIZE];
 byte escDataV2[ESC_DATA_V2_SIZE];
 unsigned long cruisedAtMillis = 0;
-unsigned long transmitted = 0;
-unsigned long failed = 0;
-bool cruising = false;
+volatile bool cruising = false;
 int prevPotLvl = 0;
 int cruisedPotVal = 0;
-float throttlePWM = 0;
-float batteryPercent = 0;
-float prevBatteryPercent = 0;
-bool batteryFlag = true;
+volatile float throttlePWM = 0;
 bool throttledFlag = true;
-bool throttled = false;
-unsigned long throttledAtMillis = 0;
 
 float watts = 0;
 float wattHoursUsed = 0;

inc/sp140/m0-config.h

@@ -6,7 +6,6 @@
 
 // Arduino Pins
 #define BUTTON_TOP    6   // arm/disarm button_top
-#define BUTTON_SIDE   7   // secondary button_top
 #define BUZZER_PIN    5   // output for buzzer speaker
 #define LED_SW        LED_BUILTIN   // output for LED
 #define LED_2         0   // output for LED 2
@@ -24,4 +23,38 @@
 #define ESC_PIN 12
 #define ENABLE_VIB            true    // enable vibration
 
+struct HardwareConfig {
+  int button_top;
+  int buzzer_pin;
+  int led_sw;
+  int led_2;
+  int led_3;
+  int throttle_pin;
+  HardwareSerial* serial_esc;
+  int pot_pin;
+  int tft_rst;
+  int tft_cs;
+  int tft_dc;
+  int tft_lite;
+  int esc_pin;
+  bool enable_vib;
+};
+
+HardwareConfig m0_config = {
+  .button_top = 6,
+  .buzzer_pin = 5,
+  .led_sw = LED_BUILTIN,
+  .led_2 = 0,
+  .led_3 = 38,
+  .throttle_pin = A0,
+  .serial_esc = &Serial5,
+  .pot_pin = A0,
+  .tft_rst = 9,
+  .tft_cs = 10,
+  .tft_dc = 11,
+  .tft_lite = A1,
+  .esc_pin = 12,
+  .enable_vib = true
+};
+
 #endif  // INC_SP140_M0_CONFIG_H_

inc/sp140/rp2040-config.h

@@ -4,22 +4,26 @@
 
 #include "shared-config.h"
 
-// Arduino Pins
-#define BUTTON_TOP    15  // arm/disarm button_top
-#define BUTTON_SIDE   7   // secondary button_top
-#define BUZZER_PIN    10  // output for buzzer speaker
-#define LED_SW        12  // output for LED
-#define THROTTLE_PIN  A0  // throttle pot input
-
 #define SerialESC  Serial1  // ESC UART connection
 
-// SP140
-#define POT_PIN A0
-#define TFT_RST 5
-#define TFT_CS 13
-#define TFT_DC 11
-#define TFT_LITE 25
-#define ESC_PIN 14
-#define ENABLE_VIB            false    // enable vibration
+struct HardwareConfig {
+  int button_top;
+  int buzzer_pin;
+  int led_sw;
+  int throttle_pin;
+  int bmp_pin;
+  HardwareSerial* serial_esc;
+  bool alt_wire;
+  int tft_rst;
+  int tft_cs;
+  int tft_dc;
+  int tft_lite;
+  int esc_pin;
+  bool enable_vib;
+  bool enable_neopixel;
+};
+
+extern HardwareConfig v1_config;
+extern HardwareConfig v2_config;
 
 #endif  // INC_SP140_RP2040_CONFIG_H_

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 0
 
 #define CRUISE_GRACE 1.5  // 1.5 sec period to get off throttle
 #define POT_SAFE_LEVEL 0.05 * 4096  // 5% or less
@@ -34,4 +34,10 @@
 #define ENABLE_VIB_LOW_BAT    false   // vibrate if armed and battery voltage sags below min volts. Gets pilot's attention.
 #define POT_MAX_VALUE         4095    // 12 bit ADC //TODO use calibration and store in EEPROM
 
+enum DeviceRevision {
+  M0 = 0,
+  V1 = 1,
+  MODULE = 2
+};
+
 #endif  // INC_SP140_SHARED_CONFIG_H_

inc/sp140/structs.h

@@ -28,7 +28,7 @@ typedef struct {
   uint8_t performance_mode;  // 0,1,2
   uint16_t batt_size;     // 4000 (4kw) or 2000 (2kw)
   uint8_t theme;     // 0,1 for light/dark
-  uint8_t unused;     // for future use
+  uint8_t revision;     // 2040 board revision (1=original, 2=rev1)
   uint16_t crc;        // error check
 }STR_DEVICE_DATA_140_V1;
 

inc/sp140/utilities.h

@@ -3,4 +3,17 @@
 
 double mapd(double x, double in_min, double in_max, double out_min, double out_max);
 
+// Definitions for main rainbow colors in WRGB format for NeoPixel.
+// The 32-bit color value is WRGB. W (White) is ignored for RGB pixels.
+// The next bytes are R (Red), G (Green), and B (Blue).
+// For example, YELLOW is 0x00FFFF00, with FF for Red and Green, and 00 for Blue.
+
+#define LED_RED 0x00FF0000
+#define LED_ORANGE 0x00FF7F00
+#define LED_YELLOW 0x00FFFF00
+#define LED_GREEN 0x0000FF00
+#define LED_BLUE 0x000000FF
+#define LED_INDIGO 0x004B0082
+#define LED_VIOLET 0x008000FF
+
 #endif  // INC_SP140_UTILITIES_H_

inc/version.h

@@ -0,0 +1,5 @@
+// Copyright <Zach Whitehead>
+#pragma once
+
+#define VERSION_MAJOR 6
+#define VERSION_MINOR 2

platformio.ini

@@ -41,33 +41,40 @@ lib_deps =
 	adafruit/Adafruit BusIO@1.7.5
 	adafruit/Adafruit BMP3XX Library@2.1.1
 	adafruit/Adafruit ST7735 and ST7789 Library@1.6.1
-	https://github.com/rlogiacco/CircularBuffer
+	https://github.com/rlogiacco/CircularBuffer@1.4.0
 lib_ignore =
 	${extra.lib_ignore}
 
 [env:OpenPPG-CRP2040-SP140]
-platform = https://github.com/openppg/platform-raspberrypi.git#d558b307a404efbfc4282ce9e61d16f338f1c172
+platform = https://github.com/openppg/platform-raspberrypi.git#de3a06a0d358567da4b175d6590971d6bfa1408f
 board = sparkfun_promicrorp2040
 framework = arduino
 board_build.core = earlephilhower
 build_flags = -DRP_PIO -DUSE_TINYUSB
+test_framework = unity
+monitor_filters =
+  time
 
 ; configure filesystem size. Default 0 Mbyte.
 ; Out of 16Mbyte available
 board_build.filesystem_size = 14M ; 14 Mbyte for filesystem and 2 Mbyte for program
 src_folder = sp140
 extra_scripts = pre:extra_script.py
 lib_deps =
+	Wire
+	Adafruit TinyUSB Library
+	SPI
 	AceButton@1.9.2
 	ArduinoJson@6.19.4
 	ResponsiveAnalogRead@1.2.1 ; deprecated
 	Time@1.6.1
-	adafruit/Adafruit BusIO@1.13.2
-	adafruit/Adafruit BMP3XX Library@2.1.2
-	adafruit/Adafruit DRV2605 Library@1.2.2
-	adafruit/Adafruit ST7735 and ST7789 Library@1.10.2
-	https://github.com/rlogiacco/CircularBuffer
-	Adafruit GFX Library@1.11.7
+	adafruit/Adafruit BusIO@1.14.5
+	adafruit/Adafruit BMP3XX Library@2.1.4
+	adafruit/Adafruit DRV2605 Library@1.2.4
+	adafruit/Adafruit ST7735 and ST7789 Library@1.10.3
+	adafruit/Adafruit NeoPixel@1.12.0
+	https://github.com/rlogiacco/CircularBuffer@1.4.0
+	Adafruit GFX Library@1.11.9
 lib_ignore =
 	Adafruit SleepyDog Library
 	${extra.lib_ignore}