Enable NEO6M for Beken, BL602, W800 and ESP -work-in-progress-!

changed BL602 uart driver: don't echo every char, changed buffer to 256 BL602 works, but for me it crashes after some minutes - don't know why
MaxineMuster · Jan 12, 2025 · 2269638 · 2269638
1 parent 36400a4
commit 2269638
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/platforms/ESP-IDF/main/CMakeLists.txt b/platforms/ESP-IDF/main/CMakeLists.txt
@@ -85,6 +85,7 @@ set(PROJ_ALL_SRC
 #	../../../src/driver/drv_ucs1912.c
 	../../../src/driver/drv_wemo.c
 	../../../src/driver/drv_ds1820_simple.c
+	../../../src/driver/drv_neo6m.c
 	../../../src/hal/espidf/hal_adc_espidf.c
 	../../../src/hal/espidf/hal_flashConfig_espidf.c
 	../../../src/hal/espidf/hal_flashVars_espidf.c

diff --git a/platforms/W800/Makefile b/platforms/W800/Makefile
@@ -106,6 +106,7 @@ CSRCS += $(_SHARED_APP)/i2c/drv_i2c_lcd_pcf8574t.c
 CSRCS += $(_SHARED_APP)/i2c/drv_i2c_mcp23017.c
 CSRCS += $(_SHARED_APP)/driver/drv_dht_internal.c
 CSRCS += $(_SHARED_APP)/driver/drv_openWeatherMap.c
+CSRCS += $(_SHARED_APP)/driver/drv_neo6m.c
 CSRCS += $(_SHARED_APP)/user_main.c
 CSRCS += main.c
 

diff --git a/src/driver/drv_main.c b/src/driver/drv_main.c
@@ -3,6 +3,7 @@
 #include "drv_bl0937.h"
 #include "drv_bl0942.h"
 #include "drv_bl_shared.h"
+#include "drv_neo6m.h"
 #include "drv_cse7766.h"
 #include "drv_ir.h"
 #include "drv_local.h"
@@ -152,6 +153,13 @@ static driver_t g_drivers[] = {
 	//drvdetail:"requires":""}
 	{ "BL0942",		BL0942_UART_Init,	BL0942_UART_RunEverySecond,		BL09XX_AppendInformationToHTTPIndexPage, NULL, NULL, NULL, false },
 #endif
+#if ENABLE_DRIVER_NEO6M
+	//drvdetail:{"name":"NEO6M",
+	//drvdetail:"title":"TODO",
+	//drvdetail:"descr":"NEO6M is a GPS chip which uses UART protocol for communication. By default, it uses 9600 baud, but you can also enable it with other baud rates by using 'startDriver NEO6M <rate>'.",
+	//drvdetail:"requires":""}
+	{ "NEO6M",		NEO6M_UART_Init,	NEO6M_UART_RunEverySecond,		NEO6M_AppendInformationToHTTPIndexPage, NULL, NULL, NULL, false },
+#endif
 #if ENABLE_DRIVER_PWM_GROUP
 	//drvdetail:{"name":"PWMG",
 	//drvdetail:"title":"TODO",

diff --git a/src/hal/bl602/hal_uart_bl602.c b/src/hal/bl602/hal_uart_bl602.c
@@ -97,7 +97,7 @@ int fd_console = -1;
 
 static void console_cb_read(int fd, void* param)
 {
-	char buffer[64];  /* adapt to usb cdc since usb fifo is 64 bytes */
+	char buffer[256];  /* adapt to usb cdc since usb fifo is 64 bytes */
 	int ret;
 	int i;
 
@@ -108,7 +108,7 @@ static void console_cb_read(int fd, void* param)
 		{
 			fd_console = fd;
 			buffer[ret] = 0;
-			addLogAdv(LOG_INFO, LOG_FEATURE_ENERGYMETER, "BL602 received: %s\n", buffer);
+			addLogAdv(LOG_DEBUG, LOG_FEATURE_ENERGYMETER, "BL602 received: %s\n", buffer);
 			for(i = 0; i < ret; i++)
 			{
 				UART_AppendByteToReceiveRingBuffer(buffer[i]);
@@ -163,4 +163,4 @@ int HAL_UART_Init(int baud, int parity)
 	return 1;
 }
 
-#endif
+#endif
diff --git a/src/obk_config.h b/src/obk_config.h
@@ -57,6 +57,7 @@
 #define OBK_OTA_EXTENSION 		".img"
 #define ENABLE_I2C					1
 #define ENABLE_OBK_SCRIPTING			1
+#define ENABLE_DRIVER_NEO6M			1
 
 
 #elif WINDOWS
@@ -144,6 +145,7 @@
 #define ENABLE_OBK_SCRIPTING			1
 #define OBK_OTA_EXTENSION 		".bin.xz.ota"
 //#define ENABLE_I2C					1
+#define ENABLE_DRIVER_NEO6M			1
 
 
 #elif PLATFORM_BEKEN
@@ -205,6 +207,7 @@
 #define ENABLE_OBK_SCRIPTING			1
 //#define ENABLE_DRIVER_OPENWEATHERMAP	1
 #define OBK_OTA_EXTENSION 		".rbl"
+#define ENABLE_DRIVER_NEO6M			1
 
 // ENABLE_I2C_ is a syntax for
 // our I2C system defines for drv_i2c_main.c
@@ -265,6 +268,7 @@
 #define ENABLE_DRIVER_CHT83XX		1
 #define ENABLE_OBK_SCRIPTING			1
 #define OBK_OTA_EXTENSION 		".img"
+#define ENABLE_DRIVER_NEO6M			1
 
 #elif PLATFORM_TR6260