mirror of
https://github.com/portapack-mayhem/mayhem-firmware.git
synced 2026-09-12 17:49:31 +00:00
Move ADS-B receiver to external app
This commit is contained in:
@@ -286,7 +286,6 @@ set(CPPSRC
|
|||||||
apps/capture_app.cpp
|
apps/capture_app.cpp
|
||||||
apps/pocsag_app.cpp
|
apps/pocsag_app.cpp
|
||||||
apps/ui_about_simple.cpp
|
apps/ui_about_simple.cpp
|
||||||
apps/ui_adsb_rx.cpp
|
|
||||||
apps/ui_aprs_rx.cpp
|
apps/ui_aprs_rx.cpp
|
||||||
apps/ui_aprs_tx.cpp
|
apps/ui_aprs_tx.cpp
|
||||||
apps/ui_battinfo.cpp
|
apps/ui_battinfo.cpp
|
||||||
|
|||||||
+57
@@ -0,0 +1,57 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2026 PortaPack Mayhem
|
||||||
|
*
|
||||||
|
* This file is part of PortaPack.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; see the file COPYING. If not, write to
|
||||||
|
* the Free Software Foundation, Inc., 51 Franklin Street,
|
||||||
|
* Boston, MA 02110-1301, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "ui_adsb_rx.hpp"
|
||||||
|
#include "ui_navigation.hpp"
|
||||||
|
#include "external_app.hpp"
|
||||||
|
|
||||||
|
namespace ui::external_app::adsbrx {
|
||||||
|
|
||||||
|
void initialize_app(ui::NavigationView& nav) {
|
||||||
|
nav.push<ADSBRxView>();
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace ui::external_app::adsbrx
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
|
||||||
|
__attribute__((section(".external_app.app_adsbrx.application_information"), used)) application_information_t _application_information_adsbrx = {
|
||||||
|
/*.memory_location = */ (uint8_t*)0x00000000,
|
||||||
|
/*.externalAppEntry = */ ui::external_app::adsbrx::initialize_app,
|
||||||
|
/*.header_version = */ CURRENT_HEADER_VERSION,
|
||||||
|
/*.app_version = */ VERSION_MD5,
|
||||||
|
|
||||||
|
/*.app_name = */ "ADS-B",
|
||||||
|
/*.bitmap_data = */ {
|
||||||
|
0x80, 0x01, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03,
|
||||||
|
0xC0, 0x03, 0xE0, 0x07, 0xF8, 0x1F, 0xFE, 0x7F,
|
||||||
|
0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x03, 0xC0, 0x03,
|
||||||
|
0xC0, 0x03, 0xE0, 0x07, 0xF0, 0x0F, 0xF8, 0x1F,
|
||||||
|
},
|
||||||
|
/*.icon_color = */ ui::Color::green().v,
|
||||||
|
/*.menu_location = */ app_location_t::RX,
|
||||||
|
/*.desired_menu_position = */ -1,
|
||||||
|
|
||||||
|
/*.m4_app_tag = portapack::spi_flash::image_tag_adsbrx */ {'P', 'A', 'D', 'R'},
|
||||||
|
/*.m4_app_offset = */ 0x00000000,
|
||||||
|
};
|
||||||
|
|
||||||
|
} // extern "C"
|
||||||
Vendored
+13
-3
@@ -38,7 +38,7 @@ using namespace portapack;
|
|||||||
|
|
||||||
namespace pmem = portapack::persistent_memory;
|
namespace pmem = portapack::persistent_memory;
|
||||||
|
|
||||||
namespace ui {
|
namespace ui::external_app::adsbrx {
|
||||||
|
|
||||||
static const char speed_type_msg[][6] = {" Spd:", " IAS:", " TAS:"};
|
static const char speed_type_msg[][6] = {" Spd:", " IAS:", " TAS:"};
|
||||||
|
|
||||||
@@ -46,13 +46,19 @@ static std::string get_map_tag(const AircraftRecentEntry& entry) {
|
|||||||
return trimr(entry.callsign.empty() ? entry.icao_str : entry.callsign);
|
return trimr(entry.callsign.empty() ? entry.icao_str : entry.callsign);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // namespace ui::external_app::adsbrx
|
||||||
|
|
||||||
|
namespace ui {
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
void RecentEntriesTable<AircraftRecentEntries>::draw(
|
void RecentEntriesTable<external_app::adsbrx::AircraftRecentEntries>::draw(
|
||||||
const Entry& entry,
|
const Entry& entry,
|
||||||
const Rect& target_rect,
|
const Rect& target_rect,
|
||||||
Painter& painter,
|
Painter& painter,
|
||||||
const Style& style,
|
const Style& style,
|
||||||
RecentEntriesColumns& columns) {
|
RecentEntriesColumns& columns) {
|
||||||
|
using namespace external_app::adsbrx;
|
||||||
|
|
||||||
Color target_color;
|
Color target_color;
|
||||||
std::string entry_string;
|
std::string entry_string;
|
||||||
|
|
||||||
@@ -107,6 +113,10 @@ void RecentEntriesTable<AircraftRecentEntries>::draw(
|
|||||||
bitmap_target, target_color, style.background);
|
bitmap_target, target_color, style.background);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} // namespace ui
|
||||||
|
|
||||||
|
namespace ui::external_app::adsbrx {
|
||||||
|
|
||||||
/* ADSBLogger ********************************************/
|
/* ADSBLogger ********************************************/
|
||||||
|
|
||||||
void ADSBLogger::log(const ADSBLogEntry& log_entry) {
|
void ADSBLogger::log(const ADSBLogEntry& log_entry) {
|
||||||
@@ -816,4 +826,4 @@ void ADSBRxView::remove_expired_entries() {
|
|||||||
recent.erase(it.base(), recent.end());
|
recent.erase(it.base(), recent.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
} /* namespace ui */
|
} // namespace ui::external_app::adsbrx
|
||||||
Vendored
+2
-2
@@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
using namespace adsb;
|
using namespace adsb;
|
||||||
|
|
||||||
namespace ui {
|
namespace ui::external_app::adsbrx {
|
||||||
#define AIRCRAFT_ID_L 1 // aircraft ID message type (lowest type id)
|
#define AIRCRAFT_ID_L 1 // aircraft ID message type (lowest type id)
|
||||||
#define AIRCRAFT_ID_H 4 // aircraft ID message type (highest type id)
|
#define AIRCRAFT_ID_H 4 // aircraft ID message type (highest type id)
|
||||||
|
|
||||||
@@ -491,4 +491,4 @@ class ADSBRxView : public View {
|
|||||||
}};
|
}};
|
||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace ui */
|
} // namespace ui::external_app::adsbrx
|
||||||
+5
-1
@@ -391,6 +391,10 @@ set(EXTCPPSRC
|
|||||||
external/tetra_rx/tetra_rcpc.cpp
|
external/tetra_rx/tetra_rcpc.cpp
|
||||||
external/tetra_rx/tetra_viterbi.cpp
|
external/tetra_rx/tetra_viterbi.cpp
|
||||||
|
|
||||||
|
#adsb rx
|
||||||
|
external/adsbrx/main.cpp
|
||||||
|
external/adsbrx/ui_adsb_rx.cpp
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
set(EXTAPPLIST
|
set(EXTAPPLIST
|
||||||
@@ -485,6 +489,7 @@ set(EXTAPPLIST
|
|||||||
secplustx
|
secplustx
|
||||||
signal_hunter
|
signal_hunter
|
||||||
tetra_rx
|
tetra_rx
|
||||||
|
adsbrx
|
||||||
)
|
)
|
||||||
|
|
||||||
# sdusb has type conflicts with PRALINE (HackRF Pro) - add only for non-PRALINE builds
|
# sdusb has type conflicts with PRALINE (HackRF Pro) - add only for non-PRALINE builds
|
||||||
@@ -495,4 +500,3 @@ if(NOT BOARD STREQUAL "PRALINE")
|
|||||||
)
|
)
|
||||||
list(APPEND EXTAPPLIST sdusb)
|
list(APPEND EXTAPPLIST sdusb)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
+7
@@ -115,6 +115,7 @@ MEMORY
|
|||||||
ram_external_app_vor_tx (rwx) : org = 0xAE0A0000, len = 32k
|
ram_external_app_vor_tx (rwx) : org = 0xAE0A0000, len = 32k
|
||||||
ram_external_app_signal_hunter (rwx) : org = 0xAE0B0000, len = 32k
|
ram_external_app_signal_hunter (rwx) : org = 0xAE0B0000, len = 32k
|
||||||
ram_external_app_tetra_rx (rwx) : org = 0xAE0C0000, len = 32k
|
ram_external_app_tetra_rx (rwx) : org = 0xAE0C0000, len = 32k
|
||||||
|
ram_external_app_adsbrx (rwx) : org = 0xAE0D0000, len = 32k
|
||||||
}
|
}
|
||||||
|
|
||||||
SECTIONS
|
SECTIONS
|
||||||
@@ -671,6 +672,12 @@ SECTIONS
|
|||||||
*(*ui*external_app*tetra_rx*);
|
*(*ui*external_app*tetra_rx*);
|
||||||
} > ram_external_app_tetra_rx
|
} > ram_external_app_tetra_rx
|
||||||
|
|
||||||
|
.external_app_adsbrx : ALIGN(4) SUBALIGN(4)
|
||||||
|
{
|
||||||
|
KEEP(*(.external_app.app_adsbrx.application_information));
|
||||||
|
*(*ui*external_app*adsbrx*);
|
||||||
|
} > ram_external_app_adsbrx
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,6 @@
|
|||||||
#include "portapack.hpp"
|
#include "portapack.hpp"
|
||||||
|
|
||||||
#include "ui_about_simple.hpp"
|
#include "ui_about_simple.hpp"
|
||||||
#include "ui_adsb_rx.hpp"
|
|
||||||
#include "ui_aprs_rx.hpp"
|
#include "ui_aprs_rx.hpp"
|
||||||
#include "ui_aprs_tx.hpp"
|
#include "ui_aprs_tx.hpp"
|
||||||
#include "ui_btle_rx.hpp"
|
#include "ui_btle_rx.hpp"
|
||||||
@@ -99,7 +98,6 @@ const NavigationView::AppList NavigationView::appList = {
|
|||||||
{nullptr, "Games", HOME, Color::cyan(), &bitmap_icon_games, new ViewFactory<GamesMenuView>()},
|
{nullptr, "Games", HOME, Color::cyan(), &bitmap_icon_games, new ViewFactory<GamesMenuView>()},
|
||||||
{nullptr, "Settings", HOME, Color::cyan(), &bitmap_icon_setup, new ViewFactory<SettingsMenuView>()},
|
{nullptr, "Settings", HOME, Color::cyan(), &bitmap_icon_setup, new ViewFactory<SettingsMenuView>()},
|
||||||
/* RX ********************************************************************/
|
/* RX ********************************************************************/
|
||||||
{"adsbrx", "ADS-B", RX, Color::green(), &bitmap_icon_adsb, new ViewFactory<ADSBRxView>()},
|
|
||||||
{"ais", "AIS Boats", RX, Color::green(), &bitmap_icon_ais, new ViewFactory<AISAppView>()},
|
{"ais", "AIS Boats", RX, Color::green(), &bitmap_icon_ais, new ViewFactory<AISAppView>()},
|
||||||
{"aprsrx", "APRS", RX, Color::green(), &bitmap_icon_aprs, new ViewFactory<APRSRXView>()},
|
{"aprsrx", "APRS", RX, Color::green(), &bitmap_icon_aprs, new ViewFactory<APRSRXView>()},
|
||||||
{"audio", "Audio", RX, Color::green(), &bitmap_icon_speaker, new ViewFactory<AnalogAudioView>()},
|
{"audio", "Audio", RX, Color::green(), &bitmap_icon_speaker, new ViewFactory<AnalogAudioView>()},
|
||||||
|
|||||||
@@ -24,4 +24,4 @@
|
|||||||
# external app address ranges below must match those in linker file "external.ld"
|
# external app address ranges below must match those in linker file "external.ld"
|
||||||
maximum_application_size = 32*1024
|
maximum_application_size = 32*1024
|
||||||
external_apps_address_start = 0xADB00000
|
external_apps_address_start = 0xADB00000
|
||||||
external_apps_address_end = 0xAE0B0000
|
external_apps_address_end = 0xAE0E0000
|
||||||
|
|||||||
Reference in New Issue
Block a user