diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54922794f6..8e0ccdb03e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,12 +33,12 @@ jobs: run: function curl () { command curl --connect-timeout 30 --retry 10 "$@" ; } - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: - fetch-depth: 0 + fetch-depth: 9 - name: Cache build toolchain - uses: actions/cache@v3 + uses: actions/cache@v4 id: cache-toolchain with: path: tools @@ -59,7 +59,9 @@ jobs: continue-on-error: true - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 + with: + python-version: '3.x' # EmuFlight version - name: Get code version @@ -101,10 +103,10 @@ jobs: - id: ids name : set outputs run: | - echo "::set-output name=buildtag::${{ env.REVISION_TAG }}" - echo "::set-output name=shortsha::${{ env.SHORT_SHA }}" - echo "::set-output name=artifact::${{ env.ARTIFACT_NAME }}" - echo "::set-output name=version::${{ env.VERSION }}" + echo "buildtag=${{ env.REVISION_TAG }}" >> $GITHUB_OUTPUT + echo "name=${{ env.SHORT_SHA }}" >> $GITHUB_OUTPUT + echo "shortsha=${{ env.SHORT_SHA }}" >> $GITHUB_OUTPUT + echo "version=${{ env.VERSION }}" >> $GITHUB_OUTPUT continue-on-error: true # for debugging @@ -121,8 +123,8 @@ jobs: echo "Artifact name: ${{ env.ARTIFACT_NAME }}" echo "outputs.buildtag: ${{ steps.ids.outputs.buildtag }}" echo "outputs.shortsha: ${{ steps.ids.outputs.shortsha }}" - echo "outputs.artfact: ${{ steps.ids.outputs.artifact }}" - echo "outputs.artfact: ${{ steps.ids.outputs.artifact }}" + echo "outputs.artifact: ${{ steps.ids.outputs.artifact }}" + echo "outputs.version: ${{ steps.ids.outputs.version }}" continue-on-error: true # Build HEX @@ -132,7 +134,7 @@ jobs: # Upload the Builds to ZIP file with existing SHA in .hex names - name: Upload Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{ env.ARTIFACT_NAME }} path: obj/*.hex @@ -157,13 +159,13 @@ jobs: echo "Repo: ${{ github.REPOSITORY }}" echo "outputs.buildtag: ${{ needs.build.outputs.buildtag }}" echo "outputs.shortsha: ${{ needs.build.outputs.shortsha }}" - echo "outputs.artfact: ${{ needs.build.outputs.artifact }}" - echo "outputs.artfact: ${{ needs.build.outputs.version }}" + echo "outputs.artifact: ${{ needs.build.outputs.artifact }}" + echo "outputs.version: ${{ needs.build.outputs.version }}" echo "NOW=$(date +'%Y%m%d.%H%M%S')" >> $GITHUB_ENV continue-on-error: true - name: download artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: ${{ needs.build.outputs.artifact }} #no name parameter will download all artifacts, but create separate subfolders path: obj diff --git a/src/main/target/JHEF411HD/target.h b/src/main/target/JHEF411HD/target.h index 773b270827..89449a8620 100644 --- a/src/main/target/JHEF411HD/target.h +++ b/src/main/target/JHEF411HD/target.h @@ -44,6 +44,7 @@ #define USE_OSD #define LED_STRIP_PIN PA8 +#define LED0_PIN PC13 #define USE_BEEPER #define BEEPER_PIN PB2 #define BEEPER_INVERTED diff --git a/src/main/target/JHEF745/target.h b/src/main/target/JHEF745/target.h index 84e3bc318c..60a6a27363 100644 --- a/src/main/target/JHEF745/target.h +++ b/src/main/target/JHEF745/target.h @@ -134,6 +134,8 @@ #define TARGET_IO_PORTE 0xffff // notice - masks were programmatically generated - please verify last port group for 0xffff or (BIT(2)) +#define ENABLE_DSHOT_DMAR true + #define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_AIRMODE | FEATURE_RX_SERIAL) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL diff --git a/src/main/target/TMOTORF7/target.c b/src/main/target/TMOTORF7/target.c index ecaa7704b1..2a112976a5 100644 --- a/src/main/target/TMOTORF7/target.c +++ b/src/main/target/TMOTORF7/target.c @@ -27,7 +27,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0, 0), // motor 1 DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0, 0), // motor 2 - DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, 0, 0), // motor 3 + DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // motor 3 DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // motor 4 DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), // motor 5 DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0), // motor 6 diff --git a/src/main/target/TMOTORF7_AIO/target.c b/src/main/target/TMOTORF7_AIO/target.c index 17971e789b..c171e1872e 100644 --- a/src/main/target/TMOTORF7_AIO/target.c +++ b/src/main/target/TMOTORF7_AIO/target.c @@ -32,7 +32,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0, 0), // motor 1 DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0, 0), // motor 2 - DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, 0, 0), // motor 3 + DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // motor 3 DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // motor 4 DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), // motor 5 DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0), // motor 6 diff --git a/src/main/target/TUNERCF405/target.h b/src/main/target/TUNERCF405/target.h index 23595650b8..991d7197e1 100644 --- a/src/main/target/TUNERCF405/target.h +++ b/src/main/target/TUNERCF405/target.h @@ -90,6 +90,7 @@ #define USE_UART5 #define UART5_TX_PIN PC12 #define UART5_RX_PIN PD2 +#define INVERTER_PIN_UART4 PC14 #define SERIAL_PORT_COUNT 6 #define USE_I2C