Merge remote-tracking branch 'upstream/master'

Base class for text entry
This commit is contained in:
furrtek 2017-06-21 03:25:27 +01:00
commit abd154b3c7
131 changed files with 19385 additions and 5412 deletions

View file

@ -130,23 +130,23 @@ static void event_loop() {
}
int main(void) {
portapack::init();
if( portapack::init() ) {
portapack::display.init();
portapack::io.init();
portapack::display.init();
sdcStart(&SDCD1, nullptr);
sdcStart(&SDCD1, nullptr);
controls_init();
lcd_frame_sync_configure();
rtc_interrupt_enable();
controls_init();
lcd_frame_sync_configure();
rtc_interrupt_enable();
event_loop();
event_loop();
sdcDisconnect(&SDCD1);
sdcStop(&SDCD1);
sdcDisconnect(&SDCD1);
sdcStop(&SDCD1);
portapack::shutdown();
}
portapack::shutdown();
m4_init(portapack::spi_flash::image_tag_hackrf, portapack::memory::map::m4_code_hackrf);
m0_halt();