Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-06-24 14:50:43 -04:00
Code Issues Projects Releases Packages Wiki Activity

Simplify SD card mount status code.

Browse source
This commit is contained in:
Jared Boone 2015-11-29 15:37:24 -08:00
parent 435824e9b5
commit 5928086fd9
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
firmware/application/main.cpp
View file

@ -128,31 +128,31 @@ private:
} }
} }
void handle_rtc_tick() { void update_sd_card_status() {
const auto sd_card_present_now = sdc_lld_is_card_inserted(&SDCD1); const auto sd_card_present_now = sdc_lld_is_card_inserted(&SDCD1);
if( sd_card_present_now != sd_card_present ) { if( sd_card_present_now != sd_card_present ) {
sd_card_present = sd_card_present_now; sd_card_present = sd_card_present_now;
SDCardStatusMessage message { false };
if( sd_card_present ) { if( sd_card_present ) {
if( sdcConnect(&SDCD1) == CH_SUCCESS ) { if( sdcConnect(&SDCD1) == CH_SUCCESS ) {
if( sd_card::filesystem::mount() == FR_OK ) { if( sd_card::filesystem::mount() == FR_OK ) {
SDCardStatusMessage message { true }; message.is_mounted = true;
context.message_map().send(&message);
} else {
// TODO: Error, modal warning?
} }
} else {
// TODO: Error, modal warning?
} }
} else { } else {
sdcDisconnect(&SDCD1); sdcDisconnect(&SDCD1);
SDCardStatusMessage message { false };
context.message_map().send(&message);
} }
context.message_map().send(&message);
} }
} }
void handle_rtc_tick() {
update_sd_card_status();
}
static ui::Widget* touch_widget(ui::Widget* const w, ui::TouchEvent event) { static ui::Widget* touch_widget(ui::Widget* const w, ui::TouchEvent event) {
if( !w->hidden() ) { if( !w->hidden() ) {
// To achieve reverse depth ordering (last object drawn is // To achieve reverse depth ordering (last object drawn is

2
firmware/common/message.hpp
View file

@ -250,7 +250,7 @@ public:
{ {
} }
const bool is_mounted; bool is_mounted;
}; };
class MessageHandlerMap { class MessageHandlerMap {