Cleanup

meshtastic · Nov 30, 2024 · 595d4ca · 595d4ca
1 parent 6ba21f1
commit 595d4ca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -30,7 +30,7 @@ lint:
     - git-diff-check
     - [email protected]
     - [email protected]
-    - [email protected]
+    #- [email protected]
   ignore:
     - linters: [ALL]
       paths:
@@ -46,4 +46,4 @@ actions:
   enabled:
     - trunk-fmt-pre-commit
     - trunk-check-pre-push
-    - trunk-upgrade-available
+    - trunk-upgrade-available
diff --git a/bin/platformio-custom.py b/bin/platformio-custom.py
@@ -92,7 +92,7 @@ def esp32_create_combined_bin(source, target, env):
 verObj = readProps(prefsLoc)
 print("Using meshtastic platformio-custom.py, firmware version " + verObj["long"] + " on " + env.get("PIOENV"))
 
-jsonLoc = env["PROJECT_DIR"] + "/userPrefs.json"
+jsonLoc = env["PROJECT_DIR"] + "/userPrefs.jsonc"
 with open(jsonLoc) as f:
     jsonStr = re.sub("//.*","", f.read(), flags=re.MULTILINE)
     userPrefs = json.loads(jsonStr)

diff --git a/userPrefs.json → userPrefs.jsonc b/userPrefs.json → userPrefs.jsonc
@@ -34,4 +34,4 @@
   // "USERPREFS_USE_ADMIN_KEY_0": "{ 0xcd, 0xc0, 0xb4, 0x3c, 0x53, 0x24, 0xdf, 0x13, 0xca, 0x5a, 0xa6, 0x0c, 0x0d, 0xec, 0x85, 0x5a, 0x4c, 0xf6, 0x1a, 0x96, 0x04, 0x1a, 0x3e, 0xfc, 0xbb, 0x8e, 0x33, 0x71, 0xe5, 0xfc, 0xff, 0x3c }"
   // "USERPREFS_USE_ADMIN_KEY_1": "{};",
   // "USERPREFS_USE_ADMIN_KEY_2": "{};"
-}
+}