gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2026-04-28 12:03:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add Mini GPS module power control

Browse Source
This commit is contained in:
Just Call Me Koko
2024-01-17 09:15:22 -05:00
parent 5909158666
commit f8a831f916
4 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
esp32_marauder/GpsInterface.cpp
View File

@@ -16,6 +16,19 @@ MicroNMEA nmea(nmeaBuffer, sizeof(nmeaBuffer));
void GpsInterface::begin() { void GpsInterface::begin() {
#ifdef MARAUDER_MINI
pinMode(26, OUTPUT);
delay(1);
analogWrite(26, 243);
delay(1);
Serial.println("Activated GPS");
delay(100);
#endif
#ifndef GPS_SOFTWARE_SERIAL #ifndef GPS_SOFTWARE_SERIAL
Serial2.begin(9600, SERIAL_8N1, GPS_TX, GPS_RX); Serial2.begin(9600, SERIAL_8N1, GPS_TX, GPS_RX);
#else #else
@@ -27,7 +40,7 @@ void GpsInterface::begin() {
MicroNMEA::sendSentence(Serial2, "$PSTMSRR"); MicroNMEA::sendSentence(Serial2, "$PSTMSRR");
delay(4000); delay(3900);
if (Serial2.available()) { if (Serial2.available()) {
Serial.println("GPS Attached Successfully"); Serial.println("GPS Attached Successfully");
@@ -35,11 +48,17 @@ void GpsInterface::begin() {
while (Serial2.available()) while (Serial2.available())
Serial2.read(); Serial2.read();
} }
else {
this->gps_enabled = false;
Serial.println("GPS Not Found");
}
this->type_flag=GPSTYPE_NATIVE; //enforce default this->type_flag=GPSTYPE_NATIVE; //enforce default
this->disable_queue(); //init the queue, disabled, kill NULLs this->disable_queue(); //init the queue, disabled, kill NULLs
nmea.setUnknownSentenceHandler(gps_nmea_notimp); nmea.setUnknownSentenceHandler(gps_nmea_notimp);
} }
//passthrough for other objects //passthrough for other objects

44
esp32_marauder/MenuFunctions.cpp
View File

@@ -891,29 +891,31 @@ void MenuFunctions::battery2(bool initial)
#else #else
void MenuFunctions::battery(bool initial) void MenuFunctions::battery(bool initial)
{ {
uint16_t the_color; #ifdef HAS_BATTERY
if (battery_obj.i2c_supported) uint16_t the_color;
{ if (battery_obj.i2c_supported)
// Could use int compare maybe idk {
if (((String)battery_obj.battery_level != "25") && ((String)battery_obj.battery_level != "0")) // Could use int compare maybe idk
the_color = TFT_GREEN; if (((String)battery_obj.battery_level != "25") && ((String)battery_obj.battery_level != "0"))
else the_color = TFT_GREEN;
the_color = TFT_RED; else
the_color = TFT_RED;
if ((battery_obj.battery_level != battery_obj.old_level) || (initial)) { if ((battery_obj.battery_level != battery_obj.old_level) || (initial)) {
battery_obj.old_level = battery_obj.battery_level; battery_obj.old_level = battery_obj.battery_level;
display_obj.tft.fillRect(204, 0, SCREEN_WIDTH, STATUS_BAR_WIDTH, STATUSBAR_COLOR); display_obj.tft.fillRect(204, 0, SCREEN_WIDTH, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
display_obj.tft.setCursor(0, 1); display_obj.tft.setCursor(0, 1);
display_obj.tft.drawXBitmap(186, display_obj.tft.drawXBitmap(186,
0, 0,
menu_icons[STATUS_BAT], menu_icons[STATUS_BAT],
16, 16,
16, 16,
STATUSBAR_COLOR, STATUSBAR_COLOR,
the_color); the_color);
display_obj.tft.drawString((String)battery_obj.battery_level + "%", 204, 0, 2); display_obj.tft.drawString((String)battery_obj.battery_level + "%", 204, 0, 2);
}
} }
} #endif
} }
void MenuFunctions::battery2(bool initial) void MenuFunctions::battery2(bool initial)
{ {

8
esp32_marauder/configs.h
View File

@@ -12,9 +12,9 @@
//// BOARD TARGETS //// BOARD TARGETS
//#define MARAUDER_M5STICKC //#define MARAUDER_M5STICKC
//#define MARAUDER_MINI #define MARAUDER_MINI
//#define MARAUDER_V4 //#define MARAUDER_V4
#define MARAUDER_V6 //#define MARAUDER_V6
//#define MARAUDER_V6_1 //#define MARAUDER_V6_1
//#define MARAUDER_KIT //#define MARAUDER_KIT
//#define GENERIC_ESP32 //#define GENERIC_ESP32
@@ -24,7 +24,7 @@
//#define XIAO_ESP32_S3 //#define XIAO_ESP32_S3
//// END BOARD TARGETS //// END BOARD TARGETS
#define MARAUDER_VERSION "v0.13.6" #define MARAUDER_VERSION "v0.13.7"
//// HARDWARE NAMES //// HARDWARE NAMES
#ifdef MARAUDER_M5STICKC #ifdef MARAUDER_M5STICKC
@@ -70,7 +70,7 @@
#ifdef MARAUDER_MINI #ifdef MARAUDER_MINI
//#define FLIPPER_ZERO_HAT //#define FLIPPER_ZERO_HAT
#define HAS_BATTERY //#define HAS_BATTERY
#define HAS_BT #define HAS_BT
#define HAS_BUTTONS #define HAS_BUTTONS
#define HAS_NEOPIXEL_LED #define HAS_NEOPIXEL_LED

BIN
mechanical/V6/M6_GPS_BOTTOM_SMA_BRASS.stl Normal file
View File

Binary file not shown.