TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-10-19 10:32:14 +00:00
Code Issues Packages Projects Releases 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

3
firmware/application/ui_jammer.hpp
View File

@@ -36,7 +36,7 @@ namespace ui {
class JammerView : public View {
public:
JammerView(NavigationView& nav, TransmitterModel& transmitter_model);
JammerView(NavigationView& nav);
~JammerView();
void updfreq(uint8_t id, rf::Frequency f);
@@ -117,7 +117,6 @@ private:
bool jamming = false;
rf::Frequency f;
TransmitterModel& transmitter_model;
Text text_type {
{ 1 * 8, 1 * 16, 40, 16 },