sforkowany z mirror/meshtastic-firmware
remove debugging code eink gps now works
rodzic
ba8c640d6e
commit
a8b1bc735a
|
@ -12,12 +12,6 @@ static int32_t toDegInt(RawDegrees d)
|
||||||
|
|
||||||
bool NMEAGPS::setup()
|
bool NMEAGPS::setup()
|
||||||
{
|
{
|
||||||
#ifdef PIN_GPS_WAKE
|
|
||||||
// FIXME, support using this pin to control GPS sleep
|
|
||||||
// digitalWrite(PIN_GPS_WAKE, HIGH);
|
|
||||||
// pinMode(PIN_GPS_WAKE, OUTPUT);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PIN_GPS_PPS
|
#ifdef PIN_GPS_PPS
|
||||||
// pulse per second
|
// pulse per second
|
||||||
// FIXME - move into shared GPS code
|
// FIXME - move into shared GPS code
|
||||||
|
@ -31,8 +25,12 @@ void NMEAGPS::loop()
|
||||||
{
|
{
|
||||||
while (_serial_gps->available() > 0) {
|
while (_serial_gps->available() > 0) {
|
||||||
int c = _serial_gps->read();
|
int c = _serial_gps->read();
|
||||||
// Serial.write(c);
|
// DEBUG_MSG("%c", c);
|
||||||
reader.encode(c);
|
bool isValid = reader.encode(c);
|
||||||
|
|
||||||
|
// if we have received valid NMEA claim we are connected
|
||||||
|
if (isValid)
|
||||||
|
isConnected = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t now = millis();
|
uint32_t now = millis();
|
||||||
|
@ -56,8 +54,6 @@ void NMEAGPS::loop()
|
||||||
t.tm_year = d.year() - 1900;
|
t.tm_year = d.year() - 1900;
|
||||||
t.tm_isdst = false;
|
t.tm_isdst = false;
|
||||||
perhapsSetRTC(t);
|
perhapsSetRTC(t);
|
||||||
|
|
||||||
isConnected = true; // we seem to have a real GPS (but not necessarily a lock)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t fixtype = reader.fixQuality();
|
uint8_t fixtype = reader.fixQuality();
|
||||||
|
|
|
@ -49,7 +49,7 @@ void getMacAddr(uint8_t *dmac)
|
||||||
NRF52Bluetooth *nrf52Bluetooth;
|
NRF52Bluetooth *nrf52Bluetooth;
|
||||||
|
|
||||||
static bool bleOn = false;
|
static bool bleOn = false;
|
||||||
static const bool enableBle = false; // Set to false for easier debugging
|
static const bool enableBle = true; // Set to false for easier debugging
|
||||||
|
|
||||||
void setBluetoothEnable(bool on)
|
void setBluetoothEnable(bool on)
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,8 +27,7 @@
|
||||||
/*
|
/*
|
||||||
@geeksville eink TODO:
|
@geeksville eink TODO:
|
||||||
|
|
||||||
fix regout0!
|
fix display width and height
|
||||||
get pps blinking on second board
|
|
||||||
clean up eink drawing to not have the nasty timeout hack
|
clean up eink drawing to not have the nasty timeout hack
|
||||||
put eink to sleep when we think the screen is off
|
put eink to sleep when we think the screen is off
|
||||||
enable flash on spi0, share chip selects on spi1.
|
enable flash on spi0, share chip selects on spi1.
|
||||||
|
@ -36,14 +35,16 @@ https://infocenter.nordicsemi.com/index.jsp?topic=%2Fcom.nordic.infocenter.nrf52
|
||||||
bootloader fix battery pin usage drive TCXO DIO3 enable high whenever we want the clock use PIN_GPS_WAKE to sleep the GPS use
|
bootloader fix battery pin usage drive TCXO DIO3 enable high whenever we want the clock use PIN_GPS_WAKE to sleep the GPS use
|
||||||
tp_ser_io as a button, it goes high when pressed unify eink display classes
|
tp_ser_io as a button, it goes high when pressed unify eink display classes
|
||||||
make screen.adjustBrightness() a nop on eink screens
|
make screen.adjustBrightness() a nop on eink screens
|
||||||
|
enable gps sleep mode
|
||||||
eink probably is // #include <GxGDEP015OC1/GxGDEP015OC1.h> // 1.54" b/w //G702-A
|
use new flash chip
|
||||||
https://github.com/Xinyuan-LilyGO/LilyGO_T5_V24
|
|
||||||
200 x 200
|
|
||||||
|
|
||||||
feedback to ttgo:
|
feedback to ttgo:
|
||||||
are D10 and D8 backwards on the GPS schematic? gps comms no work?
|
offer to provide an image
|
||||||
leds don't work?
|
usb works!
|
||||||
|
radio works!
|
||||||
|
eink works!
|
||||||
|
leds work?
|
||||||
|
gps works!
|
||||||
use pcf8563 part for waking CPU? or remove it
|
use pcf8563 part for waking CPU? or remove it
|
||||||
the mx25 flash chip is great!
|
the mx25 flash chip is great!
|
||||||
name: TTGO LoraCard (nice googablity, unique name, sounds slick, implies lora and small)
|
name: TTGO LoraCard (nice googablity, unique name, sounds slick, implies lora and small)
|
||||||
|
@ -74,9 +75,9 @@ extern "C" {
|
||||||
#define PIN_LED2 (0 + 15) // blue (but red on my prototype)
|
#define PIN_LED2 (0 + 15) // blue (but red on my prototype)
|
||||||
#define PIN_LED3 (0 + 14) // red (not functional on my prototype)
|
#define PIN_LED3 (0 + 14) // red (not functional on my prototype)
|
||||||
|
|
||||||
#define LED_RED PIN_LED2
|
#define LED_RED PIN_LED3
|
||||||
#define LED_GREEN PIN_LED1
|
#define LED_GREEN PIN_LED1
|
||||||
#define LED_BLUE PIN_LED3
|
#define LED_BLUE PIN_LED2
|
||||||
|
|
||||||
#define LED_BUILTIN LED_GREEN
|
#define LED_BUILTIN LED_GREEN
|
||||||
#define LED_CONN PIN_BLUE
|
#define LED_CONN PIN_BLUE
|
||||||
|
|
Ładowanie…
Reference in New Issue