Merge branch 'openshwprojects:main' into readme

Author: divadiow

openBeken_win32_mvsc2017.vcxproj

@@ -248,6 +248,8 @@
     <ClCompile Include="src\driver\drv_ntp.c" />
     <ClCompile Include="src\driver\drv_deviceclock.c" />
     <ClCompile Include="src\driver\drv_ds3231.c" />
+    <ClCompile Include="src\driver\drv_neo6m.c" />
+    <ClCompile Include="src\driver\drv_rc.cpp" />
     <ClCompile Include="src\libraries\obktime\obktime.c" />
     <ClCompile Include="src\driver\drv_timed_events.c" />
     <ClCompile Include="src\driver\drv_openWeatherMap.c" />
@@ -959,6 +961,7 @@
     <ClInclude Include="src\driver\drv_ht16k33.h" />
     <ClInclude Include="src\driver\drv_max72xx_internal.h" />
     <ClInclude Include="src\driver\drv_pt6523_font.h" />
+    <ClInclude Include="src\driver\drv_rc.h" />
     <ClInclude Include="src\driver\drv_sgp.h" />
     <ClInclude Include="src\driver\drv_sht3x.h" />
     <ClInclude Include="src\driver\drv_sm2235.h" />
@@ -1319,4 +1322,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

openBeken_win32_mvsc2017.vcxproj.filters

@@ -422,6 +422,10 @@
     <ClCompile Include="src\driver\drv_aht2x.c" />
     <ClCompile Include="src\sim\Controller_MAX7219.cpp" />
     <ClCompile Include="src\sim\Point.cpp" />
+    <ClCompile Include="src\driver\drv_deviceclock.c" />
+    <ClCompile Include="src\driver\drv_ds3231.c" />
+    <ClCompile Include="src\libraries\obktime\obktime.c" />
+    <ClCompile Include="src\driver\drv_rc.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\base64\base64.h" />
@@ -631,6 +635,7 @@
     <ClInclude Include="libraries\berry\generate\be_fixed_time.h" />
     <ClInclude Include="libraries\berry\generate\be_fixed_undefined.h" />
     <ClInclude Include="src\driver\drv_soft_spi.h" />
+    <ClInclude Include="src\driver\drv_rc.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\platforms\bk7231t\bk7231t_os\beken378\func\include\net_param_pub.h" />

platforms/obk_main.cmake

@@ -101,6 +101,7 @@ set(OBKM_SRC
 	${OBK_SRCS}driver/drv_ntp.c
 	${OBK_SRCS}driver/drv_deviceclock.c
 	${OBK_SRCS}driver/drv_ds3231.c
+	${OBK_SRCS}driver/drv_neo6m.c
 	${OBK_SRCS}libraries/obktime/obktime.c
 	${OBK_SRCS}driver/drv_timed_events.c
 	${OBK_SRCS}driver/drv_openWeatherMap.c

platforms/obk_main.mk

@@ -121,6 +121,7 @@ OBKM_SRC  += $(OBK_SRCS)driver/drv_multiPinI2CScanner.c
 OBKM_SRC  += $(OBK_SRCS)driver/drv_ntp.c
 OBKM_SRC  += $(OBK_SRCS)driver/drv_deviceclock.c
 OBKM_SRC  += $(OBK_SRCS)driver/drv_ds3231.c
+OBKM_SRC  += $(OBK_SRCS)driver/drv_neo6m.c
 OBKM_SRC  += $(OBK_SRCS)libraries/obktime/obktime.c
 OBKM_SRC  += $(OBK_SRCS)driver/drv_timed_events.c
 OBKM_SRC  += $(OBK_SRCS)driver/drv_openWeatherMap.c

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_rc.h"
@@ -1368,6 +1369,22 @@ static driver_t g_drivers[] = {
 	NULL,                                    // onHassDiscovery
 	false,                                   // loaded
 	},
+#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",                               // Driver Name
+	NEO6M_UART_Init,                         // Init
+	NEO6M_UART_RunEverySecond,               // onEverySecond
+	NEO6M_AppendInformationToHTTPIndexPage,  // appendInformationToHTTPIndexPage
+	NULL,                                    // runQuickTick
+	NULL,                                    // stopFunction
+	NULL,                                    // onChannelChanged
+	NULL,                                    // onHassDiscovery
+	false,                                   // loaded
+	},
 #endif
 	//{ "", NULL, NULL, NULL, NULL, NULL, NULL, NULL, false },
 };