Merge pull request #315 from cyberman54/master

sync dev to master

README.md

@@ -170,7 +170,6 @@ Hereafter described is the default *plain* format, which uses MSB bit numbering.
 
 	byte 1-2:	Number of unique pax, first seen on Wifi
 	byte 3-4:	Number of unique pax, first seen on Bluetooth [omited if BT disabled]
-	bytes 5-17: GPS data, if present, in same format as for Port #4
 
 **Port #2:** Device status query result
 

src/hal/heltec.h

@@ -1,3 +1,4 @@
+
 // clang-format off
 
 #ifndef _HELTEC_H

src/hal/ttgobeam.h

@@ -25,15 +25,11 @@
 #define GPS_SERIAL 9600, SERIAL_8N1, GPIO_NUM_12, GPIO_NUM_15 // UBlox NEO 6M
 #define GPS_INT GPIO_NUM_34 // 30ns accurary timepulse, to be external wired on pcb: NEO 6M Pin#3 -> GPIO34
 
-// Settings for on board DS3231 RTC chip
-//#define HAS_RTC MY_OLED_SDA, MY_OLED_SCL // SDA, SCL
-//#define RTC_INT GPIO_NUM_13 // timepulse with accuracy +/- 2*e-6 [microseconds] = 0,1728sec / day
-
 // enable only if device has these sensors, otherwise comment these lines
 // BME680 sensor on I2C bus
-#define HAS_BME 1 // Enable BME sensors in general
-#define HAS_BME680 SDA, SCL
-#define BME680_ADDR BME680_I2C_ADDR_PRIMARY // !! connect SDIO of BME680 to GND !!
+//#define HAS_BME 1 // Enable BME sensors in general
+//#define HAS_BME680 SDA, SCL
+//#define BME680_ADDR BME680_I2C_ADDR_PRIMARY // !! connect SDIO of BME680 to GND !!
 
 // display (if connected)
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C
@@ -42,12 +38,6 @@
 #define MY_OLED_RST U8X8_PIN_NONE
 //#define DISPLAY_FLIP  1 // use if display is rotated
 
-// Settings for DCF77 interface
-#define HAS_DCF77 GPIO_NUM_13
-
-// Settings for IF482 interface
-//#define HAS_IF482 9600, SERIAL_7E1, GPIO_NUM_12, GPIO_NUM_14 // IF482 serial port parameters
-
 // user defined sensors (if connected)
 //#define HAS_SENSORS 1 // comment out if device has user defined sensors
 

src/hal/ttgofox.h

@@ -25,17 +25,12 @@
 #define RTC_INT GPIO_NUM_34 // timepulse with accuracy +/- 2*e-6 [microseconds] = 0,1728sec / day
 
 // Settings for IF482 interface
-#define HAS_IF482 9600, SERIAL_7E1, GPIO_NUM_12, GPIO_NUM_14 // IF482 serial port parameters
+//#define HAS_IF482 9600, SERIAL_7E1, GPIO_NUM_12, GPIO_NUM_14 // IF482 serial port parameters
 
 // Settings for DCF77 interface
 //#define HAS_DCF77 GPIO_NUM_14
 //#define DCF77_ACTIVE_LOW 1
 
-// Settings for external GPS chip
-#define HAS_GPS 1 // use on board GPS
-#define GPS_SERIAL 9600, SERIAL_8N1, GPIO_NUM_17, GPIO_NUM_16 // UBlox NEO 6M or 7M with default configuration
-#define GPS_INT GPIO_NUM_13
-
 // Pins for LORA chip SPI interface, reset line and interrupt lines
 #define LORA_SCK  (5) 
 #define LORA_CS   (18)

src/main.cpp

@@ -186,7 +186,7 @@ void setup() {
 
 // set low power mode to off
 #ifdef HAS_LOWPOWER_SWITCH
-  pinMode(HAS_LED, OUTPUT);
+  pinMode(HAS_LOWPOWER_SWITCH, OUTPUT);
   digitalWrite(HAS_LOWPOWER_SWITCH, HIGH);
   strcat_P(features, " LPWR");
 #endif
@@ -434,4 +434,4 @@ void loop() {
   }
 
   vTaskDelete(NULL); // shoud never be reached
-}
+}

src/senddata.cpp

@@ -39,7 +39,7 @@ void SendPayload(uint8_t port, sendprio_t prio) {
   memcpy(SendBuffer.Message, payload.getBuffer(), payload.getSize());
 
 // enqueue message in device's send queues
-#if(HAS_LORA)
+#if (HAS_LORA)
   lora_enqueuedata(&SendBuffer, prio);
 #endif
 #ifdef HAS_SPI
@@ -62,18 +62,6 @@ void sendCounter() {
       payload.addCount(macs_wifi, MAC_SNIFF_WIFI);
       if (cfg.blescan)
         payload.addCount(macs_ble, MAC_SNIFF_BLE);
-
-#if(HAS_GPS)
-      if (gps.location.isValid()) { // send GPS position only if we have a fix
-        gps_read();
-        payload.addGPS(gps_status);
-      } else {
-        ESP_LOGD(
-            TAG,
-            "No valid GPS position. GPS data not appended to counter data.");
-      }
-#endif
-
       SendPayload(COUNTERPORT, prio_normal);
       // clear counter if not in cumulative counter mode
       if (cfg.countermode != 1) {
@@ -83,7 +71,7 @@ void sendCounter() {
       }
       break;
 
-#if(HAS_BME)
+#if (HAS_BME)
     case MEMS_DATA:
       payload.reset();
       payload.addBME(bme_status);
@@ -91,7 +79,7 @@ void sendCounter() {
       break;
 #endif
 
-#if(HAS_GPS)
+#if (HAS_GPS)
     case GPS_DATA:
       // send GPS position only if we have a fix
       if (gps.location.isValid()) {
@@ -104,7 +92,7 @@ void sendCounter() {
       break;
 #endif
 
-#if(HAS_SENSORS)
+#if (HAS_SENSORS)
     case SENSOR1_DATA:
       payload.reset();
       payload.addSensor(sensor_read(1));
@@ -138,7 +126,7 @@ void sendCounter() {
 } // sendCounter()
 
 void flushQueues() {
-#if(HAS_LORA)
+#if (HAS_LORA)
   lora_queuereset();
 #endif
 #ifdef HAS_SPI