From ad9cc40b97c4a2b201ccb36967ea9c71c453af3a Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sat, 17 Sep 2022 08:25:40 -0500 Subject: [PATCH 1/7] Increasebaud for local except for RAK11200 --- platformio.ini | 2 +- variants/rak11200/platformio.ini | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index e1dbe47e..d565ec7b 100644 --- a/platformio.ini +++ b/platformio.ini @@ -93,7 +93,7 @@ extends = arduino_base platform = espressif32@3.5.0 build_src_filter = ${arduino_base.build_src_filter} - - - -upload_speed = 115200 +upload_speed = 921600 debug_init_break = tbreak setup # Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging. diff --git a/variants/rak11200/platformio.ini b/variants/rak11200/platformio.ini index 96e155e2..602f5a24 100644 --- a/variants/rak11200/platformio.ini +++ b/variants/rak11200/platformio.ini @@ -3,3 +3,4 @@ extends = esp32_base board = wiscore_rak11200 build_flags = ${esp32_base.build_flags} -D RAK_11200 -I variants/rak11200 +upload_speed = 115200 From 128d20b29056e992c09a69bebeda56f1c40b5ef4 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sat, 17 Sep 2022 12:18:32 -0500 Subject: [PATCH 2/7] tx_enabled fix (#1699) * Defaults * Print --- src/mesh/NodeDB.h | 2 +- src/mesh/RadioLibInterface.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h index 30a7be94..fef98930 100644 --- a/src/mesh/NodeDB.h +++ b/src/mesh/NodeDB.h @@ -13,7 +13,7 @@ DeviceState versions used to be defined in the .proto file but really only this #define here. */ -#define DEVICESTATE_CUR_VER 17 +#define DEVICESTATE_CUR_VER 18 #define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER extern DeviceState devicestate; diff --git a/src/mesh/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp index 9cb88ae9..262a10c1 100644 --- a/src/mesh/RadioLibInterface.cpp +++ b/src/mesh/RadioLibInterface.cpp @@ -125,13 +125,13 @@ ErrorCode RadioLibInterface::send(MeshPacket *p) if (config.lora.region != Config_LoRaConfig_RegionCode_UNSET) { if (disabled || !config.lora.tx_enabled) { - DEBUG_MSG("send - lora_tx_disabled\n"); + DEBUG_MSG("send - !config.lora.tx_enabled\n"); packetPool.release(p); return ERRNO_DISABLED; } } else { - DEBUG_MSG("send - lora_tx_disabled because RegionCode_Unset\n"); + DEBUG_MSG("send - lora tx disable because RegionCode_Unset\n"); packetPool.release(p); return ERRNO_DISABLED; } @@ -140,8 +140,8 @@ ErrorCode RadioLibInterface::send(MeshPacket *p) #else - if (disabled || config.lora.tx_disabled) { - DEBUG_MSG("send - lora_tx_disabled\n"); + if (disabled || !config.lora.tx_enabled) { + DEBUG_MSG("send - !config.lora.tx_enabled\n"); packetPool.release(p); return ERRNO_DISABLED; } From 0e2ab75bb06c7dc55016283a2c5b53c403f6585c Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sat, 17 Sep 2022 14:49:09 -0500 Subject: [PATCH 3/7] Set tx_enabled upon initial region assignment (#1700) --- src/modules/AdminModule.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp index 917b1465..5aa91aed 100644 --- a/src/modules/AdminModule.cpp +++ b/src/modules/AdminModule.cpp @@ -177,6 +177,7 @@ void AdminModule::handleSetConfig(const Config &c) { bool requiresReboot = false; bool isRouter = (config.device.role == Config_DeviceConfig_Role_ROUTER); + bool isRegionUnset = (config.lora.region == Config_LoRaConfig_RegionCode_UNSET); switch (c.which_payload_variant) { case Config_device_tag: @@ -216,6 +217,10 @@ void AdminModule::handleSetConfig(const Config &c) DEBUG_MSG("Setting config: LoRa\n"); config.has_lora = true; config.lora = c.payload_variant.lora; + if (isRegionUnset && + config.lora.region > Config_LoRaConfig_RegionCode_UNSET) { + config.lora.tx_enabled = true; + } requiresReboot = true; break; case Config_bluetooth_tag: From 55c55fb7057edb4b3e8da36e5b5f1aaa1fbfaeb8 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sat, 17 Sep 2022 20:03:11 -0500 Subject: [PATCH 4/7] pip versions back in order --- .github/workflows/main_matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml index 0feb23c1..e41e8709 100644 --- a/.github/workflows/main_matrix.yml +++ b/.github/workflows/main_matrix.yml @@ -298,7 +298,7 @@ jobs: run: | python -m pip install --upgrade pip pip install -U platformio adafruit-nrfutil - pip install -U meshtastic meshtastic==1.3a32 # --pre meshtastic + pip install -U meshtastic --pre - name: Upgrade platformio run: | From 4bc29200be4cc1365638dc21f66875671aa85804 Mon Sep 17 00:00:00 2001 From: Andre K Date: Sun, 18 Sep 2022 11:41:27 -0300 Subject: [PATCH 5/7] fix default channel names (#1701) --- src/mesh/Channels.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp index b228cf8f..331458a6 100644 --- a/src/mesh/Channels.cpp +++ b/src/mesh/Channels.cpp @@ -215,25 +215,25 @@ const char *Channels::getName(size_t chIndex) else switch (config.lora.modem_preset) { case Config_LoRaConfig_ModemPreset_SHORT_SLOW: - channelName = "ShortS"; + channelName = "ShortSlow"; break; case Config_LoRaConfig_ModemPreset_SHORT_FAST: - channelName = "ShortF"; + channelName = "ShortFast"; break; case Config_LoRaConfig_ModemPreset_MEDIUM_SLOW: - channelName = "MedS"; + channelName = "MediumSlow"; break; case Config_LoRaConfig_ModemPreset_MEDIUM_FAST: - channelName = "MedF"; + channelName = "MediumFast"; break; case Config_LoRaConfig_ModemPreset_LONG_SLOW: - channelName = "LongS"; + channelName = "LongFast"; break; case Config_LoRaConfig_ModemPreset_LONG_FAST: - channelName = "LongF"; + channelName = "LongSlow"; break; case Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW: - channelName = "VeryL"; + channelName = "VLongSlow"; break; default: channelName = "Invalid"; From 80ddb81facd5cf0407e462e61dff1f2f7ee36cdf Mon Sep 17 00:00:00 2001 From: Andre K Date: Sun, 18 Sep 2022 17:31:59 -0300 Subject: [PATCH 6/7] fix yet another typo --- src/mesh/Channels.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp index 331458a6..a87d66b1 100644 --- a/src/mesh/Channels.cpp +++ b/src/mesh/Channels.cpp @@ -227,10 +227,10 @@ const char *Channels::getName(size_t chIndex) channelName = "MediumFast"; break; case Config_LoRaConfig_ModemPreset_LONG_SLOW: - channelName = "LongFast"; + channelName = "LongSlow"; break; case Config_LoRaConfig_ModemPreset_LONG_FAST: - channelName = "LongSlow"; + channelName = "LongFast"; break; case Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW: channelName = "VLongSlow"; From ae2c514ee78489460f7edde3ecb1377b09cd6965 Mon Sep 17 00:00:00 2001 From: thebentern Date: Sun, 18 Sep 2022 20:55:27 +0000 Subject: [PATCH 7/7] [create-pull-request] automated change --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 45a90e1a..39006420 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 1 minor = 3 -build = 41 +build = 42