Skip to content

Commit

Permalink
Merge branch 'master' into 20240905_TMOTORF7
Browse files Browse the repository at this point in the history
  • Loading branch information
nerdCopter authored Sep 26, 2024
2 parents b58a2b6 + 1f80bbb commit 7063a3b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
18 changes: 10 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/target/JHEF745/target.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 7063a3b

Please sign in to comment.