Merge remote-tracking branch 'upstream/dev' into keymindCascade
# Conflicts: # build.sh # platformio.ini # variants/station_g2/platformio.ini
This commit is contained in:
commit
19206f7745
19 files changed
+76
-23
No files matched your search
@@ -91,6 +91,7 @@ Commands:
|
||||
build-repeater-firmwares: Build all repeater firmwares with 254 neighbors, except DRAM-limited targets that retain 50.
|
||||
build-room-server-firmwares: Build all chat room server firmwares for all build targets.
|
||||
build-sensor-firmwares: Build all sensor firmwares for all build targets.
|
||||
build-kiss-radio-firmwares: Build all KISS radio firmwares for all build targets.
|
||||
|
||||
Options:
|
||||
--firmware-version <version>: Firmware version to embed.
|
||||
@@ -132,6 +133,9 @@ $ bash build.sh build-room-server-firmwares
|
||||
Build all sensor firmwares
|
||||
$ bash build.sh build-sensor-firmwares
|
||||
|
||||
Build all kiss radio firmwares
|
||||
$ bash build.sh build-kiss-radio-firmwares
|
||||
|
||||
Environment Variables:
|
||||
FIRMWARE_VERSION=vX.Y.Z: Firmware version to embed in the build output.
|
||||
If not set, build.sh derives a default from the latest matching git tag and appends "-dev".
|
||||
@@ -1274,6 +1278,9 @@ get_pio_envs_for_variant_role() {
|
||||
sensor:sensor|sensor:*_sensor)
|
||||
echo "$env"
|
||||
;;
|
||||
kiss:kiss_modem|kiss:*_kiss_modem)
|
||||
echo "$env"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
@@ -2424,6 +2431,10 @@ resolve_sensor_firmwares() {
|
||||
get_pio_envs_for_variant_role sensor
|
||||
}
|
||||
|
||||
resolve_kiss_radio_firmwares() {
|
||||
get_pio_envs_for_variant_role kiss
|
||||
}
|
||||
|
||||
resolve_full_esp32_firmwares() {
|
||||
local env_name
|
||||
|
||||
@@ -2461,6 +2472,9 @@ get_bulk_build_resolver_name() {
|
||||
build-sensor-firmwares)
|
||||
echo "resolve_sensor_firmwares"
|
||||
;;
|
||||
build-kiss-radio-firmwares)
|
||||
echo "resolve_kiss_radio_firmwares"
|
||||
;;
|
||||
*)
|
||||
return 1
|
||||
;;
|
||||
@@ -2567,7 +2581,7 @@ resolve_command_targets() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
if is_bulk_build_command "$1"; then
|
||||
if is_bulk_build_command "$1" && [ "$1" != "build-kiss-radio-firmwares" ]; then
|
||||
prompt_for_kiss_modem_build_policy
|
||||
if [ ${#RESOLVED_BUILD_TARGETS[@]} -eq 0 ]; then
|
||||
echo "No build targets remain after skipping KISS modem targets."
|
||||
@@ -3222,7 +3236,6 @@ main() {
|
||||
if ! resolve_command_targets "$@"; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! is_automatic_profile_command "$1" && [ -n "$MQTT_BRIDGE_OVERRIDE" ]; then
|
||||
if ! normalize_resolved_targets_for_mqtt "$1"; then
|
||||
exit 1
|
||||
|
||||
@@ -440,6 +440,8 @@ Byte 0: 0x14
|
||||
- Uses a secret key derived from the channel name
|
||||
- It is the first 16 bytes of `sha256("#test")`
|
||||
- For example hashtag channel `#test` has the key: `9cd8fcf22a47333b591d96a2b848b73f`
|
||||
- Traffic is encrypted on air, but anyone who knows or guesses the channel
|
||||
name can derive the key. Hashtag channels should not be treated as private.
|
||||
- Used as a topic based public group chat, separate from the default public channel
|
||||
3. **Private Channels**
|
||||
- Uses a randomly generated 16-byte secret key
|
||||
|
||||
@@ -251,6 +251,9 @@ same-timestamp mismatches are rejected.
|
||||
|
||||
The plaintext contained in the ciphertext matches the format described in [plain text message](#plain-text-message). Specifically, it consists of a four byte timestamp, a flags byte, and the message. The flags byte will generally be `0x00` because it is a "plain text message". The message will be of the form `<sender name>: <message body>` (eg., `user123: I'm on my way`).
|
||||
|
||||
The sender name is unverified message text. Group messages contain no sender
|
||||
signature, so any channel-key holder can choose any sender name.
|
||||
|
||||
## Group datagram
|
||||
|
||||
| Field | Size (bytes) | Description |
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#define FIRMWARE_VER_CODE 13
|
||||
|
||||
#ifndef FIRMWARE_BUILD_DATE
|
||||
#define FIRMWARE_BUILD_DATE "6 Jun 2026"
|
||||
#define FIRMWARE_BUILD_DATE "9 Aug 2026"
|
||||
#endif
|
||||
|
||||
#ifndef FIRMWARE_VERSION
|
||||
|
||||
@@ -358,11 +358,7 @@ void UITask::userLedHandler() {
|
||||
static bool ext_powered = false, ext_charging = false;
|
||||
if (cur_time > next_pwr_check) {
|
||||
ext_powered = _board->isExternalPowered();
|
||||
bool chrg = digitalRead(EXT_CHRG_DETECT) == LOW;
|
||||
#ifdef EXT_CHRG_DONE
|
||||
if (digitalRead(EXT_CHRG_DONE) == LOW) chrg = false; // charge-done wins
|
||||
#endif
|
||||
ext_charging = ext_powered && chrg;
|
||||
ext_charging = ext_powered && digitalRead(EXT_CHRG_DETECT) == LOW;
|
||||
next_pwr_check = cur_time + 1000;
|
||||
}
|
||||
if (ext_powered && _msgcount == 0) {
|
||||
|
||||
@@ -120,7 +120,7 @@ struct NeighbourInfo {
|
||||
};
|
||||
|
||||
#ifndef FIRMWARE_BUILD_DATE
|
||||
#define FIRMWARE_BUILD_DATE "6 Jun 2026"
|
||||
#define FIRMWARE_BUILD_DATE "9 Aug 2026"
|
||||
#endif
|
||||
#ifndef FIRMWARE_BUILD_EPOCH
|
||||
#define FIRMWARE_BUILD_EPOCH 0UL
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
/* ------------------------------ Config -------------------------------- */
|
||||
|
||||
#ifndef FIRMWARE_BUILD_DATE
|
||||
#define FIRMWARE_BUILD_DATE "6 Jun 2026"
|
||||
#define FIRMWARE_BUILD_DATE "9 Aug 2026"
|
||||
#endif
|
||||
|
||||
#ifndef FIRMWARE_VERSION
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
#define PERM_RECV_ALERTS_HI (1 << 7) // high priority alerts
|
||||
|
||||
#ifndef FIRMWARE_BUILD_DATE
|
||||
#define FIRMWARE_BUILD_DATE "6 Jun 2026"
|
||||
#define FIRMWARE_BUILD_DATE "9 Aug 2026"
|
||||
#endif
|
||||
|
||||
#ifndef FIRMWARE_VERSION
|
||||
|
||||
+1
-1
@@ -124,7 +124,7 @@ build_flags = ${arduino_base.build_flags}
|
||||
-D USE_CC310_HW_CRYPTO=1
|
||||
lib_deps =
|
||||
${arduino_base.lib_deps}
|
||||
https://github.com/oltaco/CustomLFS#0.2.2
|
||||
https://github.com/oltaco/CustomLFS#0.2.3
|
||||
|
||||
; Shared LoRa OTA recipe for nRF52840 variants. nRF52840 has no A/B slot, so the update is
|
||||
; applied in place by the custom OTAFIX bootloader (in-place detools); the app only stages + verifies +
|
||||
|
||||
@@ -119,3 +119,8 @@ lib_deps =
|
||||
${LilyGo_T-Echo_Card.lib_deps}
|
||||
end2endzone/NonBlockingRTTTL@^1.3.0
|
||||
densaugeo/base64 @ ~1.4.0
|
||||
|
||||
[env:LilyGo_T-Echo_Card_kiss_modem]
|
||||
extends = LilyGo_T-Echo_Card
|
||||
build_src_filter = ${LilyGo_T-Echo_Card.build_src_filter}
|
||||
+<../examples/kiss_modem/>
|
||||
@@ -12,10 +12,9 @@ build_flags = ${rak4631_hw.build_flags}
|
||||
-D WRAPPER_CLASS=CustomSX1262Wrapper
|
||||
-D LORA_TX_POWER=22
|
||||
-D SX126X_POWER_EN=30
|
||||
-D SX126X_DIO3_TCXO_VOLTAGE=1.8
|
||||
-D SX126X_DIO3_TCXO_VOLTAGE=3.0
|
||||
-D SX126X_CURRENT_LIMIT=140
|
||||
-D SX126X_RX_BOOSTED_GAIN=1
|
||||
-D SX126X_USE_REGULATOR_LDO=1
|
||||
-D P_LORA_TX_LED=LED_GREEN
|
||||
-D DISABLE_DIAGNOSTIC_OUTPUT
|
||||
-D ENV_INCLUDE_GPS=1
|
||||
@@ -117,7 +116,7 @@ build_flags =
|
||||
-D WRAPPER_CLASS=CustomSX1262Wrapper
|
||||
-D LORA_TX_POWER=22
|
||||
-D SX126X_POWER_EN=30
|
||||
-D SX126X_DIO3_TCXO_VOLTAGE=1.8
|
||||
-D SX126X_DIO3_TCXO_VOLTAGE=3.0
|
||||
-D SX126X_CURRENT_LIMIT=140
|
||||
-D SX126X_RX_BOOSTED_GAIN=1
|
||||
-D P_LORA_TX_LED=LED_GREEN
|
||||
@@ -162,6 +161,7 @@ build_flags =
|
||||
-D WRAPPER_CLASS=CustomSX1262Wrapper
|
||||
-D LORA_TX_POWER=22
|
||||
-D SX126X_POWER_EN=30
|
||||
-D SX126X_DIO3_TCXO_VOLTAGE=3.0
|
||||
-D SX126X_CURRENT_LIMIT=140
|
||||
-D SX126X_RX_BOOSTED_GAIN=1
|
||||
-D P_LORA_TX_LED=LED_GREEN
|
||||
|
||||
@@ -105,12 +105,14 @@
|
||||
#define LORA_CS _PINNUM(0, 11)
|
||||
#define SX126X_POWER_EN _PINNUM(0, 30)
|
||||
#define SX126X_DIO1 _PINNUM(1, 8)
|
||||
#define SX126X_DIO2 _PINNUM(0, 5)
|
||||
#define SX126X_BUSY _PINNUM(0, 14)
|
||||
#define SX126X_RESET _PINNUM(0, 7)
|
||||
#define SX126X_RXEN _PINNUM(1, 1)
|
||||
#define SX126X_TXEN _PINNUM(0, 27)
|
||||
|
||||
#define P_LORA_DIO_1 SX126X_DIO1
|
||||
#define P_LORA_DIO_2 SX126X_DIO2
|
||||
#define P_LORA_NSS LORA_CS
|
||||
#define P_LORA_RESET SX126X_RESET
|
||||
#define P_LORA_BUSY SX126X_BUSY
|
||||
|
||||
@@ -98,3 +98,8 @@ build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter}
|
||||
lib_deps =
|
||||
${LilyGo_TETH_Elite_sx1262.lib_deps}
|
||||
densaugeo/base64 @ ~1.4.0
|
||||
|
||||
[env:LilyGo_TETH_Elite_sx1262_kiss_modem]
|
||||
extends = LilyGo_TETH_Elite_sx1262
|
||||
build_src_filter = ${LilyGo_TETH_Elite_sx1262.build_src_filter}
|
||||
+<../examples/kiss_modem/>
|
||||
@@ -75,6 +75,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
|
||||
board_upload.maximum_size = 708608
|
||||
build_flags = ${MeshTracker_X1.build_flags}
|
||||
-I examples/companion_radio/ui-orig
|
||||
-D QSPIFLASH=1
|
||||
-D MAX_CONTACTS=350
|
||||
-D MAX_GROUP_CHANNELS=40
|
||||
; -D MESH_PACKET_LOGGING=1
|
||||
@@ -103,6 +104,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
|
||||
board_upload.maximum_size = 708608
|
||||
build_flags = ${MeshTracker_X1.build_flags}
|
||||
-I examples/companion_radio/ui-orig
|
||||
-D QSPIFLASH=1
|
||||
-D MAX_CONTACTS=350
|
||||
-D MAX_GROUP_CHANNELS=40
|
||||
-D BLE_PIN_CODE=123456
|
||||
@@ -128,3 +130,8 @@ lib_deps = ${MeshTracker_X1.lib_deps}
|
||||
stevemarple/MicroNMEA @ ^2.0.6
|
||||
end2endzone/NonBlockingRTTTL@^1.3.0
|
||||
adafruit/Adafruit DRV2605 Library @ ^1.2.4
|
||||
|
||||
[env:MeshTracker_X1_kiss_modem]
|
||||
extends = MeshTracker_X1
|
||||
build_src_filter = ${MeshTracker_X1.build_src_filter}
|
||||
+<../examples/kiss_modem/>
|
||||
@@ -63,13 +63,15 @@ void initVariant()
|
||||
{
|
||||
pinMode(BATTERY_PIN, INPUT);
|
||||
pinMode(EXT_CHRG_DETECT, INPUT_PULLUP);
|
||||
pinMode(EXT_CHRG_DONE, INPUT_PULLUP);
|
||||
pinMode(EXT_PWR_DETECT, INPUT);
|
||||
pinMode(PIN_BUTTON1, INPUT_PULLDOWN);
|
||||
|
||||
pinMode(PIN_3V3_EN, OUTPUT);
|
||||
digitalWrite(PIN_3V3_EN, HIGH);
|
||||
|
||||
pinMode(PIN_FLASH_EN, OUTPUT);
|
||||
digitalWrite(PIN_FLASH_EN, HIGH);
|
||||
|
||||
pinMode(PIN_BAT_ADC_EN, OUTPUT);
|
||||
digitalWrite(PIN_BAT_ADC_EN, HIGH);
|
||||
|
||||
|
||||
@@ -25,7 +25,8 @@
|
||||
#define ADC_MULTIPLIER (2.0F)
|
||||
|
||||
#define EXT_CHRG_DETECT (35) // P1.3, LOW while charging
|
||||
#define EXT_CHRG_DONE (36) // P1.4, LOW when charge complete
|
||||
// P1.4 is the charger's second status line, but it reads LOW regardless of
|
||||
// charge state on this board, so it is not used (Meshtastic leaves it out too)
|
||||
#define EXT_PWR_DETECT (5) // P0.5
|
||||
|
||||
#define ADC_RESOLUTION (14)
|
||||
@@ -122,3 +123,17 @@
|
||||
// Buzzer
|
||||
|
||||
#define BUZZER_PIN (25) // P0.25, pwm output
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// QSPI Flash
|
||||
|
||||
#define PIN_FLASH_EN (15) // P0.15 (Flash power enable)
|
||||
|
||||
#define PIN_QSPI_SCK (19) // P0.19
|
||||
#define PIN_QSPI_CS (20) // P0.20
|
||||
#define PIN_QSPI_IO0 (21) // P0.21
|
||||
#define PIN_QSPI_IO1 (22) // P0.22
|
||||
#define PIN_QSPI_IO2 (23) // P0.23
|
||||
#define PIN_QSPI_IO3 (32) // P1.00
|
||||
|
||||
#define EXTERNAL_FLASH_DEVICES GD25Q64C
|
||||
@@ -33,7 +33,7 @@ lib_deps=${esp32_base.lib_deps}
|
||||
lovyan03/LovyanGFX @ ^1.2.7
|
||||
|
||||
[env:SenseCapIndicator-ESPNow_comp_radio_usb]
|
||||
extends =SenseCapIndicator-ESPNow
|
||||
extends = SenseCapIndicator-ESPNow
|
||||
build_flags =
|
||||
${SenseCapIndicator-ESPNow.build_flags}
|
||||
-I examples/companion_radio/ui-new
|
||||
@@ -47,4 +47,4 @@ build_src_filter = ${SenseCapIndicator-ESPNow.build_src_filter}
|
||||
+<../examples/companion_radio/*.cpp>
|
||||
lib_deps =
|
||||
${SenseCapIndicator-ESPNow.lib_deps}
|
||||
densaugeo/base64 @ ~1.4.0
|
||||
densaugeo/base64 @ ~1.4.0
|
||||
@@ -110,3 +110,8 @@ build_src_filter = ${SenseCap_Solar.build_src_filter}
|
||||
lib_deps =
|
||||
${SenseCap_Solar.lib_deps}
|
||||
densaugeo/base64 @ ~1.4.0
|
||||
|
||||
[env:SenseCap_Solar_kiss_modem]
|
||||
extends = SenseCap_Solar
|
||||
build_src_filter = ${SenseCap_Solar.build_src_filter}
|
||||
+<../examples/kiss_modem/>
|
||||
@@ -302,7 +302,7 @@ build_flags =
|
||||
-D WIFI_DEBUG_LOGGING=1
|
||||
-D WIFI_SSID='"myssid"'
|
||||
-D WIFI_PWD='"mypwd"'
|
||||
-D OFFLINE_QUEUE_SIZE=256
|
||||
-D OFFLINE_QUEUE_SIZE=256
|
||||
; -D MESH_PACKET_LOGGING=1
|
||||
; -D MESH_DEBUG=1
|
||||
build_src_filter = ${Station_G2.build_src_filter}
|
||||
@@ -315,13 +315,11 @@ lib_deps =
|
||||
|
||||
[env:Station_G2_kiss_modem]
|
||||
extends = Station_G2
|
||||
build_unflags =
|
||||
-DARDUINO_USB_MODE=0
|
||||
build_flags =
|
||||
${Station_G2.build_flags}
|
||||
-UENABLE_OTA
|
||||
-D DISABLE_LORA_OTA=1
|
||||
-DARDUINO_USB_MODE=1
|
||||
-D ARDUINO_USB_MODE=1
|
||||
build_src_filter = ${Station_G2.build_src_filter}
|
||||
+<../examples/kiss_modem/>
|
||||
|
||||
|
||||
Reference in new issue
Block a user