Merge pull request #746 from geeksville/dev1.2

fixing bugs for the sat release

.github/pull_request_template.md

@@ -7,7 +7,7 @@
   is appreciated." This will allow other devs to potentially save you time by not accidentially duplicating work etc...
 - Please do not check in files that don't have real changes
 - Please do not reformat lines that you didn't have to change the code on
-- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor,
+- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor and the 'clang-format' extension,
   because automatically follows our indentation rules and it's auto reformatting will not cause spurious changes to lines.
 - If your PR fixes a bug, mention "fixes #bugnum" somewhere in your pull request description.
 - If your other co-developers have comments on your PR please tweak as needed.

.vscode/extensions.json

@@ -2,6 +2,7 @@
     // See http://go.microsoft.com/fwlink/?LinkId=827846
     // for the documentation about the extensions.json format
     "recommendations": [
-        "platformio.platformio-ide"
+        "platformio.platformio-ide",
+        "xaver.clang-format"
     ]
 }

.vscode/settings.json

@@ -77,5 +77,6 @@
             "--java_out=/tmp",
             "-I=/home/kevinh/development/meshtastic/meshtastic-esp32/proto"
         ]
-    }    
+    },
+    "editor.formatOnSave": true
 }

bin/program-1.0-tbeam.sh

@@ -0,0 +1,3 @@
+esptool.py --baud 921600 write_flash 0x10000 release/archive/old/firmware-tbeam-EU865-1.0.0.bin
+echo "Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used"
+esptool.py --baud 921600 erase_region 0xe000 0x2000

bin/program-1.1-tbeam.sh

@@ -1 +1 @@
-esptool.py --baud 921600 write_flash 0x10000 release/archive/firmware-tbeam-1.1.50.bin
+esptool.py --baud 921600 write_flash 0x10000 release/archive/old/firmware-tbeam-1.1.50.bin

docs/software/TODO.md

@@ -2,16 +2,26 @@
 
 You probably don't care about this section - skip to the next one.
 
+## before next release
+
+* DONE timestamps on oled screen are wrong - don't seem to be updating based on message rx (actually: this is expected behavior when no node on the mesh has GPS time)
+* DONE add ch-del
+* DONE channel hash suffixes are wrong on android
+* DONE before next relase: test empty channel sets on android
+* DONE channel sharing in android
+* DONE test 1.0 firmware update on android
+* DONE test 1.1 firmware update on android
+* test 1.2.10 firmware update on android
+* DONE test link sharing on android
+* luxon bug report - seeing rx acks for nodes that are not on the network
+* document how to do remote admin
+* release py, android, device
+  
 ## 1.2 cleanup & multichannel support:
 
-* before next relase: test empty channel sets on android
-* test link sharing on android
-  
 * DONE cleanup the external notification and serial plugins
 * non ack version of stress test fails sometimes!
-* timestamps on oled screen are wrong - don't seem to be updating based on message rx
-* luxon bug report - seeing rx acks for nodes that are not on the network
-* channel hash suffixes are wrong on android
+
 * tx fault test has a bug #734
 * DONE move device types into an enum in nodeinfo
 * fix android to use new device types for firmware update

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-;default_envs = tbeam
+default_envs = tbeam
 ;default_envs = tbeam0.7
 ;default_envs = heltec
 ;default_envs = tlora-v1
@@ -17,7 +17,7 @@
 ;default_envs = lora-relay-v1 # nrf board
 ;default_envs = eink
 ;default_envs = nrf52840dk-geeksville
-default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
+;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
 
 [common]
 ; common is not currently used

src/configuration.h

@@ -338,7 +338,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #elif defined(TLORA_V2_1_16)
 // This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_TLORA_V2_1p6_
+#define HW_VENDOR HardwareModel_TLORA_V2_1_1p6
 
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN
@@ -382,8 +382,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define LED_PIN 12 // If defined we will blink this LED
 //#define BUTTON_PIN 36  // If defined, this will be used for user button presses (ToDo problem on that line on debug screen -->
-//Long press start!) #define BUTTON_NEED_PULLUP //GPIOs 34 to 39 are GPIs – input only pins. These pins don’t have internal
-//pull-ups or pull-down resistors.
+// Long press start!) #define BUTTON_NEED_PULLUP //GPIOs 34 to 39 are GPIs – input only pins. These pins don’t have internal
+// pull-ups or pull-down resistors.
 
 #define USE_RF95
 #define LORA_DIO0 38 // a No connect on the SX1262 module

src/plugins/AdminPlugin.cpp

@@ -55,7 +55,7 @@ bool AdminPlugin::handleReceivedProtobuf(const MeshPacket &mp, const AdminMessag
         break;
 
     case AdminMessage_set_channel_tag:
-        DEBUG_MSG("Client is setting channel\n");
+        DEBUG_MSG("Client is setting channel %d\n", r->set_channel.index);
         handleSetChannel(r->set_channel);
         break;
 
@@ -113,8 +113,7 @@ void AdminPlugin::handleSetChannel(const Channel &cc)
     if (cc.index == 0) {
         // FIXME, this updates the user preferences also, which isn't needed - we really just want to notify on configChanged
         service.reloadConfig();
-    }
-    else {
+    } else {
         channels.onConfigChanged(); // tell the radios about this change
         nodeDB.saveChannelsToDisk();
     }

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1  
 minor = 2
-build = 10
+build = 11