Rename Telemetry & GS Projects

Author: stojadin2701

.github/workflows/merge-criteria.yml

@@ -189,7 +189,7 @@ jobs:
         run: |
           platformio run -d ${{ matrix.project }}
           if [[ "${{ matrix.project }}" == "ground_station" ]]; then
-            python ${{ matrix.project }}/uf2_loader.py ${{ matrix.project }}/.pio/build/esp32-s2-saola-1/firmware
+            python ${{ matrix.project }}/uf2_loader.py ${{ matrix.project }}/.pio/build/ground_station/firmware
           fi
 
       - name: Generate compile_commands.json

ground_station/platformio.ini

@@ -30,7 +30,7 @@
 ; SOFTWARE.
 ;******************************************************************************
 
-[env:esp32-s2-saola-1]
+[env:ground_station]
 board = esp32-s2-saola-1
 framework = arduino
 platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.06.04/platform-espressif32.zip
@@ -67,7 +67,7 @@ build_flags =
   -DCFG_TUSB_CONFIG_FILE='"sdkconfig.h"' ; Use default TinyUSB configuration
   -DFIRMWARE_VERSION='"1.1.0"'           ; Enter Firmware Version here
   -DUSB_MANUFACTURER='"CATS"'            ; USB Manufacturer string
-  -DUSB_PRODUCT='"CATS Groundstation"'   ; USB Product String
+  -DUSB_PRODUCT='"CATS Ground Station"'   ; USB Product String
   -D USB_SERIAL="0"                      ; Enter Device Serial Number here
   -D USB_VID=0x239A                      ; Default Adafruit USB VID
   -D USB_PID=0x80AB                      ; Default Adafruit USB PID
@@ -114,13 +114,13 @@ extra_scripts =
 
 upload_protocol = custom
 upload_flags =
-  ${env:esp32-s2-saola-1.build_flags} ; Pass build flags as argument to python script
-  COMPARE_SERIAL_NUMBER=false         ; Download only to devices with specified USB Serial Number, otherwise to all connected devices
-  USE_SERIAL_NUMBER_LIST=false        ; Overwrite single USB Serial Number (USB_SERIAL) with list of accepted Serial Numbers
-  SERIAL_NUMBER_LIST=["0", "1", "2"]  ; List of specific USB Serial Numbers to program and open COM-Port (if enabled)
-  ENABLE_AUTOMATIC_CONSOLE=false      ; Enables automatic opening of serial ports
-  COMPARE_VID_PID_CONSOLE=true        ; Open only COM-Ports with same VID/PID as specified above (USB_VID, USB_PID)
-  USE_TABS_CONSOLE=true               ; Use Windows Terminal Tabs-Feature (One Tab for each COM-Port) -> Not fully implemented yet
+  ${env:ground_station.build_flags}  ; Pass build flags as argument to python script
+  COMPARE_SERIAL_NUMBER=false        ; Download only to devices with specified USB Serial Number, otherwise to all connected devices
+  USE_SERIAL_NUMBER_LIST=false       ; Overwrite single USB Serial Number (USB_SERIAL) with list of accepted Serial Numbers
+  SERIAL_NUMBER_LIST=["0", "1", "2"] ; List of specific USB Serial Numbers to program and open COM-Port (if enabled)
+  ENABLE_AUTOMATIC_CONSOLE=false     ; Enables automatic opening of serial ports
+  COMPARE_VID_PID_CONSOLE=true       ; Open only COM-Ports with same VID/PID as specified above (USB_VID, USB_PID)
+  USE_TABS_CONSOLE=true              ; Use Windows Terminal Tabs-Feature (One Tab for each COM-Port) -> Not fully implemented yet
 
 check_tool = clangtidy
 check_flags =

ground_station/uf2_loader.py

@@ -294,7 +294,7 @@ def download(self, inputPath):
 # If this script is called directly, it converts the .bin binary into the .UF2 binary
 if __name__ == "__main__":
     loader = UF2Loader("ESP32S2", 0)
-    binary_path = ".pio/build/esp32-s2-saola-1/firmware"
+    binary_path = ".pio/build/ground_station/firmware"
     # if an argument is passed to the script, use it as the path to the binary
     if len(sys.argv) > 1:
         binary_path = sys.argv[1]

telemetry/platformio.ini

@@ -8,7 +8,7 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
-[env:g071]
+[env:telemetry]
 
 platform = ststm32
 platform_packages = platformio/toolchain-gccarmnoneeabi@^1.100301.220327