portapack-mayhem/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2026-09-11 17:19:29 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge fixing, commit to catch up on recent files

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/ui_xylos.hpp
+2 -6
View File
@@ -45,7 +45,7 @@ void do_something();
class XylosRXView : public View {
public:
XylosRXView(NavigationView& nav, ReceiverModel& receiver_model);
XylosRXView(NavigationView& nav);
~XylosRXView();
void talk();
@@ -91,8 +91,6 @@ private:
"trailer.wav"
};
char ccir_received[21];
ReceiverModel& receiver_model;
Text text_title {
{ 1 * 8, 1 * 16, 11, 16 },
@@ -142,7 +140,7 @@ private:
class XylosView : public View {
public:
XylosView(NavigationView& nav, TransmitterModel& transmitter_model);
XylosView(NavigationView& nav);
~XylosView();
void journuit();
@@ -184,8 +182,6 @@ private:
};
char ccirmessage[21];
char ccir_received[21];
TransmitterModel& transmitter_model;
Text text_title {
{ 1 * 8, 1 * 16, 11, 16 },