Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-23 14:29:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Setfreq usb command (#2235)

Browse Source 
* SetFreq usb command for rx apps
* code format, better check
This commit is contained in:
Totoo 2024-09-04 20:26:31 +02:00 committed by GitHub
parent a2c4fefe34
commit 02b75f567a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
30 changed files with 202 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/application/apps/analog_audio_app.cpp
View File

@ -435,4 +435,7 @@ void AnalogAudioView::handle_coded_squelch(uint32_t value) {
text_ctcss.set(tone_key_string_by_value(value, text_ctcss.parent_rect().width() / 8));
}
void AnalogAudioView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
} /* namespace ui */

9
firmware/application/apps/analog_audio_app.hpp
View File

@ -247,12 +247,21 @@ class AnalogAudioView : public View {
void handle_coded_squelch(uint32_t value);
void on_freqchg(int64_t freq);
MessageHandlerRegistration message_handler_coded_squelch{
Message::ID::CodedSquelch,
[this](const Message* p) {
const auto message = *reinterpret_cast<const CodedSquelchMessage*>(p);
this->handle_coded_squelch(message.value);
}};
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
};
} /* namespace ui */

4
firmware/application/apps/capture_app.cpp
View File

@ -128,4 +128,8 @@ void CaptureAppView::focus() {
record_view.focus();
}
void CaptureAppView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
} /* namespace ui */

9
firmware/application/apps/capture_app.hpp
View File

@ -108,6 +108,15 @@ class CaptureAppView : public View {
3};
spectrum::WaterfallView waterfall{};
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
void on_freqchg(int64_t freq);
};
} /* namespace ui */

4
firmware/application/apps/ert_app.cpp
View File

@ -178,4 +178,8 @@ void ERTAppView::on_show_list() {
recent_entries_view.focus();
}
void ERTAppView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
} /* namespace ui */

8
firmware/application/apps/ert_app.hpp
View File

@ -176,6 +176,14 @@ class ERTAppView : public View {
this->on_packet(packet);
}};
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
void on_freqchg(int64_t freq);
void on_packet(const ert::Packet& packet);
void on_show_list();
};

4
firmware/application/apps/pocsag_app.cpp
View File

@ -321,6 +321,10 @@ void POCSAGAppView::on_stats(const POCSAGStatsMessage* stats) {
widget_frames.set_sync(stats->has_sync);
}
void POCSAGAppView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
void BaudIndicator::paint(Painter& painter) {
auto p = screen_pos();
char top = '-';

9
firmware/application/apps/pocsag_app.hpp
View File

@ -292,6 +292,15 @@ class POCSAGAppView : public View {
Console console{
{0, 2 * 16 + 6, screen_width, screen_height - 54}};
void on_freqchg(int64_t freq);
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
MessageHandlerRegistration message_handler_packet{
Message::ID::POCSAGPacket,
[this](Message* const p) {

4
firmware/application/apps/ui_aprs_rx.cpp
View File

@ -122,6 +122,10 @@ APRSRxView::APRSRxView(NavigationView& nav, Rect parent_rect)
receiver_model.enable();
}
void APRSRxView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
void APRSRxView::on_packet(const APRSPacketMessage* message) {
std::string str_console = "\x1B";

8
firmware/application/apps/ui_aprs_rx.hpp
View File

@ -185,6 +185,7 @@ class APRSRxView : public View {
std::string title() const override { return "APRS RX"; };
void on_packet(const APRSPacketMessage* message);
void on_freqchg(int64_t freq);
private:
void on_data(uint32_t value, bool is_data);
@ -271,6 +272,13 @@ class APRSRXView : public View {
this->view_stream.on_packet(message);
this->view_table.on_pkt(message);
}};
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->view_stream.on_freqchg(message->freq);
}};
};
} /* namespace ui */

5
firmware/application/apps/ui_level.cpp
View File

@ -323,4 +323,9 @@ void LevelView::handle_coded_squelch(const uint32_t value) {
text_ctcss.set(" ");
}
void LevelView::on_freqchg(int64_t freq) {
receiver_model.set_target_frequency(freq);
button_frequency.set_text("<" + to_string_short_freq(freq) + " MHz>");
}
} /* namespace ui */

9
firmware/application/apps/ui_level.hpp
View File

@ -188,6 +188,15 @@ class LevelView : public View {
void handle_coded_squelch(const uint32_t value);
void on_freqchg(int64_t freq);
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
MessageHandlerRegistration message_handler_coded_squelch{
Message::ID::CodedSquelch,
[this](const Message* const p) {

4
firmware/application/apps/ui_sonde.cpp
View File

@ -187,4 +187,8 @@ void SondeView::on_packet(const sonde::Packet& packet) {
}
}
void SondeView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
} /* namespace ui */

8
firmware/application/apps/ui_sonde.hpp
View File

@ -195,6 +195,14 @@ class SondeView : public View {
const auto message = static_cast<const OrientationDataMessage*>(p);
this->on_orientation(message);
}};
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
void on_freqchg(int64_t freq);
void on_gps(const GPSPosDataMessage* msg);
void on_orientation(const OrientationDataMessage* msg);

4
firmware/application/apps/ui_subghzd.cpp
View File

@ -224,6 +224,10 @@ std::string SubGhzDView::pad_string_with_spaces(int snakes) {
return paddedStr;
}
void SubGhzDView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
template <>
void RecentEntriesTable<ui::SubGhzDRecentEntries>::draw(
const Entry& entry,

8
firmware/application/apps/ui_subghzd.hpp
View File

@ -127,6 +127,14 @@ class SubGhzDView : public View {
}};
SubGhzDRecentEntriesView recent_entries_view{columns, recent};
void on_freqchg(int64_t freq);
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
MessageHandlerRegistration message_handler_packet{
Message::ID::SubGhzDData,
[this](Message* const p) {

4
firmware/application/apps/ui_weatherstation.cpp
View File

@ -220,6 +220,10 @@ std::string WeatherView::pad_string_with_spaces(int snakes) {
return paddedStr;
}
void WeatherView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
template <>
void RecentEntriesTable<ui::WeatherRecentEntries>::draw(
const Entry& entry,

8
firmware/application/apps/ui_weatherstation.hpp
View File

@ -151,6 +151,14 @@ class WeatherView : public View {
}};
WeatherRecentEntriesView recent_entries_view{columns, recent};
void on_freqchg(int64_t freq);
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
MessageHandlerRegistration message_handler_packet{
Message::ID::WeatherData,
[this](Message* const p) {

4
firmware/application/external/afsk_rx/ui_afsk_rx.cpp vendored
View File

@ -143,6 +143,10 @@ void AFSKRxView::on_data(uint32_t value, bool is_data) {
}
}
void AFSKRxView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
AFSKRxView::~AFSKRxView() {
audio::output::stop();
receiver_model.disable();

9
firmware/application/external/afsk_rx/ui_afsk_rx.hpp vendored
View File

@ -117,6 +117,15 @@ class AFSKRxView : public View {
const auto message = static_cast<const AFSKDataMessage*>(p);
this->on_data(message->value, message->is_data);
}};
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
void on_freqchg(int64_t freq);
};
} // namespace ui::external_app::afsk_rx

4
firmware/application/external/analogtv/analog_tv_app.cpp vendored
View File

@ -202,4 +202,8 @@ void AnalogTvView::update_modulation(const ReceiverModel::Mode modulation) {
receiver_model.enable();
}
void AnalogTvView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
} // namespace ui::external_app::analogtv

9
firmware/application/external/analogtv/analog_tv_app.hpp vendored
View File

@ -108,6 +108,15 @@ class AnalogTvView : public View {
void set_options_widget(std::unique_ptr<Widget> new_widget);
void update_modulation(const ReceiverModel::Mode modulation);
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
void on_freqchg(int64_t freq);
};
} // namespace ui::external_app::analogtv

4
firmware/application/external/foxhunt/ui_foxhunt_rx.cpp vendored
View File

@ -103,4 +103,8 @@ void FoxhuntRxView::on_orientation(const OrientationDataMessage* msg) {
geomap.update_my_orientation(msg->angle, true);
}
void FoxhuntRxView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
} // namespace ui::external_app::foxhunt_rx

8
firmware/application/external/foxhunt/ui_foxhunt_rx.hpp vendored
View File

@ -103,6 +103,14 @@ class FoxhuntRxView : public View {
[this](const Message* const p) {
this->on_statistics_update(static_cast<const ChannelStatisticsMessage*>(p)->statistics);
}};
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
void on_freqchg(int64_t freq);
float my_lat = 200;
float my_lon = 200;

4
firmware/application/external/nrf_rx/ui_nrf_rx.cpp vendored
View File

@ -125,6 +125,10 @@ void NRFRxView::on_data(uint32_t value, bool is_data) {
}
}
void NRFRxView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
NRFRxView::~NRFRxView() {
audio::output::stop();
receiver_model.disable();

9
firmware/application/external/nrf_rx/ui_nrf_rx.hpp vendored
View File

@ -89,6 +89,15 @@ class NRFRxView : public View {
const auto message = static_cast<const AFSKDataMessage*>(p);
this->on_data(message->value, message->is_data);
}};
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
void on_freqchg(int64_t freq);
};
} /* namespace ui::external_app::nrf_rx */

4
firmware/application/external/protoview/ui_protoview.cpp vendored
View File

@ -186,6 +186,10 @@ void ProtoView::on_data(const ProtoViewDataMessage* message) {
draw2();
}
void ProtoView::on_freqchg(int64_t freq) {
field_frequency.set_value(freq);
}
ProtoView::~ProtoView() {
audio::output::stop();
receiver_model.disable();

9
firmware/application/external/protoview/ui_protoview.hpp vendored
View File

@ -157,6 +157,15 @@ class ProtoView : public View {
[this](const Message* const) {
this->on_timer();
}};
MessageHandlerRegistration message_handler_freqchg{
Message::ID::FreqChangeCommand,
[this](Message* const p) {
const auto message = static_cast<const FreqChangeCommandMessage*>(p);
this->on_freqchg(message->freq);
}};
void on_freqchg(int64_t freq);
};
} // namespace ui::external_app::protoview

18
firmware/application/usb_serial_shell.cpp
View File

@ -1147,6 +1147,23 @@ static void cmd_asyncmsg(BaseSequentialStream* chp, int argc, char* argv[]) {
chprintf(chp, usage);
}
}
static void cmd_setfreq(BaseSequentialStream* chp, int argc, char* argv[]) {
const char* usage = "usage: setfreq freq_in_hz\r\n";
if (argc != 1) {
chprintf(chp, usage);
return;
}
int64_t freq = atol(argv[0]);
if (freq <= 0) {
chprintf(chp, usage);
return;
}
// radio::set_tuning_frequency(freq); // sadly this doesn't update any widget, just change the frequency.
FreqChangeCommandMessage message{freq};
EventDispatcher::send_message(message);
chprintf(chp, "ok\r\n");
}
static const ShellCommand commands[] = {
{"reboot", cmd_reboot},
@ -1180,6 +1197,7 @@ static const ShellCommand commands[] = {
{"settingsreset", cmd_settingsreset},
{"sendpocsag", cmd_sendpocsag},
{"asyncmsg", cmd_asyncmsg},
{"setfreq", cmd_setfreq},
{NULL, NULL}};
static const ShellConfig shell_cfg1 = {

8
firmware/common/message.hpp
View File

@ -125,6 +125,7 @@ class Message {
PocsagTosend = 67,
BatteryStateData = 68,
ProtoViewData = 69,
FreqChangeCommand = 70,
MAX
};
@ -1427,4 +1428,11 @@ class ProtoViewDataMessage : public Message {
const uint16_t maxptr = 99;
};
class FreqChangeCommandMessage : public Message {
public:
constexpr FreqChangeCommandMessage(int64_t freq)
: Message{ID::FreqChangeCommand}, freq{freq} {}
int64_t freq = 0;
};
#endif /*__MESSAGE_H__*/