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

Rename time files/namespace to not conflict with existing defs.

Browse Source
This commit is contained in:
Jared Boone 2016-08-21 17:49:06 -07:00
parent f20647feb4
commit 43a11ba048
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/application/CMakeLists.txt
View File

@ -170,7 +170,7 @@ set(CPPSRC
${COMMON}/ert_packet.cpp ${COMMON}/ert_packet.cpp
capture_app.cpp capture_app.cpp
sd_card.cpp sd_card.cpp
time.cpp rtc_time.cpp
file.cpp file.cpp
log_file.cpp log_file.cpp
${COMMON}/png_writer.cpp ${COMMON}/png_writer.cpp

4
firmware/application/event_m0.cpp
View File

@ -24,7 +24,7 @@
#include "portapack.hpp" #include "portapack.hpp"
#include "sd_card.hpp" #include "sd_card.hpp"
#include "time.hpp" #include "rtc_time.hpp"
#include "message.hpp" #include "message.hpp"
#include "message_queue.hpp" #include "message_queue.hpp"
@ -219,7 +219,7 @@ void EventDispatcher::handle_rtc_tick() {
portapack::temperature_logger.second_tick(); portapack::temperature_logger.second_tick();
time::on_tick_second(); rtc_time::on_tick_second();
} }
ui::Widget* EventDispatcher::touch_widget(ui::Widget* const w, ui::TouchEvent event) { ui::Widget* EventDispatcher::touch_widget(ui::Widget* const w, ui::TouchEvent event) {

6
firmware/application/time.cpp → firmware/application/rtc_time.cpp
View File

@ -19,9 +19,9 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include "time.hpp" #include "rtc_time.hpp"
namespace time { namespace rtc_time {
Signal<> signal_tick_second; Signal<> signal_tick_second;
@ -29,4 +29,4 @@ void on_tick_second() {
signal_tick_second.emit(); signal_tick_second.emit();
} }
} /* namespace time */ } /* namespace rtc_time */

10
firmware/application/time.hpp → firmware/application/rtc_time.hpp
View File

@ -19,17 +19,17 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __TIME_H__ #ifndef __RTC_TIME_H__
#define __TIME_H__ #define __RTC_TIME_H__
#include "signal.hpp" #include "signal.hpp"
namespace time { namespace rtc_time {
extern Signal<> signal_tick_second; extern Signal<> signal_tick_second;
void on_tick_second(); void on_tick_second();
} /* namespace time */ } /* namespace rtc_time */
#endif/*__TIME_H__*/ #endif/*__RTC_TIME_H__*/

6
firmware/application/ui_record_view.cpp
View File

@ -25,7 +25,7 @@
using namespace portapack; using namespace portapack;
#include "file.hpp" #include "file.hpp"
#include "time.hpp" #include "rtc_time.hpp"
#include "string_format.hpp" #include "string_format.hpp"
#include "utility.hpp" #include "utility.hpp"
@ -188,13 +188,13 @@ RecordView::RecordView(
this->toggle(); this->toggle();
}; };
signal_token_tick_second = time::signal_tick_second += [this]() { signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
this->on_tick_second(); this->on_tick_second();
}; };
} }
RecordView::~RecordView() { RecordView::~RecordView() {
time::signal_tick_second -= signal_token_tick_second; rtc_time::signal_tick_second -= signal_token_tick_second;
} }
void RecordView::focus() { void RecordView::focus() {