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

@ -132,8 +132,6 @@ AboutView::AboutView(
NavigationView& nav
)
{
//uint8_t p, c;
add_children({
&text_cpld_hackrf,
&text_cpld_hackrf_status,
@ -150,13 +148,13 @@ AboutView::AboutView(
add_child(&text);
}
if( cpld_hackrf_verify_eeprom() ) {
if( hackrf::cpld::verify_eeprom() ) {
text_cpld_hackrf_status.set(" OK");
} else {
text_cpld_hackrf_status.set("BAD");
}
button_ok.on_select = [this,&nav](Button&){
button_ok.on_select = [&nav](Button&){
nav.pop();
};
}