mixer_interrupt branch merged to trunk

timers on stock board should be more accurate
This commit is contained in:
bsongis
2012-06-18 13:38:31 +00:00
parent 963b07439b
commit 342b643661
9 changed files with 233 additions and 120 deletions
+2 -12
View File
@@ -110,7 +110,7 @@ void eeWriteBlockCmp(const void *i_pointer_ram, uint16_t i_pointer_eeprom, size_
#endif
if (s_sync_write) {
while (eeprom_buffer_size > 0) wdt_reset();
while (eeprom_buffer_size > 0) WDT_RESET_STOCK();
}
}
@@ -545,8 +545,6 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
}
#endif
wdt_reset();
// check and create folder here
strcpy_P(buf, STR_MODELS_PATH);
#ifndef SIMU
@@ -559,8 +557,6 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
}
#endif
wdt_reset();
buf[sizeof(MODELS_PATH)-1] = '/';
eeLoadModelName(i_fileSrc, &buf[sizeof(MODELS_PATH)]);
buf[sizeof(MODELS_PATH)+FILENAME_MAXLEN] = '\0';
@@ -599,8 +595,6 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
return SDCARD_ERROR(result);
}
wdt_reset();
result = f_write(&archiveFile, &g_eeGeneral.myVers, 1, &written);
if (result != FR_OK) {
return SDCARD_ERROR(result);
@@ -614,7 +608,6 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
if (result != FR_OK) {
return SDCARD_ERROR(result);
}
wdt_reset();
}
f_close(&archiveFile);
@@ -632,8 +625,6 @@ const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name)
return SDCARD_ERROR(result);
}
wdt_reset();
strcpy_P(buf, STR_MODELS_PATH);
buf[sizeof(MODELS_PATH)-1] = '/';
strcpy(&buf[sizeof(MODELS_PATH)], model_name);
@@ -671,7 +662,6 @@ const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name)
s_sync_write = false;
return STR_EEPROMOVERFLOW;
}
wdt_reset();
}
} while (read == 15);
@@ -805,7 +795,7 @@ void RlcFile::nextRlcWriteStep()
void RlcFile::flush()
{
while (eeprom_buffer_size > 0) wdt_reset();
while (eeprom_buffer_size > 0) WDT_RESET_STOCK();
s_sync_write = true;
while (m_write_len && !s_write_err)