Merge branch 'master' into tft-gui-work

.trunk/trunk.yaml

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

boards/canaryone.json

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