Merge branch 'meshtastic:master' into master

This commit is contained in:
Mictronics 2024-02-15 21:38:09 +01:00 committed by GitHub
commit b575f16bcf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions

View File

@ -213,7 +213,7 @@ const uint8_t GPS::_message_GSA[] = {
0x00, // Rate for DDC 0x00, // Rate for DDC
0x01, // Rate for UART1 0x01, // Rate for UART1
0x00, // Rate for UART2 0x00, // Rate for UART2
0x00, // Rate for USB 0x01, // Rate for USB usefull for native linux
0x00, // Rate for SPI 0x00, // Rate for SPI
0x00 // Reserved 0x00 // Reserved
}; };
@ -247,7 +247,7 @@ const uint8_t GPS::_message_RMC[] = {
0x00, // Rate for DDC 0x00, // Rate for DDC
0x01, // Rate for UART1 0x01, // Rate for UART1
0x00, // Rate for UART2 0x00, // Rate for UART2
0x00, // Rate for USB 0x01, // Rate for USB usefull for native linux
0x00, // Rate for SPI 0x00, // Rate for SPI
0x00 // Reserved 0x00 // Reserved
}; };
@ -258,7 +258,7 @@ const uint8_t GPS::_message_GGA[] = {
0x00, // Rate for DDC 0x00, // Rate for DDC
0x01, // Rate for UART1 0x01, // Rate for UART1
0x00, // Rate for UART2 0x00, // Rate for UART2
0x00, // Rate for USB 0x01, // Rate for USB, usefull for native linux
0x00, // Rate for SPI 0x00, // Rate for SPI
0x00 // Reserved 0x00 // Reserved
}; };

View File

@ -1,2 +1,3 @@
#define HAS_SCREEN 1 #define HAS_SCREEN 1
#define CANNED_MESSAGE_MODULE_ENABLE 1 #define CANNED_MESSAGE_MODULE_ENABLE 1
#define HAS_GPS 1