TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-12-31 08:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'upstream/master' - At least it builds...

Browse Source
This commit is contained in:
furrtek
2017-01-16 03:45:44 +00:00
parent f39954856e 052fd1c407
commit 5e40669cbc
298 changed files with 8122 additions and 4685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/application/ui_closecall.cpp
View File

@@ -23,7 +23,7 @@
#include "ui_closecall.hpp"
#include "msgpack.hpp"
#include "time.hpp"
#include "rtc_time.hpp"
#include "event_m0.hpp"
#include "portapack.hpp"
#include "baseband_api.hpp"
@@ -42,7 +42,7 @@ void CloseCallView::focus() {
}
CloseCallView::~CloseCallView() {
time::signal_tick_second -= signal_token_tick_second;
rtc_time::signal_tick_second -= signal_token_tick_second;
receiver_model.disable();
baseband::shutdown();
}
@@ -301,7 +301,7 @@ CloseCallView::CloseCallView(
{
baseband::run_image(portapack::spi_flash::image_tag_closecall);
add_children({ {
add_children({
&text_labels_a,
&text_labels_b,
&text_labels_c,
@@ -318,7 +318,7 @@ CloseCallView::CloseCallView(
&text_debug,
&big_display,
&button_exit
} });
});
text_labels_a.set_style(&style_grey);
text_labels_b.set_style(&style_grey);
@@ -380,7 +380,7 @@ CloseCallView::CloseCallView(
nav.pop();
};
signal_token_tick_second = time::signal_tick_second += [this]() {
signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
this->on_tick_second();
};