From 950d5defda88abfd2d033410184e855c38fd4bc2 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sat, 5 Nov 2022 09:28:41 -0500 Subject: [PATCH] Master to develop (resolves conflicts) (#1903) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Rearranging deck chairs, 900M22S working, 30S not * We do have wire, just not where it's expected * Put more of the module specific pins in their blocks * tryfix compile with NO_SCREEN * Portduino only: don't continue to try rebooting (#1887) Co-authored-by: Thomas Göttgens * Support for TLORA 2.1-1.8 * Don't allow arbitrary channel name for admin (#1886) Co-authored-by: Ben Meadors * Experimental DIY nrf52840 feather support (#1884) * Experimental DIY nrf52840 feather support * Fix target * sx1262 wiring * Remove lib * Don't consider Response as ACK for FloodingRouter (#1885) Co-authored-by: Ben Meadors * Fix feather diy (#1892) * Fix variant * Fix feather diy target * [modules][external notifications] allow select channel to listen to * Fix feather diy pin mapping (#1894) Thanks to @markbirss * [create-pull-request] automated change * Override Screen Autodtect * Maybe fix crash of this board. * Fixes reset loop with new espressif32 platform on tlora-v2 Sending a pulse to the OLED_RESET Pin 16 results in a reset loop using recent version of the espressif32 platform. * Experiment with self hosted action runner * Fix MQTT on ETH * revert the tryfix * Cheating * Cleanup artifacts older than 1 month * Update cleanup_artifacts.yml * Update cleanup_artifacts.yml * Update cleanup_artifacts.yml * Delete cleanup_artifacts.yml * fix: use RF95_IRQ for wakeup source in doLightSleep (#1899) Co-authored-by: Thomas Göttgens Co-authored-by: Ben Meadors * Update protos * Update protos Co-authored-by: code8buster Co-authored-by: Thomas Göttgens Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com> Co-authored-by: Mykhailo Lesyk Co-authored-by: Mykhailo Lesyk Co-authored-by: caveman99 Co-authored-by: he-leon Co-authored-by: Lars Weber --- src/mesh/Router.cpp | 6 +++--- src/mesh/generated/config.pb.c | 1 - src/sleep.cpp | 4 ++-- variants/tlora_v2/variant.h | 4 +--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp index 815571b9b..e0746bdd9 100644 --- a/src/mesh/Router.cpp +++ b/src/mesh/Router.cpp @@ -11,7 +11,7 @@ extern "C" { #include "mesh/compression/unishox2.h" } -#if HAS_WIFI +#if HAS_WIFI || HAS_ETHERNET #include "mqtt/MQTT.h" #endif @@ -209,7 +209,7 @@ ErrorCode Router::send(MeshPacket *p) if (p->which_payload_variant == MeshPacket_decoded_tag) { ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it -#if HAS_WIFI +#if HAS_WIFI || HAS_ETHERNET // check if we should send decrypted packets to mqtt // truth table: @@ -240,7 +240,7 @@ ErrorCode Router::send(MeshPacket *p) return encodeResult; // FIXME - this isn't a valid ErrorCode } -#if HAS_WIFI +#if HAS_WIFI || HAS_ETHERNET // the packet is now encrypted. // check if we should send encrypted packets to mqtt if (mqtt && shouldActuallyEncrypt) diff --git a/src/mesh/generated/config.pb.c b/src/mesh/generated/config.pb.c index 2b75b7558..c5bc69552 100644 --- a/src/mesh/generated/config.pb.c +++ b/src/mesh/generated/config.pb.c @@ -43,4 +43,3 @@ PB_BIND(Config_BluetoothConfig, Config_BluetoothConfig, AUTO) - diff --git a/src/sleep.cpp b/src/sleep.cpp index 055cf770d..390ab7f65 100644 --- a/src/sleep.cpp +++ b/src/sleep.cpp @@ -263,8 +263,8 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r #ifdef BUTTON_PIN gpio_wakeup_enable((gpio_num_t)BUTTON_PIN, GPIO_INTR_LOW_LEVEL); // when user presses, this button goes low #endif -#ifdef RF95_IRQ_GPIO - gpio_wakeup_enable((gpio_num_t)RF95_IRQ_GPIO, GPIO_INTR_HIGH_LEVEL); // RF95 interrupt, active high +#ifdef RF95_IRQ + gpio_wakeup_enable((gpio_num_t)RF95_IRQ, GPIO_INTR_HIGH_LEVEL); // RF95 interrupt, active high #endif #ifdef PMU_IRQ // wake due to PMU can happen repeatedly if there is no battery installed or the battery fills diff --git a/variants/tlora_v2/variant.h b/variants/tlora_v2/variant.h index 1bff09fb0..0c854e37a 100644 --- a/variants/tlora_v2/variant.h +++ b/variants/tlora_v2/variant.h @@ -8,8 +8,6 @@ #define I2C_SDA 21 // I2C pins for this board #define I2C_SCL 22 -#define RESET_OLED 16 // If defined, this pin will be used to reset the display controller - #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost #define LED_PIN 25 // If defined we will blink this LED #define BUTTON_PIN \ @@ -21,4 +19,4 @@ #define LORA_DIO0 26 // a No connect on the SX1262 module #define LORA_RESET 14 #define LORA_DIO1 35 // Not really used -#define LORA_DIO2 34 // Not really used \ No newline at end of file +#define LORA_DIO2 34 // Not really used