pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-22 04:54:47 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into tft-gui-work

Browse Source
This commit is contained in:
Manuel 2024-09-20 13:23:39 +02:00 committed by GitHub
commit a034c95a34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/package_amd64.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
uses: ./.github/workflows/build_native.yml uses: ./.github/workflows/build_native.yml
package-native: package-native:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
needs: build-native needs: build-native
steps: steps:
- name: Checkout code - name: Checkout code

2
.github/workflows/package_raspbian.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
uses: ./.github/workflows/build_raspbian.yml uses: ./.github/workflows/build_raspbian.yml
package-raspbian: package-raspbian:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
needs: build-raspbian needs: build-raspbian
steps: steps:
- name: Checkout code - name: Checkout code

2
.github/workflows/package_raspbian_armv7l.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
uses: ./.github/workflows/build_raspbian_armv7l.yml uses: ./.github/workflows/build_raspbian_armv7l.yml
package-raspbian_armv7l: package-raspbian_armv7l:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
needs: build-raspbian_armv7l needs: build-raspbian_armv7l
steps: steps:
- name: Checkout code - name: Checkout code

2
.github/workflows/sec_sast_semgrep_pull.yml vendored
View File

@ -4,7 +4,7 @@ on: pull_request
jobs: jobs:
semgrep-diff: semgrep-diff:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
container: container:
image: returntocorp/semgrep image: returntocorp/semgrep

2
boards/heltec_mesh_node_t114.json
View File

@ -5,7 +5,7 @@
}, },
"core": "nRF5", "core": "nRF5",
"cpu": "cortex-m4", "cpu": "cortex-m4",
"extra_flags": "-DARDUINO_NRF52840_PCA10056 -DNRF52840_XXAA", "extra_flags": "-DHELTEC_T114 -DNRF52840_XXAA",
"f_cpu": "64000000L", "f_cpu": "64000000L",
"hwids": [ "hwids": [
["0x239A", "0x4405"], ["0x239A", "0x4405"],

2
boards/me25ls01-4y10td.json
View File

@ -5,7 +5,7 @@
}, },
"core": "nRF5", "core": "nRF5",
"cpu": "cortex-m4", "cpu": "cortex-m4",
"extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA", "extra_flags": "-DME25LS01_4Y10TD -DNRF52840_XXAA",
"f_cpu": "64000000L", "f_cpu": "64000000L",
"hwids": [ "hwids": [
["0x239A", "0x8029"], ["0x239A", "0x8029"],

2
boards/ms24sf1.json
View File

@ -5,7 +5,7 @@
}, },
"core": "nRF5", "core": "nRF5",
"cpu": "cortex-m4", "cpu": "cortex-m4",
"extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA", "extra_flags": "-DMS24SF1 -DNRF52840_XXAA",
"f_cpu": "64000000L", "f_cpu": "64000000L",
"hwids": [ "hwids": [
["0x239A", "0x8029"], ["0x239A", "0x8029"],

2
boards/nordic_pca10059.json
View File

@ -5,7 +5,7 @@
}, },
"core": "nRF5", "core": "nRF5",
"cpu": "cortex-m4", "cpu": "cortex-m4",
"extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA", "extra_flags": "-DNORDIC_PCA10059 -DNRF52840_XXAA",
"f_cpu": "64000000L", "f_cpu": "64000000L",
"hwids": [ "hwids": [
["0x239A", "0x8029"], ["0x239A", "0x8029"],

7
platformio.ini
View File

@ -88,8 +88,7 @@ monitor_speed = 115200
monitor_filters = direct monitor_filters = direct
lib_deps = lib_deps =
; jgromes/RadioLib@~6.6.0 jgromes/RadioLib@~7.0.0
https://github.com/jgromes/RadioLib.git#3115fc2d6700a9aee05888791ac930a910f2628f
https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95 ; ESP8266_SSD1306 https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95 ; ESP8266_SSD1306
https://github.com/mathertel/OneButton@~2.6.1 ; OneButton library for non-blocking button debounce https://github.com/mathertel/OneButton@~2.6.1 ; OneButton library for non-blocking button debounce
https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159 https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
@ -157,9 +156,9 @@ lib_deps =
https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502 https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
boschsensortec/BME68x Sensor Library@^1.1.40407 boschsensortec/BME68x Sensor Library@^1.1.40407
https://github.com/KodinLanewave/INA3221@^1.0.0 https://github.com/KodinLanewave/INA3221@^1.0.0
lewisxhe/SensorLib@^0.2.0 lewisxhe/SensorLib@0.2.0
mprograms/QMC5883LCompass@^1.2.0 mprograms/QMC5883LCompass@^1.2.0
https://github.com/meshtastic/DFRobot_LarkWeatherStation#dee914270dc7cb3e43fbf034edd85a63a16a12ee https://github.com/meshtastic/DFRobot_LarkWeatherStation#dee914270dc7cb3e43fbf034edd85a63a16a12ee
https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1 https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1