Browse Source

handle gps switch

pull/342/head
JQ 1 year ago
parent
commit
1072da0eeb
  1. 55
      variants/thinknode_m1/target.cpp
  2. 2
      variants/thinknode_m1/target.h
  3. 1
      variants/thinknode_m1/variant.h

55
variants/thinknode_m1/target.cpp

@ -92,22 +92,16 @@ void ThinkNodeM1SensorManager::stop_gps() {
bool ThinkNodeM1SensorManager::begin() { bool ThinkNodeM1SensorManager::begin() {
Serial1.begin(9600); Serial1.begin(9600);
// Try to detect if GPS is physically connected to determine if we should expose the setting // Initialize GPS switch pin
pinMode(GPS_EN, OUTPUT); pinMode(PIN_GPS_SWITCH, INPUT);
digitalWrite(GPS_EN, HIGH); // Power on GPS last_gps_switch_state = digitalRead(PIN_GPS_SWITCH);
// Give GPS a moment to send data if it's physically connected and powered
delay(1500);
// We'll consider GPS detected if we see any data on Serial1 // Initialize GPS power pin
gps_detected = (Serial1.available() > 0); pinMode(GPS_EN, OUTPUT);
if (gps_detected) { // Check initial switch state to determine if GPS should be active
MESH_DEBUG_PRINTLN("GPS detected"); if (last_gps_switch_state == HIGH) { // Switch is HIGH when ON
digitalWrite(GPS_EN, LOW); // Power off GPS until the setting is changed start_gps();
} else {
MESH_DEBUG_PRINTLN("No GPS detected");
digitalWrite(GPS_EN, LOW);
} }
return true; return true;
@ -122,6 +116,31 @@ bool ThinkNodeM1SensorManager::querySensors(uint8_t requester_permissions, Cayen
void ThinkNodeM1SensorManager::loop() { void ThinkNodeM1SensorManager::loop() {
static long next_gps_update = 0; static long next_gps_update = 0;
static long last_switch_check = 0;
// Check GPS switch state every second
if (millis() - last_switch_check > 1000) {
bool current_switch_state = digitalRead(PIN_GPS_SWITCH);
// Detect switch state change
if (current_switch_state != last_gps_switch_state) {
last_gps_switch_state = current_switch_state;
if (current_switch_state == HIGH) { // Switch is ON
MESH_DEBUG_PRINTLN("GPS switch ON");
start_gps();
} else { // Switch is OFF
MESH_DEBUG_PRINTLN("GPS switch OFF");
stop_gps();
}
}
last_switch_check = millis();
}
if (!gps_active) {
return; // GPS is not active, skip further processing
}
_location->loop(); _location->loop();
@ -137,22 +156,22 @@ void ThinkNodeM1SensorManager::loop() {
} }
int ThinkNodeM1SensorManager::getNumSettings() const { int ThinkNodeM1SensorManager::getNumSettings() const {
return gps_detected ? 1 : 0; // only show GPS setting if GPS is detected return 1; // always show GPS setting
} }
const char* ThinkNodeM1SensorManager::getSettingName(int i) const { const char* ThinkNodeM1SensorManager::getSettingName(int i) const {
return (gps_detected && i == 0) ? "gps" : NULL; return (i == 0) ? "gps" : NULL;
} }
const char* ThinkNodeM1SensorManager::getSettingValue(int i) const { const char* ThinkNodeM1SensorManager::getSettingValue(int i) const {
if (gps_detected && i == 0) { if (i == 0) {
return gps_active ? "1" : "0"; return gps_active ? "1" : "0";
} }
return NULL; return NULL;
} }
bool ThinkNodeM1SensorManager::setSettingValue(const char* name, const char* value) { bool ThinkNodeM1SensorManager::setSettingValue(const char* name, const char* value) {
if (gps_detected && strcmp(name, "gps") == 0) { if (strcmp(name, "gps") == 0) {
if (strcmp(value, "0") == 0) { if (strcmp(value, "0") == 0) {
stop_gps(); stop_gps();
} else { } else {

2
variants/thinknode_m1/target.h

@ -14,7 +14,7 @@
class ThinkNodeM1SensorManager : public SensorManager { class ThinkNodeM1SensorManager : public SensorManager {
bool gps_active = false; bool gps_active = false;
bool gps_detected = false; bool last_gps_switch_state = false;
LocationProvider* _location; LocationProvider* _location;
void start_gps(); void start_gps();

1
variants/thinknode_m1/variant.h

@ -131,3 +131,4 @@ extern const int SCK;
#define PIN_GPS_RESET (37) #define PIN_GPS_RESET (37)
#define PIN_GPS_PPS (36) #define PIN_GPS_PPS (36)
#define PIN_GPS_STANDBY (34) #define PIN_GPS_STANDBY (34)
#define PIN_GPS_SWITCH (33)

Loading…
Cancel
Save