[Horus] Refactoring continued

This commit is contained in:
Bertrand Songis
2015-10-24 11:27:34 +02:00
parent fb371cf5b7
commit ab0272c16c
116 changed files with 1042 additions and 1269 deletions
+1 -1
View File
@@ -863,7 +863,7 @@ void RlcFile::flush()
}
#if defined (EEPROM_PROGRESS_BAR)
void RlcFile::DisplayProgressBar(uint8_t x)
void RlcFile::drawProgressBar(uint8_t x)
{
if (storageDirtyMsk || isWriting() || eeprom_buffer_size) {
uint8_t len = storageDirtyMsk ? 1 : limit((uint8_t)1, (uint8_t)(7 - (m_rlc_len/m_ratio)), (uint8_t)7);
+2 -2
View File
@@ -208,7 +208,7 @@ class RlcFile: public EFile
uint16_t readRlc(uint8_t *buf, uint16_t i_len);
#if defined (EEPROM_PROGRESS_BAR)
void DisplayProgressBar(uint8_t x);
void drawProgressBar(uint8_t x);
#endif
};
@@ -230,7 +230,7 @@ inline void eepromWriteProcess()
}
#if defined (EEPROM_PROGRESS_BAR)
#define DISPLAY_PROGRESS_BAR(x) theFile.DisplayProgressBar(x)
#define DISPLAY_PROGRESS_BAR(x) theFile.drawProgressBar(x)
#else
#define DISPLAY_PROGRESS_BAR(x)
#endif
+2
View File
@@ -189,6 +189,8 @@ void storageCheck(bool immediately)
void storageReadAll()
{
sdInit();
if (loadGeneralSettings() != NULL) {
storageEraseAll(true);
strcpy(g_eeGeneral.currModelFilename, "model.bin");