Compare commits

...

4 Commits

Author SHA1 Message Date
Mictronics
8d99850f8a Merge branch 'master' of https://github.com/Mictronics/meshtastic_firmware 2024-11-22 17:36:39 +01:00
Mictronics
3271a59b8f Removed newlines from log. 2024-11-22 17:36:34 +01:00
Ben Meadors
662b7a0fb6
Merge branch 'master' into master 2024-11-22 10:33:55 -06:00
Jonathan Bennett
e6fb6b115a
Seems like the last DIY board that's not "extra" (#5420)
Some checks failed
CI / setup (stm32) (push) Waiting to run
CI / check (push) Blocked by required conditions
CI / build-esp32 (push) Blocked by required conditions
CI / build-esp32-s3 (push) Blocked by required conditions
CI / build-esp32-c3 (push) Blocked by required conditions
CI / build-esp32-c6 (push) Blocked by required conditions
CI / build-nrf52 (push) Blocked by required conditions
CI / build-rpi2040 (push) Blocked by required conditions
CI / build-stm32 (push) Blocked by required conditions
CI / package-raspbian (push) Waiting to run
CI / package-raspbian-armv7l (push) Waiting to run
CI / package-native (push) Waiting to run
CI / after-checks (push) Blocked by required conditions
CI / gather-artifacts (esp32) (push) Blocked by required conditions
CI / gather-artifacts (esp32c3) (push) Blocked by required conditions
CI / gather-artifacts (esp32c6) (push) Blocked by required conditions
CI / gather-artifacts (esp32s3) (push) Blocked by required conditions
CI / gather-artifacts (nrf52840) (push) Blocked by required conditions
CI / gather-artifacts (rp2040) (push) Blocked by required conditions
CI / gather-artifacts (stm32) (push) Blocked by required conditions
CI / release-artifacts (push) Blocked by required conditions
CI / release-firmware (esp32) (push) Blocked by required conditions
CI / release-firmware (esp32c3) (push) Blocked by required conditions
CI / release-firmware (esp32c6) (push) Blocked by required conditions
CI / release-firmware (esp32s3) (push) Blocked by required conditions
CI / release-firmware (nrf52840) (push) Blocked by required conditions
CI / release-firmware (rp2040) (push) Blocked by required conditions
CI / release-firmware (stm32) (push) Blocked by required conditions
Flawfinder Scan / Flawfinder (push) Waiting to run
Semgrep Full Scan / semgrep-full (push) Has been cancelled
2024-11-22 05:32:35 -06:00
2 changed files with 5 additions and 4 deletions

View File

@ -913,7 +913,7 @@ void NodeDB::loadFromDisk()
} }
if (sum == 0) { if (sum == 0) {
numAdminKeys += 1; numAdminKeys += 1;
LOG_INFO("Admin 0 key zero. Loading hard coded key from user preferences.\n"); LOG_INFO("Admin 0 key zero. Loading hard coded key from user preferences.");
memcpy(config.security.admin_key[0].bytes, userprefs_admin_key_0, 32); memcpy(config.security.admin_key[0].bytes, userprefs_admin_key_0, 32);
config.security.admin_key[0].size = 32; config.security.admin_key[0].size = 32;
config.security.admin_key_count = numAdminKeys; config.security.admin_key_count = numAdminKeys;
@ -928,7 +928,7 @@ void NodeDB::loadFromDisk()
} }
if (sum == 0) { if (sum == 0) {
numAdminKeys += 1; numAdminKeys += 1;
LOG_INFO("Admin 1 key zero. Loading hard coded key from user preferences.\n"); LOG_INFO("Admin 1 key zero. Loading hard coded key from user preferences.");
memcpy(config.security.admin_key[1].bytes, userprefs_admin_key_1, 32); memcpy(config.security.admin_key[1].bytes, userprefs_admin_key_1, 32);
config.security.admin_key[1].size = 32; config.security.admin_key[1].size = 32;
config.security.admin_key_count = numAdminKeys; config.security.admin_key_count = numAdminKeys;
@ -943,7 +943,7 @@ void NodeDB::loadFromDisk()
} }
if (sum == 0) { if (sum == 0) {
numAdminKeys += 1; numAdminKeys += 1;
LOG_INFO("Admin 2 key zero. Loading hard coded key from user preferences.\n"); LOG_INFO("Admin 2 key zero. Loading hard coded key from user preferences.");
memcpy(config.security.admin_key[2].bytes, userprefs_admin_key_2, 32); memcpy(config.security.admin_key[2].bytes, userprefs_admin_key_2, 32);
config.security.admin_key[2].size = 32; config.security.admin_key[2].size = 32;
config.security.admin_key_count = numAdminKeys; config.security.admin_key_count = numAdminKeys;

View File

@ -2,6 +2,7 @@
[env:meshtastic-diy-v1] [env:meshtastic-diy-v1]
extends = esp32_base extends = esp32_base
board = esp32doit-devkit-v1 board = esp32doit-devkit-v1
board_level = extra
board_check = true board_check = true
build_flags = build_flags =
${esp32_base.build_flags} ${esp32_base.build_flags}