Merge pull request #619 from geeksville/dev

1.1.31
This commit is contained in:
Kevin Hester 2021-01-02 16:51:08 +08:00 committed by GitHub
commit 8e8257adf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

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

View File

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