Merge pull request #619 from geeksville/dev

1.1.31

src/portduino/PortduinoGlue.cpp

@@ -1,9 +1,12 @@
 #include "CryptoEngine.h"
 #include "target_specific.h"
 #include "PortduinoGPIO.h"
-#include <Utility.h>
+#include "mesh/RF95Interface.h"
 #include "sleep.h"
 
+#include <Utility.h>
+#include <assert.h>
+
 // FIXME - move getMacAddr/setBluetoothEnable into a HALPlatform class
 
 uint32_t hwId; // fixme move into portduino
@@ -37,9 +40,6 @@ CryptoEngine *crypto = new CryptoEngine();
 
 void updateBatteryLevel(uint8_t level) NOT_IMPLEMENTED("updateBatteryLevel");
 
-#include <assert.h>
-#include "mesh/RF95Interface.h"
-
 /** Dear pinetab hardware geeks!
  * 
  * The current pinetab lora module has a slight bug.  The ch341 part only provides ISR assertions on edges.

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1  
 minor = 1
-build = 30
+build = 31