diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 1c1d6ad..4142934 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -256,22 +256,22 @@ jobs: sed -i 's/^ #define ESP32_LDDB/ \/\/#define ESP32_LDDB/' esp32_marauder/configs.h sed -i 's/^ #define MARAUDER_DEV_BOARD_PRO/ \/\/#define MARAUDER_DEV_BOARD_PRO/' esp32_marauder/configs.h - - name: Build Marauder for v6 Marauder with arduino/compile-sketches - uses: arduino/compile-sketches@v1 - with: - sketch-paths: esp32_marauder/esp32_marauder.ino - cli-compile-flags: | - - --warnings="none" - - --export-binaries - fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs + #- name: Build Marauder for v6 Marauder with arduino/compile-sketches + # uses: arduino/compile-sketches@v1 + # with: + # sketch-paths: esp32_marauder/esp32_marauder.ino + # cli-compile-flags: | + # - --warnings="none" + # - --export-binaries + # fqbn: esp32:esp32:d32:PartitionScheme=min_spiffs - - name: Show compiled arduino/compile-sketches v6 bin - run: | - find ~ -name "esp32_marauder.ino.bin" + #- name: Show compiled arduino/compile-sketches v6 bin + # run: | + # find ~ -name "esp32_marauder.ino.bin" - - name: Rename v6_2 Marauder bin - run: | - mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6_2.bin + #- name: Rename v6_2 Marauder bin + # run: | + # mv ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6_2.bin - name: Build Marauder for v6 Marauder uses: ArminJo/arduino-test-compile@v3.2.1 @@ -442,12 +442,12 @@ jobs: path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6.bin retention-days: 5 - - name: 'Upload v6_2 Artifact' - uses: actions/upload-artifact@v3 - with: - name: esp32_marauder.v6_2.bin - path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6_2.bin - retention-days: 5 + #- name: 'Upload v6_2 Artifact' + # uses: actions/upload-artifact@v3 + # with: + # name: esp32_marauder.v6_2.bin + # path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6_2.bin + # retention-days: 5 - name: 'Upload Kit Artifact' uses: actions/upload-artifact@v3 @@ -544,17 +544,17 @@ jobs: asset_content_type: application/bin if: github.event_name != 'pull_request' - - name: Upload v6 Asset - id: upload-v6-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6.bin - asset_name: esp32_marauder.v6.bin - asset_content_type: application/bin - if: github.event_name != 'pull_request' + #- name: Upload v6 Asset + # id: upload-v6-release-asset + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.create_release.outputs.upload_url }} + # asset_path: ./esp32_marauder/build/esp32.esp32.d32/esp32_marauder.v6.bin + # asset_name: esp32_marauder.v6.bin + # asset_content_type: application/bin + # if: github.event_name != 'pull_request' - name: Upload v6_2 Asset id: upload-v6-2-release-asset diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index aca75de..073d08a 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -777,7 +777,7 @@ #define GPS_RX 13 #elif defined(MARAUDER_DEV_BOARD_PRO) #define GPS_SERIAL_INDEX 2 - #define GPS_TX 18 + #define GPS_TX 21 #define GPS_RX 17 #elif defined(MARAUDER_FLIPPER) #define GPS_SERIAL_INDEX 1