Merge pull request #363 from bobbycar-graz/testdevice2

2nd Testdevice config

configs/config_testdevice2.cmake

@@ -0,0 +1,89 @@
+set(BOBBY_APP_NAME testdevice2)
+
+add_definitions(
+  -DUSER_SETUP_LOADED=1
+  -DLOAD_GLCD=1
+  -DLOAD_FONT2=1
+  -DLOAD_FONT4=1
+  -DLOAD_FONT7=1
+  -DST7789_DRIVER=1
+  -DTFT_MOSI=13
+  -DTFT_SCLK=15
+  -DTFT_CS=14
+  -DTFT_DC=12
+  -DTFT_RST=2
+  -DSPI_FREQUENCY=40000000
+)
+
+set(BOBBYCAR_BUILDFLAGS
+# Pins
+    -DPINS_GAS=34
+    -DPINS_BREMS=35
+#    -DFEATURE_JOYSTICK
+#    -DPINS_RX1=4
+#    -DPINS_TX1=5
+#    -DPINS_RX2=22
+#    -DPINS_TX2=23
+#    -DPINS_MOSFET0=18
+#    -DPINS_MOSFET1=19
+#    -DPINS_MOSFET2=21
+#    -DPINS_GAMETRAKX=34
+#    -DPINS_GAMETRAKY=39
+#    -DPINS_GAMETRAKDIST=36
+    -DPINS_LEDBACKLIGHT=23
+    -DPINS_LEDSTRIP=33
+
+# Config flags
+    -DFEATURE_ADC_IN
+    -DFEATURE_CAN
+#    -DFEATURE_SERIAL
+#    -DFEATURE_MOSFETS
+#    -DFEATURE_BLUETOOTH
+#    -DFEATURE_BMS
+#    -DFEATURE_GAMETRAK
+#    -DFEATURE_POWERSUPPLY
+    -DFEATURE_LEDBACKLIGHT
+
+    -DLEDBACKLIGHT_INVERTED
+#    -DLEDSTRIP_WRONG_DIRECTION
+    -DHEAP_LRGST_CRASH_TEXT_FIX
+
+# Default values
+    -DDEFAULT_SWAPSCREENBYTES=false
+    -DDEFAULT_INVERTFRONTLEFT=false
+    -DDEFAULT_INVERTFRONTRIGHT=true
+    -DDEFAULT_INVERTBACKLEFT=false
+    -DDEFAULT_INVERTBACKRIGHT=true
+    -DDEFAULT_WHEELDIAMETER=200
+    -DDEFAULT_IMOTMAX=28
+    -DDEFAULT_IDCMAX=30
+    -DDEFAULT_NMOTMAX=2000
+    -DDEFAULT_FIELDWEAKMAX=17
+    -DDEFAULT_FIELDADVMAX=40
+
+# DPAD
+#    -DFEATURE_DPAD_5WIRESW
+#    -DPINS_DPAD_5WIRESW_OUT=4
+#    -DPINS_DPAD_5WIRESW_IN1=5
+#    -DPINS_DPAD_5WIRESW_IN2=27
+#    -DPINS_DPAD_5WIRESW_IN3=18
+#    -DPINS_DPAD_5WIRESW_IN4=19
+#    -DPINS_DPAD_EXTRASW_IN5=25
+#    -DFEATURE_DPAD_6WIRESW
+#    -DPINS_DPAD_6WIRESW_OUT=4
+#    -DPINS_DPAD_6WIRESW_IN1=5
+#    -DPINS_DPAD_6WIRESW_IN2=27
+#    -DPINS_DPAD_6WIRESW_IN3=18
+#    -DPINS_DPAD_6WIRESW_IN4=19
+#    -DPINS_DPAD_6WIRESW_IN5=26
+#    -DFEATURE_GSCHISSENE_DIODE
+    -DDPAD_BOARDCOMPUTER_V2
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT1=19
+    -DPINS_DPAD_BOARDCOMPUTER_V2_OUT2=5
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN1=4
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN2=18
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN3=27
+    -DPINS_DPAD_BOARDCOMPUTER_V2_IN4=16
+#    -DDPAD_BOARDCOMPUTER_V2_DEBUG
+)
+

main/accessors/settingsaccessors.h

@@ -262,5 +262,8 @@ struct QuickActionExtra2Accessor : public NewSettingsAccessor<BobbyQuickActions>
 struct QuickActionExtra3Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra3; } };
 struct QuickActionExtra4Accessor : public NewSettingsAccessor<BobbyQuickActions> { ConfigWrapper<BobbyQuickActions> &getConfig() const override { return configs.quickActionExtra4; } };
 
+// boardcomputer-hardware
+struct FlipScreenAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.boardcomputerHardware.flipScreen; } };
+
 // Other
 struct AnhaengerIdAccessor : public NewSettingsAccessor<uint16_t> { ConfigWrapper<uint16_t> &getConfig() const override { return configs.anhaenger_id; } };

main/displays/menus/boardcomputerhardwaresettingsmenu.cpp

@@ -10,17 +10,19 @@
 #include <textwithvaluehelper.h>
 
 // local includes
-#include "displays/bobbychangevaluedisplay.h"
-#include "utils.h"
-#include "icons/lock.h"
 #include "accessors/settingsaccessors.h"
-#include "displays/menus/lockscreensettingsmenu.h"
-#include "displays/potiscalibratedisplay.h"
-#include "displays/menus/timersmenu.h"
-#include "displays/menus/settingsmenu.h"
+#include "bobbycheckbox.h"
+#include "displays/bobbychangevaluedisplay.h"
 #include "displays/buttoncalibratedisplay.h"
 #include "displays/menus/extrabuttoncalibratemenu.h"
+#include "displays/menus/lockscreensettingsmenu.h"
+#include "displays/menus/settingsmenu.h"
 #include "displays/menus/setupquickactionsmenu.h"
+#include "displays/menus/timersmenu.h"
+#include "displays/potiscalibratedisplay.h"
+#include "icons/lock.h"
+#include "utils.h"
+
 #ifdef FEATURE_JOYSTICK
 #include "displays/joystickdebugdisplay.h"
 #endif
@@ -35,6 +37,7 @@ constexpr char TEXT_POTISCALIBRATE[] = "Potis Calibrate";
 #ifdef FEATURE_JOYSTICK
 constexpr char TEXT_JOYSTICK[] = "Debug Joystick";
 #endif
+constexpr char TEXT_FLIPDISPLAY[] = "Flip Display";
 constexpr char TEXT_SAMPLECOUNT[] = "sampleCount";
 constexpr char TEXT_GASMIN[] = "gasMin";
 constexpr char TEXT_GASMAX[] = "gasMax";
@@ -200,6 +203,7 @@ BoardcomputerHardwareSettingsMenu::BoardcomputerHardwareSettingsMenu()
 #ifdef FEATURE_JOYSTICK
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_JOYSTICK>,                                    PushScreenAction<JoystickDebugDisplay>>>();
 #endif
+    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_FLIPDISPLAY>,                                 BobbyCheckbox, FlipScreenAccessor>>();
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_SAMPLECOUNT, SampleCountAccessor>,   PushScreenAction<SampleCountChangeScreen>>>();
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_GASMIN, GasMinAccessor>,             PushScreenAction<GasMinChangeScreen>>>();
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_GASMAX, GasMaxAccessor>,             PushScreenAction<GasMaxChangeScreen>>>();

main/newsettings.h

@@ -365,6 +365,7 @@ public:
             ConfigWrapperLegacy<int16_t> cloudSendRate  {1,                                      DoReset,   {},                         "cloudSendRate"       };
             ConfigWrapperLegacy<int16_t> udpSendRateMs  {65,                                     DoReset,   {},                         "udpSendRate"         };
         } timersSettings;
+        ConfigWrapperLegacy<bool>    flipScreen         {false,                                  DoReset,   {},                         "flipScreen"          };
     } boardcomputerHardware;
 
     struct {
@@ -709,7 +710,9 @@ public:
     x(boardcomputerHardware.timersSettings.statsUpdateRate) \
     x(boardcomputerHardware.timersSettings.cloudCollectRate) \
     x(boardcomputerHardware.timersSettings.cloudSendRate) \
-    x(boardcomputerHardware.timersSettings.udpSendRateMs) \
+    x(boardcomputerHardware.timersSettings.udpSendRateMs)   \
+    \
+    x(boardcomputerHardware.flipScreen) \
     \
     x(cloudSettings.cloudEnabled) \
     x(cloudSettings.cloudTransmitTimeout) \

main/screens.cpp

@@ -15,10 +15,12 @@ Label bootLabel{32, 250};
 
 void initScreen()
 {
+    // vertical screen
     tft.init();
     tft.fillScreen(TFT_WHITE);
     tft.setTextColor(TFT_BLACK, TFT_WHITE);
     tft.setTextFont(4);
+    tft.setRotation(configs.boardcomputerHardware.flipScreen.value() ? 2 : 0);
     espgui::tft.setSwapBytes(true);
     tft.pushImage(0, 40, bobbyicons::logo.WIDTH, bobbyicons::logo.HEIGHT, bobbyicons::logo.buffer);
     espgui::tft.setSwapBytes(false);
@@ -42,6 +44,13 @@ void updateDisplay()
         changeScreenCallback = {};
     }
 
+    if (tft.getRotation() != (configs.boardcomputerHardware.flipScreen.value() ? 2 : 0))
+    {
+        tft.setRotation(configs.boardcomputerHardware.flipScreen.value() ? 2 : 0);
+        if (currentDisplay)
+            currentDisplay->initScreen();
+    }
+
     if (const int8_t rawButton = rawButtonRequest.load(); rawButton != -1 && currentDisplay)
     {
         currentDisplay->rawButtonPressed(rawButton);

tools/bobby-app-flash-flasher

@@ -0,0 +1,2 @@
+#!/bin/bash
+idf.py -p /dev/ttyACM0 -b 921600 flash monitor -b 115200

tools/bobby-flash-flasher

@@ -0,0 +1,2 @@
+#!/bin/bash
+idf.py -p /dev/ttyACM0 -b 921600 flash monitor -b 115200

tools/bobby-monitor-flasher

@@ -0,0 +1,2 @@
+#!/bin/bash
+idf.py -p /dev/ttyACM0 -b 921600 flash monitor -b 115200