Lua now uses our fake FatFS when running in simu

companion/src/CMakeLists.txt

@@ -80,11 +80,14 @@ IF( Subversion_FOUND )
   # Subversion_WC_INFO( ${PROJECT_SOURCE_DIR} C9X )
 ENDIF( )
 
+set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src)
+
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${PROJECT_SOURCE_DIR}/../..
-  ${PROJECT_SOURCE_DIR}/../../radio/src/fonts/std
-  ${PROJECT_SOURCE_DIR}/../../radio/src/lua/src
+  ${RADIO_SRC_DIRECTORY}/../..
+  ${RADIO_SRC_DIRECTORY}
+  ${RADIO_SRC_DIRECTORY}/fonts/std
+  ${RADIO_SRC_DIRECTORY}/lua/src
 )
 
 set(TH9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/th9x)
@@ -114,8 +117,6 @@ add_custom_command(
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp
 )
 
-set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src)
-
 add_custom_command(
   OUTPUT ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
   COMMAND make lbm
@@ -306,7 +307,6 @@ ENDIF( )
 INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} )
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
 
-
 SET( LANGUAGES he pl pt ru de fr it sv cs )
 FOREACH( language ${LANGUAGES} )
   SET( companion_TS ${companion_TS} translations/companion_${language}.ts )

radio/src/lua/src/luaconf.h

@@ -11,10 +11,7 @@
 #include <limits.h>
 #include <stddef.h>
 
-// #define LUA_LIB
-#if !defined(SIMU)
-  #define USE_FATFS
-#endif
+#define USE_FATFS
 
 /*
 ** ==================================================================

radio/src/simpgmspace.cpp

@@ -534,7 +534,9 @@ FRESULT f_chdir (const TCHAR *name)
 
 FRESULT f_opendir (DIR * rep, const TCHAR * name)
 {
-  rep->fs = (FATFS *)simu::opendir(convertSimuPath(name));
+  char *path = convertSimuPath(name);
+  TRACE("f_opendir(%s)", path);
+  rep->fs = (FATFS *)simu::opendir(path);
   return FR_OK;
 }