adding T_BEAM_T22_STRATUX target

.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: PlatformIO CI
+
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+      - '**.yml'
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.x'
+
+    - name: Install PlatformIO CLI
+      run: |
+        python -m pip install --upgrade pip
+        pip install platformio
+
+    - name: Build project
+      run: |
+        platformio run
+        cd $GITHUB_WORKSPACE
+        cp -f T-Beam-Stratux.csv bin/T-Beam-Stratux/v7.0.0/
+        cp -f bin/boot_app0.bin bin/T-Beam-Stratux/v7.0.0/
+        cp -f bin/psRam/v7.0.0/spiffs.bin bin/T-Beam-Stratux/v7.0.0/
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: GXAirCom
+        path: |
+         bin/T-Beam-Stratux/
+        if-no-files-found: error

T-Beam-Stratux.csv

@@ -0,0 +1,5 @@
+0x1000;bootloader.bin
+0x8000;partitions.bin
+0xe000;boot_app0.bin
+0x10000;firmware.bin
+0x3d0000;spiffs.bin

platformio.ini

@@ -8,14 +8,9 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
-
 [esp32_base]
 framework = arduino
 board = esp32dev
-;platform = espressif32@~5.0.0
-;platform = [email protected]
-platform = [email protected]
-;platform = https://github.com/platformio/platform-espressif32.git
 build_flags =  -D CORE_DEBUG_LEVEL=3 
               '-DVERSION="v7.0.0"'
               -Isrc
@@ -24,145 +19,22 @@ lib_deps =
    paulstoffregen/OneWire @ ~2.3.7
    adafruit/Adafruit GFX Library @ ~1.11.5
    adafruit/RTClib @ ~2.1.4
-   ;links2004/WebSockets @ ~2.4.1
    links2004/WebSockets @ ~2.3.5
    arduino-libraries/NTPClient @ ~3.2.1
-board_build.partitions = min_spiffs.csv
 monitor_speed = 115200
 upload_speed = 921600
-;upload_port = COM6
-;monitor_port = COM6
 monitor_flags = 
    -f
    esp32_exception_decoder
 extra_scripts = post:extra_script.py
 
-[env:psRam]
+[env:T-Beam-Stratux]
 extends = esp32_base
+platform = [email protected]
 build_flags =  ${esp32_base.build_flags}
-               '-DENV="psRam"'
+               '-DENV="T-Beam-Stratux"'
                -DAIRMODULE
-               -DGSMODULE
-               -DSSD1306
-               -DEINK
                -DBOARD_HAS_PSRAM  
                -DBLUETOOTH
-board_build.partitions = ${esp32_base.board_build.partitions}
-
-[env:nopsRam]
-extends = esp32_base
-build_flags =  ${esp32_base.build_flags}
-               '-DENV="nopsRam"'
-               -DAIRMODULE
-               -DGSMODULE
-               -DSSD1306
-               -DEINK
-               -DEXT_POWER_ON_OFF
-               -DBLUETOOTH
-
-[env:sim7000_psRam]
-extends = esp32_base
-build_flags =  ${esp32_base.build_flags}
-               '-DENV="sim7000_psRam"'
-               -DAIRMODULE
-               -DGSMODULE
-               -DSSD1306
-               -DEINK
-               -DGSM_MODULE
-               -DTINY_GSM_MODEM_SIM7000
-               -DBOARD_HAS_PSRAM
-               -DBLUETOOTH
-               -mfix-esp32-psram-cache-issue
-board_build.partitions = ${esp32_base.board_build.partitions}
-
-;[env:sim800_nopsRam]
-;extends = esp32_base
-;build_flags =  ${esp32_base.build_flags}
-;               '-DENV="sim800_nopsRam"'
-;               -DAIRMODULE
-;               -DGSMODULE
-;               -DSSD1306
-;               -DEINK
-;               -DGSM_MODULE
-;               -DBLUETOOTH
-;               -DTINY_GSM_MODEM_SIM800
-;board_build.partitions = ${esp32_base.board_build.partitions}
-
-[env:T-Beam-S3Core]
-extends = esp32_base
-build_flags =  ${esp32_base.build_flags}
-               '-DENV="T-Beam-S3Core"'
-               -DSH1106G
-               -DAIRMODULE
-               -DBOARD_HAS_PSRAM
-               -DBLUETOOTH
-               -DS3CORE
-               -DARDUINO_USB_CDC_ON_BOOT=1 ;for output over USB-C
-board = esp32-s3-devkitc-1
-; change microcontroller
-board_build.mcu = esp32s3
-platform = espressif32 @ 6.7.0
-board_build.partitions = 8mb_spiffs.csv
-
-[env:Gs]
-;Ground-station without Bluetooth support
-;latest development kit
-extends = esp32_base
-build_flags =  ${esp32_base.build_flags}
-               '-DENV="Gs"'
-               -DGSMODULE
-               -DSSD1306
-               -DEINK
-platform = espressif32 @ 6.7.0
-
-[env:GsSim7000]
-;Ground-station without Bluetooth support
-;latest development kit
-extends = esp32_base
-build_flags =  ${esp32_base.build_flags}
-               '-DENV="GsSim7000"'
-               -DGSMODULE
-               -DEINK
-               -DGSM_MODULE
-               -DTINY_GSM_MODEM_SIM7000
-               -DBOARD_HAS_PSRAM
-platform = espressif32 @ 6.7.0
-
-
-[env:wireless-StickV3]
-extends = esp32_base
-build_flags =  ${esp32_base.build_flags}
-               '-DENV="wireless-StickV3"'
-               -DGSMODULE
-               -DWIRELESS_STICK_V3
-               -DBLUETOOTH
-               -DARDUINO_USB_CDC_ON_BOOT=1 ;for output over USB-C
-board = esp32-s3-devkitc-1
-; change microcontroller
-board_build.mcu = esp32s3
-platform = espressif32 @ 6.7.0
-board_build.partitions = 8mb_spiffs.csv
-
-[env:Heltec_Lora_V3]
-extends = esp32_base
-build_flags =  ${esp32_base.build_flags}
-               '-DENV="Heltec_Lora_V3"'
-               -DGSMODULE
-               -DHeltec_Lora_V3
-               -DSSD1306
-               -DARDUINO_USB_CDC_ON_BOOT=1 ;for output over USB-C
-board = esp32-s3-devkitc-1
-; change microcontroller
-board_build.mcu = esp32s3
-platform = espressif32 @ 6.7.0
-board_build.partitions = 8mb_spiffs.csv
-
-[env:flarmLogger]
-extends = esp32_base
-build_flags =  ${esp32_base.build_flags}
-               '-DENV="flarmLogger"'
-               -DFLARMLOGGER
-               -DAIRMODULE
-               -DGSMODULE
-               -DSSD1306
-platform = espressif32 @ 6.7.0               
+               -DT_BEAM_STRATUX
+board_build.partitions = min_spiffs.csv

src/main.cpp

@@ -4015,6 +4015,7 @@ void Fanet2FlarmData(FanetLora::trackingData *FanetData,FlarmtrackingData *Flarm
   FlarmDataData->lat = FanetData->lat;
   FlarmDataData->lon = FanetData->lon;
   FlarmDataData->speed = FanetData->speed;
+  FlarmDataData->addressType = (FanetData->addressType) & 0x7F; //clear highest bit (is set for FANET-Msg)
 }
 
 void sendLXPW(uint32_t tAct){
@@ -4254,6 +4255,24 @@ bool setupUbloxConfig(){
         log_e("ublox: error setting parameter %d",UBX_NMEA_GLL);
         continue;
       }
+#ifdef T_BEAM_STRATUX
+      if (!ublox.enableNMEAMessage(UBX_NMEA_GST,COM_PORT_UART1)){
+        log_e("ublox: error setting parameter %d",UBX_NMEA_GST);
+        continue;
+      }
+      if (!ublox.enableNMEAMessage(UBX_NMEA_GSV,COM_PORT_UART1)){
+        log_e("ublox: error setting parameter %d",UBX_NMEA_GSV);
+        continue;
+      }
+      if (!ublox.enableNMEAMessage(UBX_NMEA_VTG,COM_PORT_UART1)){
+        log_e("ublox: error setting parameter %d",UBX_NMEA_VTG);
+        continue;
+      }
+      if (!ublox.enableNMEAMessage(UBX_NMEA_GSA,COM_PORT_UART1)){
+        log_e("ublox: error setting parameter %d",UBX_NMEA_GSA);
+        continue;
+      }
+#else
       if (!ublox.disableNMEAMessage(UBX_NMEA_GSV,COM_PORT_UART1)){
         log_e("ublox: error setting parameter %d",UBX_NMEA_GSV);
         continue;
@@ -4267,7 +4286,7 @@ bool setupUbloxConfig(){
         log_e("ublox: error setting parameter %d",UBX_NMEA_GSA);
         continue;
       }
-
+#endif
       //enable nmea-sentences
       if (!ublox.enableNMEAMessage(UBX_NMEA_GGA,COM_PORT_UART1)){
         log_e("ublox: error setting parameter %d",UBX_NMEA_GGA);