Compare commits

...

5 Commits

Author SHA1 Message Date
Ben Meadors
c13b44b992 Let's use the artifacts token actually 2024-09-21 19:33:17 -05:00
Ben Meadors
baceb48f07 Additional logic and auth 2024-09-21 19:20:20 -05:00
Ben Meadors
6aa3705b8a Hopefully extract and commit to meshtastic.github.io 2024-09-21 18:08:01 -05:00
Jonathan Bennett
c4c63a8af3 Update platform-native to pick up portduino crash fix (#4807) 2024-09-21 16:17:48 -05:00
todd-herbert
a6e16e901d Re-order doDeepSleep (#4802)
Make sure PMU sleep takes place before I2C ends
2024-09-21 15:16:16 -05:00
3 changed files with 36 additions and 8 deletions

View File

@@ -353,3 +353,30 @@ jobs:
with:
add-paths: |
version.properties
- name: Checkout meshtastic/meshtastic.github.io
uses: actions/checkout@v4
with:
repository: meshtastic/meshtastic.github.io
token: ${{ secrets.ARTIFACTS_TOKEN }}
path: meshtastic.github.io
- name: Display structure of downloaded files
run: ls -R
- name: Extract firmware.zip
run: |
unzip ./firmware-${{ steps.version.outputs.version }}.zip -d meshtastic.github.io/firmware-${{ steps.version.outputs.version }}
- name: Display structure of downloaded files
run: ls -R
- name: Commit and push changes
run: |
cd meshtastic.github.io
find . -type f -name 'meshtasticd_*' -exec rm -f {} +
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git add .
git commit -m "Add firmware version ${{ steps.version.outputs.version }}"
git push

View File

@@ -1,6 +1,6 @@
; The Portduino based sim environment on top of any host OS, all hardware will be simulated
[portduino_base]
platform = https://github.com/meshtastic/platform-native.git#ad8112adf82ce1f5b917092cf32be07a077801a0
platform = https://github.com/meshtastic/platform-native.git#6b3796d697481c8f6e3f4aa5c111bd9979f29e64
framework = arduino
build_src_filter =

View File

@@ -271,13 +271,6 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
digitalWrite(LORA_CS, HIGH);
gpio_hold_en((gpio_num_t)LORA_CS);
}
#if defined(I2C_SDA)
Wire.end();
pinMode(I2C_SDA, ANALOG);
pinMode(I2C_SCL, ANALOG);
#endif
#endif
#ifdef HAS_PMU
@@ -315,6 +308,14 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
}
#endif
#if defined(ARCH_ESP32) && defined(I2C_SDA)
// Added by https://github.com/meshtastic/firmware/pull/4418
// Possibly to support Heltec Capsule Sensor?
Wire.end();
pinMode(I2C_SDA, ANALOG);
pinMode(I2C_SCL, ANALOG);
#endif
console->flush();
cpuDeepSleep(msecToWake);
}