fix build without lfs

openshwprojects · Sep 28, 2023 · 841aade · 841aade
1 parent 9c1ecec
commit 841aade
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/openBeken_win32_mvsc2017.vcxproj b/openBeken_win32_mvsc2017.vcxproj
@@ -1321,6 +1321,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Win32|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Win322|Win32'">true</ExcludedFromBuild>
     </ClInclude>
+    <ClInclude Include="src\littlefs\our_lfs.h" />
     <ClInclude Include="src\selftest\selftest_local.h" />
     <ClInclude Include="src\sim\Bounds.h" />
     <ClInclude Include="src\sim\Circle.h" />

diff --git a/openBeken_win32_mvsc2017.vcxproj.filters b/openBeken_win32_mvsc2017.vcxproj.filters
@@ -1298,6 +1298,9 @@
     <ClInclude Include="src\driver\drv_ht16k33.h">
       <Filter>Drv</Filter>
     </ClInclude>
+    <ClInclude Include="src\littlefs\our_lfs.h">
+      <Filter>LFS</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\platforms\bk7231t\bk7231t_os\beken378\func\include\net_param_pub.h" />

diff --git a/src/littlefs/our_lfs.h b/src/littlefs/our_lfs.h
@@ -11,7 +11,7 @@
 #include "../obk_config.h"
 #include "lfs.h"
 
-#if ENABLE_LITTLEFS
+// we need that even if LFS is disabled
 
 #if PLATFORM_BK7231T
 // start 0x1000 after OTA addr
@@ -34,6 +34,7 @@
 #define LFS_BLOCKS_END 0x1AB000
 #endif
 
+#if ENABLE_LITTLEFS
 
 // 512k MAX - i.e. no more that 0x80000
 // 0x8000 = 32k

diff --git a/src/obk_config.h b/src/obk_config.h
@@ -52,6 +52,7 @@
 #define ENABLE_DRIVER_CHARGINGLIMIT		1
 #define ENABLE_DRIVER_BATTERY	1
 
+
 #elif PLATFORM_BL602
 
 // I have enabled drivers on BL602

diff --git a/src/win_main.c b/src/win_main.c
@@ -9,6 +9,7 @@
 #include <ws2tcpip.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include "obk_config.h"
 #include "new_common.h"
 #include "driver\drv_public.h"
 #include "cmnds\cmd_public.h"
@@ -111,7 +112,9 @@ void SIM_Hack_ClearSimulatedPinRoles();
 void SIM_ClearOBK(const char *flashPath) {
 	if (bObkStarted) {
 		DRV_ShutdownAllDrivers();
+#if ENABLE_LITTLEFS
 		release_lfs();
+#endif
 		SIM_Hack_ClearSimulatedPinRoles();
 		WIN_ResetMQTT();
 		UART_ResetForSimulator();