Merge fixing, commit to catch up on recent files

This commit is contained in:
furrtek
2016-02-04 10:27:53 +01:00
parent 44638e504b
commit 6e496e2b26
90 changed files with 2257 additions and 1428 deletions

View File

@@ -36,7 +36,7 @@ namespace ui {
class LCRView : public View {
public:
LCRView(NavigationView& nav, TransmitterModel& transmitter_model);
LCRView(NavigationView& nav);
~LCRView();
void make_frame();
@@ -63,7 +63,6 @@ private:
char lcrframe[256];
char lcrframe_f[256];
rf::Frequency f;
TransmitterModel& transmitter_model;
Text text_status {
{ 168, 196, 64, 16 },