Projectkk2glider/simu tmp sd path (#4231)
* Re #4224: Introduced settingsPath and use std::string for paths in simpgmspace. * Re #4224: Relevant parts of simpgmspace.cpp moved into simufatfs.cpp and simudisk.cpp * Removed "/" from "mask_monitor_logsw.png" * Re #4224: findTrueFileName() refactoring * Faster gtests (less waiting for eeprom operations to finish) * Re #4224: Radio settings and models directories now taken from alternate path (if set) [simu] * Fixes #3322: together with previous changes to the SD browser this prevents the simulator from browsing higher than SD card root path. * f_chdir() debug traces
This commit is contained in:
committed by
Bertrand Songis
parent
bedaa505a2
commit
f7543e3220
@@ -372,7 +372,7 @@ void simuSetKey(uint8_t key, bool state);
|
||||
void simuSetTrim(uint8_t trim, bool state);
|
||||
void simuSetSwitch(uint8_t swtch, int8_t state);
|
||||
|
||||
void StartSimu(bool tests=true);
|
||||
void StartSimu(bool tests=true, const char * sdPath = 0, const char * settingsPath = 0);
|
||||
void StopSimu();
|
||||
|
||||
void StartEepromThread(const char *filename="eeprom.bin");
|
||||
@@ -467,8 +467,8 @@ inline void NVIC_Init(NVIC_InitTypeDef *) { }
|
||||
inline void delay_01us(int dummy) { }
|
||||
#define configure_pins(...)
|
||||
|
||||
#if defined(SDCARD)
|
||||
extern char simuSdDirectory[1024];
|
||||
#if defined(SDCARD) && !defined(SKIP_FATFS_DECLARATION) && !defined(SIMU_DISKIO)
|
||||
#define SIMU_USE_SDCARD
|
||||
#endif
|
||||
|
||||
#define sdMountPoll()
|
||||
@@ -478,4 +478,17 @@ extern char simuSdDirectory[1024];
|
||||
#define sdMounted() (true)
|
||||
#endif
|
||||
|
||||
#if defined(SIMU_USE_SDCARD)
|
||||
void simuFatfsSetPaths(const char * sdPath, const char * settingsPath);
|
||||
#else
|
||||
#define simuFatfsSetPaths(...)
|
||||
#endif
|
||||
|
||||
#if defined(TRACE_SIMPGMSPACE)
|
||||
#undef TRACE_SIMPGMSPACE
|
||||
#define TRACE_SIMPGMSPACE TRACE
|
||||
#else
|
||||
#define TRACE_SIMPGMSPACE(...)
|
||||
#endif
|
||||
|
||||
#endif // _SIMPGMSPACE_H_
|
||||
|
||||
Reference in New Issue
Block a user