add VARIANT_USART_JBLB (usart based in TORQUE Mode)

5 years ago · b0d0866147
parent dc433b1ee1
commit b0d0866147
2 changed files with 76 additions and 21 deletions
--- a/Inc/config.h
+++ b/Inc/config.h
@ -12,6 +12,7 @@
 #if !defined(PLATFORMIO)
  //#define VARIANT_ADC         // Variant for control via ADC input
  //#define VARIANT_USART       // Variant for Serial control via USART3 input
+  #define VARIANT_USART_JBLB
  //#define VARIANT_NUNCHUK     // Variant for Nunchuk controlled vehicle build
  //#define VARIANT_PPM         // Variant for RC-Remote with PPM-Sum Signal
  //#define VARIANT_PWM         // Variant for RC-Remote with PWM Signal
@ -298,6 +299,36 @@
 // ######################## END OF VARIANT_USART SETTINGS #########################


+// ############################ VARIANT_USART SETTINGS by JBLB ############################
+#ifdef VARIANT_USART_JBLB
+  // #define SIDEBOARD_SERIAL_USART2
+  // #define CONTROL_SERIAL_USART2   // left sensor board cable, disable if ADC or PPM is used! For Arduino control check the hoverSerial.ino
+  // #define FEEDBACK_SERIAL_USART2  // left sensor board cable, disable if ADC or PPM is used!
+
+  #undef  CTRL_MOD_REQ
+  #define CTRL_MOD_REQ        TRQ_MODE  // HOVERCAR works best in TORQUE Mode
+
+  // #define SIDEBOARD_SERIAL_USART3
+  #define CONTROL_SERIAL_USART3      // right sensor board cable, disable if I2C (nunchuk or lcd) is used! For Arduino control check the hoverSerial.ino
+  #define FEEDBACK_SERIAL_USART3     // right sensor board cable, disable if I2C (nunchuk or lcd) is used!
+  // Min / Max values of each channel (use DEBUG to determine these values)
+  #define INPUT1_TYPE        1       // 0:Disabled, 1:Normal Pot, 2:Middle Resting Pot, 3:Auto-detect
+  #define INPUT1_MIN        -1000    // (-1000 - 0)
+  #define INPUT1_MID         0
+  #define INPUT1_MAX         1000    // (0 - 1000)
+  #define INPUT1_DEADBAND    0       // How much of the center position is considered 'center' (100 = values -100 to 100 are considered 0)
+
+  #define INPUT2_TYPE        1       // 0:Disabled, 1:Normal Pot, 2:Middle Resting Pot, 3:Auto-detect
+  #define INPUT2_MIN        -1000    // (-1000 - 0)
+  #define INPUT2_MID         0
+  #define INPUT2_MAX         1000    // (0 - 1000)
+  #define INPUT2_DEADBAND    0       // How much of the center position is considered 'center' (100 = values -100 to 100 are considered 0)
+  // #define SUPPORT_BUTTONS_LEFT       // use left sensor board cable for button inputs.  Disable DEBUG_SERIAL_USART2!
+  // #define SUPPORT_BUTTONS_RIGHT      // use right sensor board cable for button inputs. Disable DEBUG_SERIAL_USART3!
+#endif
+// ######################## END OF VARIANT_USART SETTINGS by JBLB #########################
+
+

 // ################################# VARIANT_NUNCHUK SETTINGS ############################
 #ifdef VARIANT_NUNCHUK
@ -604,7 +635,7 @@

 // ############################### VALIDATE SETTINGS ###############################
 #if !defined(VARIANT_ADC) && !defined(VARIANT_USART) && !defined(VARIANT_NUNCHUK) && !defined(VARIANT_PPM) && !defined(VARIANT_PWM) && \
-    !defined(VARIANT_IBUS) && !defined(VARIANT_HOVERCAR) && !defined(VARIANT_HOVERBOARD) && !defined(VARIANT_TRANSPOTTER) && !defined(VARIANT_SKATEBOARD)
+    !defined(VARIANT_IBUS) && !defined(VARIANT_HOVERCAR) && !defined(VARIANT_HOVERBOARD) && !defined(VARIANT_TRANSPOTTER) && !defined(VARIANT_SKATEBOARD) && !defined(VARIANT_USART_JBLB)
  #error Variant not defined! Please check platformio.ini or Inc/config.h for available variants.
 #endif

--- a/platformio.ini
+++ b/platformio.ini
@ -2,8 +2,8 @@
 ; http://docs.platformio.org/page/projectconf.html

 [platformio]
-include_dir = Inc
-src_dir     = Src
+include_dir = ./Inc
+src_dir     = ./Src

 ;=================== VARIANT SELECTION ==========================
 ;
@ -19,6 +19,8 @@ src_dir     = Src
 ;default_envs = VARIANT_HOVERBOARD  ; Variant for HOVERBOARD
 ;default_envs = VARIANT_TRANSPOTTER ; Variant for TRANSPOTTER build https://github.com/NiklasFauth/hoverboard-firmware-hack/wiki/Build-Instruction:-TranspOtter https://hackaday.io/project/161891-transpotter-ng
 ;default_envs = VARIANT_SKATEBOARD  ; Variant for SKATEBOARD build controlled via RC-Remotes with PWM signal
+default_envs = VARIANT_USART_JBLB
+
 ;================================================================

 ;================================================================
@ -45,6 +47,28 @@ build_flags =

 ;================================================================

+[env:VARIANT_USART_JBLB]
+platform        = ststm32
+framework       = stm32cube
+board           = genericSTM32F103RC
+debug_tool      = stlink
+upload_protocol = stlink
+
+; Serial Port settings (make sure the COM port is correct)
+monitor_port    = COM5
+monitor_speed   = 38400
+
+build_flags =
+    -DUSE_HAL_DRIVER
+    -DSTM32F103xE
+    -T./STM32F103RCTx_FLASH.ld
+    -lc
+    -lm
+    -g -ggdb        ; to generate correctly the 'firmware.elf' for STM STUDIO vizualization
+    -D VARIANT_USART_JBLB
+    
+;================================================================
+
 [env:VARIANT_USART]
 platform        = ststm32
 framework       = stm32cube