build(PlatformIO): use defines for repeated configs

Close #34
senseshift · Mar 28, 2023 · 3f0211f · 3f0211f
1 parent e58b1a6
commit 3f0211f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/firmware/firmware.cpp b/firmware/firmware.cpp
@@ -8,6 +8,10 @@
 #include <components/serial_plotter.hpp>
 #endif // SERIAL_PLOTTER
 
+#ifndef SERIAL_PLOTTER_PORT
+#define SERIAL_PLOTTER_PORT Serial
+#endif // SERIAL_PLOTTER_PORT
+
 #ifndef PIO_UNIT_TESTING
 
 extern void setupMode();
@@ -17,12 +21,10 @@ extern void setupMode();
 OpenHaptics App;
 
 void setup() {
-  Serial.begin(115200);
-
   setupMode();
 
 #if defined(SERIAL_PLOTTER) && SERIAL_PLOTTER == true
-  auto* serialOutputState = new OH::SerialPlotter_OutputStates<HardwareSerial>(Serial, App.getOutput());
+  auto* serialOutputState = new OH::SerialPlotter_OutputStates<HardwareSerial>(SERIAL_PLOTTER_PORT, App.getOutput());
   serialOutputState->begin();
 #endif // SERIAL_PLOTTER
 

diff --git a/lib/arduino/components/serial_plotter.hpp b/lib/arduino/components/serial_plotter.hpp
@@ -5,6 +5,10 @@
 
 #include <HardwareSerial.h>
 
+#ifndef SERIAL_PLOTTER_BAUD
+#define SERIAL_PLOTTER_BAUD 115200
+#endif // SERIAL_PLOTTER_BAUD
+
 namespace OH {
   /**
    * Component, that prints the current state of the output to the serial port in Arduino's Serial Plotter format
@@ -42,7 +46,7 @@ namespace OH {
    */
   template<>
   inline void SerialPlotter_OutputStates<HardwareSerial>::setup() {
-    this->serial->begin(115200);
+    this->serial->begin(SERIAL_PLOTTER_BAUD);
   }
 
   template class SerialPlotter_OutputStates<HardwareSerial>;

diff --git a/platformio.ini b/platformio.ini
@@ -23,8 +23,9 @@ build_flags       =
 ;	-D DEBUG_MODE=0
 ;	-D DEBUG_ESP_PORT=Serial
 ;	-D SERIAL_PLOTTER=true
-	-D BATTERY_ENABLED=true
-	-D BLUETOOTH_USE_NIMBLE=true
+;	-D BATTERY_ENABLED=true
+;	-D BLUETOOTH_USE_NIMBLE=false
+
 build_unflags     =
 	-std=gnu++11
 build_src_filter  =