development reverted to cyberman development

include/macsniff.h

@@ -12,7 +12,6 @@
 #define MAC_SNIFF_WIFI 0
 #define MAC_SNIFF_BLE 1
 
-void macsniff_setup(void);
 uint16_t get_salt(void);
 uint64_t macConvert(uint8_t *paddr);
 bool mac_add(uint8_t *paddr, int8_t rssi, bool sniff_type);

include/main.h

@@ -18,8 +18,7 @@
 #include "irqhandler.h"
 #include "led.h"
 #include "spislave.h"
-#include "uart.h"
-#if(HAS_LORA)
+#if (HAS_LORA)
 #include "lorawan.h"
 #endif
 #include "timekeeper.h"

include/payload.h

@@ -55,7 +55,6 @@ public:
   void addButton(uint8_t value);
   void addSensor(uint8_t[]);
   void addTime(time_t value);
-  void addTimeDiff(int32_t value);
 
 #if (PAYLOAD_ENCODER == 1) // format plain