pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-19 19:42:32 +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-03-08 11:47:34 +01:00 committed by GitHub
commit d992a222ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.trunk/trunk.yaml
View File

@ -4,19 +4,19 @@ cli:
plugins: plugins:
sources: sources:
- id: trunk - id: trunk
ref: v1.4.3 ref: v1.4.4
uri: https://github.com/trunk-io/plugins uri: https://github.com/trunk-io/plugins
lint: lint:
enabled: enabled:
- trufflehog@3.68.2 - trufflehog@3.68.5
- yamllint@1.35.1 - yamllint@1.35.1
- bandit@1.7.7 - bandit@1.7.7
- checkov@3.2.26 - checkov@3.2.32
- terrascan@1.18.11 - terrascan@1.19.1
- trivy@0.49.1 - trivy@0.49.1
#- trufflehog@3.63.2-rc0 #- trufflehog@3.63.2-rc0
- taplo@0.8.1 - taplo@0.8.1
- ruff@0.2.2 - ruff@0.3.1
- isort@5.13.2 - isort@5.13.2
- markdownlint@0.39.0 - markdownlint@0.39.0
- oxipng@9.0.0 - oxipng@9.0.0

5
boards/canaryone.json
View File

@ -7,7 +7,10 @@
"cpu": "cortex-m4", "cpu": "cortex-m4",
"extra_flags": "-DARDUINO_NRF52840_CANARY -DNRF52840_XXAA", "extra_flags": "-DARDUINO_NRF52840_CANARY -DNRF52840_XXAA",
"f_cpu": "64000000L", "f_cpu": "64000000L",
"hwids": [["0x239A", "0x4405"], ["0x239A", "0x009F"]], "hwids": [
["0x239A", "0x4405"],
["0x239A", "0x009F"]
],
"usb_product": "CanaryOne", "usb_product": "CanaryOne",
"mcu": "nrf52840", "mcu": "nrf52840",
"variant": "canaryone", "variant": "canaryone",