[all] Issue 4 fixed (Mixer menu)

[sky9x / Taranis] Issue 1 fixed (PlayFile/Play were called from an interrupt). To be tested and re-tested
[all] FrSky alarms are not any more sent from the 10ms interrupt, but from the main loop. To be tested as well
This commit is contained in:
bsongis@gmail.com
2013-03-28 06:49:39 +00:00
parent 8b7ed2bdec
commit c0a509e3fa
29 changed files with 263 additions and 208 deletions
+1 -1
View File
@@ -221,7 +221,7 @@ unsigned char MEDSdcard_Initialize(Media *media, unsigned char mciID)
// Initialize SDcard
//--------------------------------------------------------------------------
if ( !CardIsConnected( ) )
if ( !SD_CARD_PRESENT( ) )
{
return 0;
}
+1 -1
View File
@@ -499,7 +499,7 @@
///// MCI Card Detect pin.
#define BOARD_SD_PIN_CD PIN_MCI_CD
#define CardIsConnected() ( (PIOB->PIO_PDSR & PIO_PB7) == 0 )
#define SD_CARD_PRESENT() ( (PIOB->PIO_PDSR & PIO_PB7) == 0 )
// States for initialising card
#define SD_ST_ERR -1
+7 -7
View File
@@ -285,7 +285,7 @@ const char * sdCommand(uint32_t cmd, uint32_t arg)
uint32_t i;
Hsmci *phsmci = HSMCI;
if (CardIsConnected()) {
if (SD_CARD_PRESENT()) {
phsmci->HSMCI_ARGR = arg;
phsmci->HSMCI_CMDR = cmd;
@@ -378,7 +378,7 @@ uint32_t sdCmd16()
{
Hsmci *phsmci = HSMCI;
if (CardIsConnected()) {
if (SD_CARD_PRESENT()) {
phsmci->HSMCI_BLKR = ( ( 512 ) << 16 ) | 1 ;
phsmci->HSMCI_ARGR = 512;
phsmci->HSMCI_CMDR = SDMMC_SET_BLOCKLEN;
@@ -963,7 +963,7 @@ void sdMountPoll()
if (!Card_initialized)
return;
if (!CardIsConnected()) {
if (!SD_CARD_PRESENT()) {
Card_state = SD_ST_EMPTY;
Sd_rca = 0;
sdErrorCount = 0;
@@ -971,7 +971,7 @@ void sdMountPoll()
switch (Card_state) {
case SD_ST_EMPTY:
if (CardIsConnected()) {
if (SD_CARD_PRESENT()) {
Card_state = SD_ST_INIT1;
}
break;
@@ -1030,7 +1030,7 @@ void sdInit()
Sd_rca = 0;
sdErrorCount = 0;
if (!CardIsConnected()) {
if (!SD_CARD_PRESENT()) {
Card_state = SD_ST_EMPTY;
Card_initialized = 1;
return;
@@ -1093,12 +1093,12 @@ void sdInit()
// returns 1 for YES, 0 for NO
uint32_t sd_card_ready( void )
{
return CardIsConnected() && Card_state >= SD_ST_DATA;
return SD_CARD_PRESENT() && Card_state >= SD_ST_DATA;
}
uint32_t sdMounted( void )
{
return CardIsConnected() && Card_state == SD_ST_MOUNTED;
return SD_CARD_PRESENT() && Card_state == SD_ST_MOUNTED;
}
uint32_t sd_read_block(uint32_t block_no, uint32_t *data)