Skip to content

Commit

Permalink
specific directory for screens and logs (#971)
Browse files Browse the repository at this point in the history
* Changed to LOGS directory, creating if not existing. Adjusted to upper case.
* Changed to SCREENSHOTS directory, creating if not existing
  • Loading branch information
gullradriel committed May 10, 2023
1 parent 8cae998 commit bc1ad55
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 12 deletions.
4 changes: 3 additions & 1 deletion firmware/application/apps/acars_app.cpp
Expand Up @@ -98,9 +98,11 @@ ACARSAppView::ACARSAppView(NavigationView& nav) {
logging = v;
};

std::string folder = "LOGS";
make_new_directory(folder);
logger = std::make_unique<ACARSLogger>();
if (logger)
logger->append("acars.txt");
logger->append("LOGS/ACARS.TXT");
}

ACARSAppView::~ACARSAppView() {
Expand Down
4 changes: 3 additions & 1 deletion firmware/application/apps/ais_app.cpp
Expand Up @@ -397,9 +397,11 @@ AISAppView::AISAppView(NavigationView& nav) : nav_ { nav } {
this->on_show_list();
};

std::string folder = "LOGS";
make_new_directory(folder);
logger = std::make_unique<AISLogger>();
if( logger ) {
logger->append(u"ais.txt");
logger->append(u"LOGS/AIS.TXT");
}
}

Expand Down
4 changes: 3 additions & 1 deletion firmware/application/apps/ert_app.cpp
Expand Up @@ -130,9 +130,11 @@ ERTAppView::ERTAppView(NavigationView&) {
static_cast<int8_t>(receiver_model.vga()),
}); */

std::string folder = "LOGS";
make_new_directory(folder);
logger = std::make_unique<ERTLogger>();
if( logger ) {
logger->append(u"ert.txt");
logger->append(u"LOGS/ERT.TXT");
}
}

Expand Down
4 changes: 3 additions & 1 deletion firmware/application/apps/pocsag_app.cpp
Expand Up @@ -129,9 +129,11 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav) {
ignore_address /= 10;
}

std::string folder = "LOGS";
make_new_directory(folder);
logger = std::make_unique<POCSAGLogger>();
if (logger)
logger->append("pocsag.txt");
logger->append("LOGS/POCSAG.TXT");

audio::output::start();
audio::output::unmute();
Expand Down
4 changes: 3 additions & 1 deletion firmware/application/apps/tpms_app.cpp
Expand Up @@ -194,9 +194,11 @@ TPMSAppView::TPMSAppView(NavigationView&) {

options_temperature.set_selected_index(0, true);

std::string folder = "LOGS";
make_new_directory(folder);
logger = std::make_unique<TPMSLogger>();
if( logger ) {
logger->append(u"tpms.txt");
logger->append(u"LOGS/TMPS.TXT");
}
}

Expand Down
8 changes: 6 additions & 2 deletions firmware/application/apps/ui_adsb_rx.cpp
Expand Up @@ -117,6 +117,12 @@ ADSBRxAircraftDetailsView::ADSBRxAircraftDetailsView(

std::unique_ptr<ADSBLogger> logger { };

logger = std::make_unique<ADSBLogger>();
std::string folder = "LOGS";
make_new_directory(folder);
if (logger)
logger->append(u"LOGS/ADSB.TXT");

icao_code = to_string_hex(entry_copy.ICAO_address, 6);
text_icao_address.set(to_string_hex(entry_copy.ICAO_address, 6));

Expand Down Expand Up @@ -351,7 +357,6 @@ void ADSBRxView::sort_entries_by_state()
}

void ADSBRxView::on_frame(const ADSBFrameMessage * message) {
logger = std::make_unique<ADSBLogger>();
rtc::RTC datetime;
std::string callsign;
std::string str_info;
Expand Down Expand Up @@ -432,7 +437,6 @@ void ADSBRxView::on_frame(const ADSBFrameMessage * message) {
} // frame.get_DF() == DF_ADSB

if (logger) {
logger->append(u"adsb.txt");
// will log each frame in format:
// 20171103100227 8DADBEEFDEADBEEFDEADBEEFDEADBEEF ICAO:nnnnnn callsign Alt:nnnnnn Latnnn.nn Lonnnn.nn
logger->log_str(logentry);
Expand Down
4 changes: 3 additions & 1 deletion firmware/application/apps/ui_afsk_rx.cpp
Expand Up @@ -107,9 +107,11 @@ AFSKRxView::AFSKRxView(NavigationView& nav) {
nav.push<ModemSetupView>();
};

std::string folder = "LOGS";
make_new_directory(folder);
logger = std::make_unique<AFSKLogger>();
if (logger)
logger->append("AFSK_LOG.TXT");
logger->append("LOGS/AFSK.TXT");

// Auto-configure modem for LCR RX (will be removed later)
baseband::set_afsk(persistent_memory::modem_baudrate(), 8, 0, false);
Expand Down
4 changes: 3 additions & 1 deletion firmware/application/apps/ui_aprs_rx.cpp
Expand Up @@ -141,9 +141,11 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect) : View(parent_rect

options_region.set_selected_index(0, true);

std::string folder = "LOGS";
make_new_directory(folder);
logger = std::make_unique<APRSLogger>();
if (logger)
logger->append("APRS_RX_LOG.TXT");
logger->append("LOGS/APRS.TXT");

baseband::set_aprs(1200);

Expand Down
5 changes: 3 additions & 2 deletions firmware/application/apps/ui_sonde.cpp
Expand Up @@ -133,12 +133,13 @@ SondeView::SondeView(NavigationView& nav) {
999); //set a dummy heading out of range to draw a cross...probably not ideal?
};

std::string folder = "LOGS";
make_new_directory(folder);
logger = std::make_unique<SondeLogger>();
if (logger)
logger->append(u"sonde.txt");
logger->append(u"LOGS/SONDE.TXT");

// initialize audio:

field_volume.set_value((receiver_model.headphone_volume() - audio::headphone::volume_range().max).decibel() + 99);

field_volume.on_change = [this](int32_t v) {
Expand Down
6 changes: 5 additions & 1 deletion firmware/application/ui_navigation.cpp
Expand Up @@ -367,7 +367,11 @@ void SystemStatusView::on_bias_tee() {
}*/

void SystemStatusView::on_camera() {
auto path = next_filename_stem_matching_pattern(u"SCR_????");

std::string folder = "SCREENSHOTS";
make_new_directory(folder);

auto path = next_filename_stem_matching_pattern(u"SCREENSHOTS/SCR_????");
if( path.empty() ) {
return;
}
Expand Down

0 comments on commit bc1ad55

Please sign in to comment.