fix release script

.github/workflows/main.yml

@@ -78,16 +78,9 @@ jobs:
     - name: Build everything
       run: bin/build-all.sh
 
-    - name: Store binaries as an artifact
+    - name: Store release zip as an artifact
       uses: actions/upload-artifact@v2
       with:
         name: built
         path: release/archive/firmware-*.zip
         retention-days: 30
-
-    - name: Store debugging elf files as an artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: debug-elfs
-        path: release/archive/elfs-*.zip
-        retention-days: 7

.github/workflows/release.yml

@@ -49,7 +49,7 @@ jobs:
 
     # Will be available in steps.version.outputs.version
     - name: Get version string
-      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+      run: echo "::set-output name=version::$(./bin/buildinfo.py)"
       id: version
 
     - name: Build everything
@@ -69,7 +69,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ github.token }}
 
-    - name: Add bins to release
+    - name: Add artifact to release
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ github.token }}
@@ -77,14 +77,4 @@ jobs:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: release/archive/firmware-${{ steps.version.outputs.version }}.zip
         asset_name: firmware-${{ steps.version.outputs.version }}.zip
-        asset_content_type: application/zip
-
-    - name: Add debug elfs to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: release/archive/elfs-${{ steps.version.outputs.version }}.zip
-        asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip
-        asset_content_type: application/zip        
+        asset_content_type: application/zip

README.md

@@ -187,7 +187,7 @@ Hard resetting via RTS pin...
 
 # Meshtastic Android app
 
-The companion (optional, free, open-source) Meshtastic Android app is available on various appstores [see this page for details](https://github.com/meshtastic/Meshtastic-Android/blob/master/README.md).
+The companion (optional) Meshtastic Android app is [here](https://play.google.com/store/apps/details?id=com.geeksville.mesh&referrer=utm_source%3Dgithub-dev-readme). You can also download it on Google Play.
 
 # Python API
 

bin/build-all.sh

@@ -10,7 +10,6 @@ BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v2.0 helt
 
 # FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine
 BOARDS_NRF52="rak4631 t-echo"
-#BOARDS_NRF52=""
 
 OUTDIR=release/latest
 
@@ -99,9 +98,6 @@ XML
 
 echo Generating $ARCHIVEDIR/firmware-$VERSION.zip
 rm -f $ARCHIVEDIR/firmware-$VERSION.zip
-zip --junk-paths $ARCHIVEDIR/firmware-$VERSION.zip $ARCHIVEDIR/spiffs-$VERSION.bin $OUTDIR/bins/universal/firmware-*-$VERSION.* images/system-info.bin bin/device-install.* bin/device-update.*
-echo Generating $ARCHIVEDIR/elfs-$VERSION.zip
-rm -f $ARCHIVEDIR/elfs-$VERSION.zip
-zip --junk-paths $ARCHIVEDIR/elfs-$VERSION.zip $OUTDIR/elfs/universal/firmware-*-$VERSION.* 
+zip --junk-paths $ARCHIVEDIR/firmware-$VERSION.zip $ARCHIVEDIR/spiffs-$VERSION.bin $OUTDIR/bins/universal/firmware-*-$VERSION.* images/system-info.bin bin/device-install.sh bin/device-update.sh
 
 echo BUILT ALL

bin/promote-release.sh

@@ -2,7 +2,7 @@ set -e
 
 echo "This script is only for developers who are publishing new builds on github.  Most users don't need it"
 
-VERSION=`bin/buildinfo.py long`
+VERSION=`bin/buildinfo.py short`
 
 # Must have a V prefix to trigger github
 git tag "v${VERSION}"

geeksville-private/TODO.md

@@ -2,19 +2,22 @@
 
 You probably don't care about this section - skip to the next one.
 
-* list portduino on platformio
+* DONE investigate TCP on ESP32 https://github.com/meshtastic/Meshtastic-device/issues/807
+* DONE fix python tool problem with windows and the heartbeat
 * router mode dropping messages? https://meshtastic.discourse.group/t/router-mode-missing-messages/3329/3
 * fix ttgo eink screen
+* list portduino on platformio
+* DONE make native sim not touch hardware
+* DONE reenable sim in CI builds
 * figure our wss for mqtt.meshtastic - use cloudflare? 2052 ws, 2053 crypt
-* measure rak4630 power draw and turn off power for GPS most of the time.  We should be able to run on the small solar panel.
 * pine64 lora module
 * @havealoha fixedposition not working
 * ask for vercel access
 * finish plan for riot.im
 * turn on setTx(timeout) and   state = setDioIrqParams(SX126X_IRQ_TX_DONE | SX126X_IRQ_TIMEOUT, SX126X_IRQ_TX_DONE | SX126X_IRQ_TIMEOUT); in sx1262 code
+* DONE fix this sleep problem: https://meshtastic.discourse.group/t/new-device-release-1-2-30-ready-for-alpha-testing/3272/13?u=geeksville
 * add rak4600 support (with rf95 radio and limited ram)
-* store esp32 crashes to flash (and 64KB coredump partition) - https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/core_dump.html
-* 
+
 * Switch to use https://github.com/adafruit/Adafruit_nRF52_Arduino.git when available (see arduino code for examples)
 * DONE @luxonn reports that after a while the android app stops showing new messages
 * DONE release android APK - fix recent 1.2.28 crash report

geeksville-private/windows-build-instructions.md

@@ -1,7 +0,0 @@
-
-
-* install python
-* install git (including git-bash)
-* install platformio
-* install vscode
-* install https://sourceforge.net/projects/mingw-w64/ (for windows gcc/g++) - you'll need to add the bin directory to your PATH

src/RedirectablePrint.cpp

@@ -5,7 +5,6 @@
 #include <assert.h>
 #include <sys/time.h>
 #include <time.h>
-#include <cstring>
 
 /**
  * A printer that doesn't go anywhere

src/mesh/PacketHistory.h

@@ -4,6 +4,8 @@
 #include <queue>
 #include <unordered_set>
 
+using namespace std;
+
 /// We clear our old flood record five minute after we see the last of it
 #define FLOOD_EXPIRE_TIME (5 * 60 * 1000L)
 
@@ -21,7 +23,7 @@ struct PacketRecord {
 class PacketRecordHashFunction
 {
   public:
-    size_t operator()(const PacketRecord &p) const { return (std::hash<NodeNum>()(p.sender)) ^ (std::hash<PacketId>()(p.id)); }
+    size_t operator()(const PacketRecord &p) const { return (hash<NodeNum>()(p.sender)) ^ (hash<PacketId>()(p.id)); }
 };
 
 /// Order packet records by arrival time, we want the oldest packets to be in the front of our heap
@@ -52,7 +54,7 @@ class PacketHistory
     /** FIXME: really should be a std::unordered_set with the key being sender,id.
      * This would make checking packets in wasSeenRecently faster.
      */
-    std::vector<PacketRecord> recentPackets;
+    vector<PacketRecord> recentPackets;
     // priority_queue<PacketRecord, vector<PacketRecord>, PacketRecordOrderFunction> arrivalTimes;
     // unordered_set<PacketRecord, PacketRecordHashFunction> recentPackets;
 

src/mesh/ReliableRouter.h

@@ -51,7 +51,7 @@ struct PendingPacket {
 class GlobalPacketIdHashFunction
 {
   public:
-    size_t operator()(const GlobalPacketId &p) const { return (std::hash<NodeNum>()(p.node)) ^ (std::hash<PacketId>()(p.id)); }
+    size_t operator()(const GlobalPacketId &p) const { return (hash<NodeNum>()(p.node)) ^ (hash<PacketId>()(p.id)); }
 };
 
 /**
@@ -60,7 +60,7 @@ class GlobalPacketIdHashFunction
 class ReliableRouter : public FloodingRouter
 {
   private:
-    std::unordered_map<GlobalPacketId, PendingPacket, GlobalPacketIdHashFunction> pending;
+    unordered_map<GlobalPacketId, PendingPacket, GlobalPacketIdHashFunction> pending;
 
   public:
     /**

src/mesh/generated/mesh.pb.h

@@ -34,7 +34,7 @@ typedef enum _HardwareModel {
 
 typedef enum _Constants {
     Constants_Unused = 0,
-    Constants_DATA_PAYLOAD_LEN = 237
+    Constants_DATA_PAYLOAD_LEN = 240
 } Constants;
 
 typedef enum _CriticalErrorCode {

src/mesh/mesh-pb-constants.cpp

@@ -18,7 +18,7 @@ size_t pb_encode_to_bytes(uint8_t *destbuf, size_t destbufsize, const pb_msgdesc
 
     pb_ostream_t stream = pb_ostream_from_buffer(destbuf, destbufsize);
     if (!pb_encode(&stream, fields, src_struct)) {
-        DEBUG_MSG("Panic: can't encode protobuf reason='%s'\n", PB_GET_ERROR(&stream));
+        DEBUG_MSG("Panic: can't encode protobuf reason='%s', reason=%s\n", PB_GET_ERROR(&stream));
         assert(0); // If this asser fails it probably means you made a field too large for the max limits specified in mesh.options
     } else {
         return stream.bytes_written;
@@ -30,7 +30,7 @@ bool pb_decode_from_bytes(const uint8_t *srcbuf, size_t srcbufsize, const pb_msg
 {
     pb_istream_t stream = pb_istream_from_buffer(srcbuf, srcbufsize);
     if (!pb_decode(&stream, fields, dest_struct)) {
-        DEBUG_MSG("Error: can't decode protobuf reason='%s', pb_msgdesc 0x%p\n", PB_GET_ERROR(&stream), fields);
+        DEBUG_MSG("Error: can't decode protobuf reason='%s', pb_msgdesc 0x%p, reason=%s\n", PB_GET_ERROR(&stream), fields);
         return false;
     } else {
         return true;

src/nrf52/wifi-stubs.cpp

@@ -1,7 +1,7 @@
 //#include "mesh/wifi/WebServer.h"
 #include "configuration.h"
 
-#ifdef NO_ESP32
+#ifndef NO_ESP32
 
 //#include "mesh/wifi/WiFiAPClient.h"
 

src/portduino/wifi-stubs.cpp

@@ -0,0 +1 @@
+../nrf52/wifi-stubs.cpp

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1  
 minor = 2
-build = 39
+build = 36