Merge pull request #404 from fdlamotte/t1000_gps_toggle

Gps toggle on 4 clicks

Will merge, but I'll do a refactor of the gpsToggle()

src/helpers/SensorManager.h

@@ -21,4 +21,6 @@ public:
   virtual const char* getSettingName(int i) const { return NULL; }
   virtual const char* getSettingValue(int i) const { return NULL; }
   virtual bool setSettingValue(const char* name, const char* value) { return false; }
+  virtual bool getGpsStatus() { return false; }
+  virtual bool toggleGps() { return false; }
 };

src/helpers/nrf52/T1000eBoard.cpp

@@ -1,87 +0,0 @@
-#include <Arduino.h>
-#include "T1000eBoard.h"
-#include <Wire.h>
-
-#include <bluefruit.h>
-
-void T1000eBoard::begin() {
-  // for future use, sub-classes SHOULD call this from their begin()
-  startup_reason = BD_STARTUP_NORMAL;
-  btn_prev_state = HIGH;
-
-  sd_power_mode_set(NRF_POWER_MODE_LOWPWR);
-
-#ifdef BUTTON_PIN
-  pinMode(BATTERY_PIN, INPUT);
-  pinMode(BUTTON_PIN, INPUT);
-  pinMode(LED_PIN, OUTPUT);
-#endif
-
-#if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
-  Wire.setPins(PIN_BOARD_SDA, PIN_BOARD_SCL);
-#endif
-
-  Wire.begin();
-
-  delay(10);   // give sx1262 some time to power up
-}
-
-#if 0
-static BLEDfu bledfu;
-
-static void connect_callback(uint16_t conn_handle) {
-  (void)conn_handle;
-  MESH_DEBUG_PRINTLN("BLE client connected");
-}
-
-static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
-  (void)conn_handle;
-  (void)reason;
-
-  MESH_DEBUG_PRINTLN("BLE client disconnected");
-}
-
-
-bool TrackerT1000eBoard::startOTAUpdate(const char* id, char reply[]) {
-  // Config the peripheral connection with maximum bandwidth
-  // more SRAM required by SoftDevice
-  // Note: All config***() function must be called before begin()
-  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
-  Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
-
-  Bluefruit.begin(1, 0);
-  // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
-  Bluefruit.setTxPower(4);
-  // Set the BLE device name
-  Bluefruit.setName("T1000E_OTA");
-
-  Bluefruit.Periph.setConnectCallback(connect_callback);
-  Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
-
-  // To be consistent OTA DFU should be added first if it exists
-  bledfu.begin();
-
-  // Set up and start advertising
-  // Advertising packet
-  Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
-  Bluefruit.Advertising.addTxPower();
-  Bluefruit.Advertising.addName();
-
-  /* Start Advertising
-    - Enable auto advertising if disconnected
-    - Interval:  fast mode = 20 ms, slow mode = 152.5 ms
-    - Timeout for fast mode is 30 seconds
-    - Start(timeout) with timeout = 0 will advertise forever (until connected)
-
-    For recommended advertising interval
-    https://developer.apple.com/library/content/qa/qa1931/_index.html
-  */
-  Bluefruit.Advertising.restartOnDisconnect(true);
-  Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
-  Bluefruit.Advertising.setFastTimeout(30);   // number of seconds in fast mode
-  Bluefruit.Advertising.start(0);             // 0 = Don't stop advertising after n seconds
-
-  strcpy(reply, "OK - started");
-  return true;
-}
-#endif

src/helpers/nrf52/T1000eBoard.h

@@ -1,101 +0,0 @@
-#pragma once
-
-#include <MeshCore.h>
-#include <Arduino.h>
-
-// LoRa and SPI pins
-#define  P_LORA_DIO_1   (32 + 1)  // P1.1
-#define  P_LORA_NSS     (0 + 12)  // P0.12
-#define  P_LORA_RESET   (32 + 10) // P1.10
-#define  P_LORA_BUSY    (0 + 7)   // P0.7
-#define  P_LORA_SCLK    (0 + 11)  // P0.11
-#define  P_LORA_MISO    (32 + 8)  // P1.8
-#define  P_LORA_MOSI    (32 + 9)  // P0.9
- 
-#define LR11X0_DIO_AS_RF_SWITCH  true
-#define LR11X0_DIO3_TCXO_VOLTAGE   1.6
-
-// built-ins
-//#define  PIN_VBAT_READ    5
-//#define  ADC_MULTIPLIER   (3 * 1.73 * 1000)
-
-class T1000eBoard : public mesh::MainBoard {
-protected:
-  uint8_t startup_reason;
-  uint8_t btn_prev_state;
-
-public:
-  void begin();
-
-  uint16_t getBattMilliVolts() override {
-  #ifdef BATTERY_PIN
-   #ifdef PIN_3V3_EN
-    digitalWrite(PIN_3V3_EN, HIGH);
-   #endif
-    analogReference(AR_INTERNAL_3_0);
-    analogReadResolution(12);
-    delay(10);
-    float volts = (analogRead(BATTERY_PIN) * ADC_MULTIPLIER * AREF_VOLTAGE) / 4096;
-   #ifdef PIN_3V3_EN
-    digitalWrite(PIN_3V3_EN, LOW);
-   #endif
-
-    analogReference(AR_DEFAULT);  // put back to default
-    analogReadResolution(10);
-
-    return volts * 1000;
-  #else
-    return 0;
-  #endif
-  }
-
-  uint8_t getStartupReason() const override { return startup_reason; }
-
-  const char* getManufacturerName() const override {
-    return "Seeed Tracker T1000-e";
-  }
-
-  int buttonStateChanged() {
-  #ifdef BUTTON_PIN
-    uint8_t v = digitalRead(BUTTON_PIN);
-    if (v != btn_prev_state) {
-      btn_prev_state = v;
-      return (v == LOW) ? 1 : -1;
-    }
-  #endif
-    return 0;
-  }
-
-  void powerOff() override {
-    #ifdef HAS_GPS
-        digitalWrite(GPS_VRTC_EN, LOW);
-        digitalWrite(GPS_RESET, LOW);
-        digitalWrite(GPS_SLEEP_INT, LOW);
-        digitalWrite(GPS_RTC_INT, LOW);
-        pinMode(GPS_RESETB, OUTPUT);
-        digitalWrite(GPS_RESETB, LOW);
-    #endif
-    
-    #ifdef BUZZER_EN
-        digitalWrite(BUZZER_EN, LOW);
-    #endif
-    
-    #ifdef PIN_3V3_EN
-        digitalWrite(PIN_3V3_EN, LOW);
-    #endif
-
-    #ifdef LED_PIN
-    digitalWrite(LED_PIN, LOW);
-    #endif
-    #ifdef BUTTON_PIN
-    nrf_gpio_cfg_sense_input(digitalPinToInterrupt(BUTTON_PIN), NRF_GPIO_PIN_NOPULL, NRF_GPIO_PIN_SENSE_HIGH);
-    #endif
-    sd_power_system_off();
-  }
-
-  void reboot() override {
-    NVIC_SystemReset();
-  }
-
-//  bool startOTAUpdate(const char* id, char reply[]) override;
-};