diff --git a/platformio.ini b/platformio.ini index ba5c37489..7bb2f339e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -115,8 +115,9 @@ platform_packages = ;upload_port = /dev/ttyUSB0 ;monitor_port = /dev/ttyUSB0 -upload_port = /dev/cu.SLAB_USBtoUART -monitor_port = /dev/cu.SLAB_USBtoUART +; Please don't delete these lines. JM uses them. +;upload_port = /dev/cu.SLAB_USBtoUART +;monitor_port = /dev/cu.SLAB_USBtoUART ; customize the partition table ; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables diff --git a/src/configuration.h b/src/configuration.h index 59d0cf712..5de429c6b 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -131,6 +131,8 @@ along with this program. If not, see . //#define DISABLE_NTP +#define DISABLE_WELCOME_UNSET + // ----------------------------------------------------------------------------- // OLED & Input // ----------------------------------------------------------------------------- diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index 0ccc46b22..2b2cb7789 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -894,9 +894,11 @@ int32_t Screen::runOnce() showingBootScreen = false; } +#ifndef DISABLE_WELCOME_UNSET if (radioConfig.preferences.region == RegionCode_Unset) { setWelcomeFrames(); } +#endif // Process incoming commands. for (;;) { diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp index 9487231fd..cb5bea03e 100644 --- a/src/mesh/Router.cpp +++ b/src/mesh/Router.cpp @@ -360,13 +360,13 @@ Routing_Error perhapsEncode(MeshPacket *p) } else { DEBUG_MSG("Compressing message.\n"); // Copy the compressed data into the meshpacket - p->decoded.payload_compressed.size = compressed_len; - memcpy(p->decoded.payload_compressed.bytes, compressed_out, compressed_len); + //p->decoded.payload_compressed.size = compressed_len; + //memcpy(p->decoded.payload_compressed.bytes, compressed_out, compressed_len); - p->decoded.which_payloadVariant = Data_payload_compressed_tag; + //p->decoded.which_payloadVariant = Data_payload_compressed_tag; } - if (0) { + if (1) { char decompressed_out[Constants_DATA_PAYLOAD_LEN] = {}; int decompressed_len;