mirror of
https://github.com/eried/portapack-mayhem.git
synced 2024-10-01 01:26:06 -04:00
Cosmetics + Jammer now in green + Jitter
I think the Jammer deserves a green icon, since it actually does it job pretty well. Then there is a Jitter parameter. It allows to introduce a jitter from 1/60th of a second up to 60/60th of a second (a full one). It will delay / move forward either the TX or the cooldown period for a maximum of a half of the time you choose as jitter. Meaning: If I choose 60/60th, a full second of jitter, it will produce a random number from 1 to 60. Then it will calculate jitter = 30 - randomnumber THen it will "add" that (positive or negative) time to the time counter for the next jitter change of state.
This commit is contained in:
euquiq
parent
8859c3d80c
commit
928bce083a
@ -274,7 +274,6 @@ void JammerView::start_tx() {
|
||||
transmitter_model.enable();
|
||||
|
||||
baseband::set_jammer(true, (JammerType)options_type.selected_index(), options_speed.selected_index_value());
|
||||
cooling = false;
|
||||
mscounter = 0; //euquiq: Reset internal ms counter for do_timer()
|
||||
} else {
|
||||
if (out_of_ranges)
|
||||
@ -291,11 +290,13 @@ void JammerView::stop_tx() {
|
||||
radio::disable();
|
||||
baseband::set_jammer(false, JammerType::TYPE_FSK, 0);
|
||||
jamming = false;
|
||||
cooling = false;
|
||||
}
|
||||
|
||||
//called each 1/60th of second
|
||||
void JammerView::on_timer() {
|
||||
if (++mscounter == 60) {
|
||||
mscounter = 0;
|
||||
if (jamming)
|
||||
{
|
||||
if (cooling)
|
||||
@ -305,6 +306,15 @@ void JammerView::on_timer() {
|
||||
transmitter_model.enable();
|
||||
button_transmit.set_text("STOP");
|
||||
baseband::set_jammer(true, (JammerType)options_type.selected_index(), options_speed.selected_index_value());
|
||||
|
||||
int32_t jitter_amount = field_jitter.value();
|
||||
if (jitter_amount)
|
||||
{
|
||||
lfsr_v = lfsr_iterate(lfsr_v);
|
||||
jitter_amount = (jitter_amount / 2) - (lfsr_v & jitter_amount);
|
||||
mscounter += jitter_amount;
|
||||
}
|
||||
|
||||
cooling = false;
|
||||
seconds = 0;
|
||||
}
|
||||
@ -316,13 +326,22 @@ void JammerView::on_timer() {
|
||||
transmitter_model.disable();
|
||||
button_transmit.set_text("PAUSED");
|
||||
baseband::set_jammer(false, JammerType::TYPE_FSK, 0);
|
||||
|
||||
int32_t jitter_amount = field_jitter.value();
|
||||
if (jitter_amount)
|
||||
{
|
||||
lfsr_v = lfsr_iterate(lfsr_v);
|
||||
jitter_amount = (jitter_amount / 2) - (lfsr_v & jitter_amount);
|
||||
mscounter += jitter_amount;
|
||||
}
|
||||
|
||||
cooling = true;
|
||||
seconds = 0;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
mscounter = 0;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -346,6 +365,7 @@ JammerView::JammerView(
|
||||
&options_hop,
|
||||
&field_timetx,
|
||||
&field_timepause,
|
||||
&field_jitter,
|
||||
&button_transmit
|
||||
});
|
||||
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
#include "transmitter_model.hpp"
|
||||
#include "message.hpp"
|
||||
#include "jammer.hpp"
|
||||
#include "lfsr_random.hpp"
|
||||
|
||||
using namespace jammer;
|
||||
|
||||
@ -58,10 +59,10 @@ private:
|
||||
};
|
||||
|
||||
Labels labels {
|
||||
{ { 2 * 8, 9 * 8 + 4 }, "Start", Color::light_grey() },
|
||||
{ { 23 * 8, 9 * 8 + 4 }, "Stop", Color::light_grey() },
|
||||
{ { 12 * 8, 6 * 8 }, "Center", Color::light_grey() },
|
||||
{ { 12 * 8 + 4, 14 * 8 }, "Width", Color::light_grey() }
|
||||
{ { 2 * 8, 8 * 8 + 4 }, "Start", Color::light_grey() },
|
||||
{ { 23 * 8, 8 * 8 + 4 }, "Stop", Color::light_grey() },
|
||||
{ { 12 * 8, 5 * 8 - 4}, "Center", Color::light_grey() },
|
||||
{ { 12 * 8 + 4, 13 * 8 }, "Width", Color::light_grey() }
|
||||
};
|
||||
|
||||
Checkbox check_enabled {
|
||||
@ -76,19 +77,19 @@ private:
|
||||
};
|
||||
|
||||
Button button_start {
|
||||
{ 0 * 8, 6 * 16, 11 * 8, 28 },
|
||||
{ 0 * 8, 11 * 8, 11 * 8, 28 },
|
||||
""
|
||||
};
|
||||
Button button_stop {
|
||||
{ 19 * 8, 6 * 16, 11 * 8, 28 },
|
||||
{ 19 * 8, 11 * 8, 11 * 8, 28 },
|
||||
""
|
||||
};
|
||||
Button button_center {
|
||||
{ 76, 4 * 16, 11 * 8, 28 },
|
||||
{ 76, 4 * 15 - 4, 11 * 8, 28 },
|
||||
""
|
||||
};
|
||||
Button button_width {
|
||||
{ 76, 8 * 16, 11 * 8, 28 },
|
||||
{ 76, 8 * 15, 11 * 8, 28 },
|
||||
""
|
||||
};
|
||||
};
|
||||
@ -120,7 +121,8 @@ private:
|
||||
bool jamming { false };
|
||||
bool cooling { false }; //euquiq: Indicates jammer in cooldown
|
||||
uint16_t seconds = 0; //euquiq: seconds counter for toggling tx / cooldown
|
||||
uint16_t mscounter = 0; //euquiq: Internal ms counter for do_timer()
|
||||
int16_t mscounter = 0; //euquiq: Internal ms counter for do_timer()
|
||||
lfsr_word_t lfsr_v = 1; //euquiq: Used to generate "random" Jitter
|
||||
|
||||
static constexpr Style style_val {
|
||||
.font = font::fixed_8x16,
|
||||
@ -146,17 +148,19 @@ private:
|
||||
};
|
||||
|
||||
Labels labels {
|
||||
{ { 6 * 8, 12 * 16 }, "Type:", Color::light_grey() },
|
||||
{ { 5 * 8, 13 * 16 }, "Speed:", Color::light_grey() },
|
||||
{ { 7 * 8, 14 * 16 }, "Hop:", Color::light_grey() },
|
||||
{ { 3 * 8, 15 * 16 }, "Time TX:", Color::light_grey() },
|
||||
{ { 0 * 8, 16 * 16 }, "Time Pause:", Color::light_grey() },
|
||||
{ { 16 * 8, 15 * 16 }, "Secs.", Color::light_grey() },
|
||||
{ { 16 * 8, 16 * 16 }, "Secs.", Color::light_grey() }
|
||||
{ { 2 * 8, 23 * 8 }, "Type:", Color::light_grey() },
|
||||
{ { 1 * 8, 25 * 8 }, "Speed:", Color::light_grey() },
|
||||
{ { 3 * 8, 27 * 8 }, "Hop:", Color::light_grey() },
|
||||
{ { 4 * 8, 29 * 8 }, "TX:", Color::light_grey() },
|
||||
{ { 1 * 8, 31 * 8 }, "Sle3p:", Color::light_grey() }, //euquiq: Token of appreciation to TheSle3p, which made this ehnancement a reality with his bounty.
|
||||
{ { 0 * 8, 33 * 8 }, "Jitter:", Color::light_grey() }, //Maybe the repository curator can keep the "mystype" for some versions.
|
||||
{ { 11 * 8, 29 * 8 }, "Secs.", Color::light_grey() },
|
||||
{ { 11 * 8, 31 * 8 }, "Secs.", Color::light_grey() },
|
||||
{ { 11 * 8, 33 * 8 }, "/60", Color::light_grey() }
|
||||
};
|
||||
|
||||
OptionsField options_type {
|
||||
{ 12 * 8, 12 * 16 },
|
||||
{ 7 * 8, 23 * 8 },
|
||||
8,
|
||||
{
|
||||
{ "Rand FSK", 0 },
|
||||
@ -167,16 +171,16 @@ private:
|
||||
};
|
||||
|
||||
Text text_range_number {
|
||||
{ 22 * 8, 12 * 16, 2 * 8, 16 },
|
||||
{ 16 * 8, 23 * 8, 2 * 8, 16 },
|
||||
"--"
|
||||
};
|
||||
Text text_range_total {
|
||||
{ 24 * 8, 12 * 16, 3 * 8, 16 },
|
||||
{ 18 * 8, 23 * 8, 3 * 8, 16 },
|
||||
"/--"
|
||||
};
|
||||
|
||||
OptionsField options_speed {
|
||||
{ 12 * 8, 13 * 16 },
|
||||
{ 7 * 8, 25 * 8 },
|
||||
6,
|
||||
{
|
||||
{ "10Hz ", 10 },
|
||||
@ -188,7 +192,7 @@ private:
|
||||
};
|
||||
|
||||
OptionsField options_hop {
|
||||
{ 12 * 8, 14 * 16 },
|
||||
{ 7 * 8, 27 * 8 },
|
||||
5,
|
||||
{
|
||||
{ "10ms ", 1 },
|
||||
@ -202,7 +206,7 @@ private:
|
||||
};
|
||||
|
||||
NumberField field_timetx {
|
||||
{ 12 * 8, 15 * 16 },
|
||||
{ 7 * 8, 29 * 8 },
|
||||
3,
|
||||
{ 1, 180 },
|
||||
1,
|
||||
@ -210,15 +214,23 @@ private:
|
||||
};
|
||||
|
||||
NumberField field_timepause {
|
||||
{ 12 * 8, 16 * 16 },
|
||||
{ 8 * 8, 31 * 8 },
|
||||
2,
|
||||
{ 1, 60 },
|
||||
1,
|
||||
' ',
|
||||
};
|
||||
|
||||
NumberField field_jitter {
|
||||
{ 8 * 8, 33 * 8 },
|
||||
2,
|
||||
{ 1, 60 },
|
||||
1,
|
||||
' ',
|
||||
};
|
||||
|
||||
Button button_transmit {
|
||||
{ 18 * 8, 35 * 8, 96, 24 },
|
||||
{ 148, 212, 80, 80},
|
||||
"START"
|
||||
};
|
||||
|
||||
|
||||
@ -467,7 +467,7 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
|
||||
{ "APRS", ui::Color::green(), &bitmap_icon_aprs, [&nav](){ nav.push<APRSTXView>(); } },
|
||||
{ "BHT Xy/EP", ui::Color::green(), &bitmap_icon_bht, [&nav](){ nav.push<BHTView>(); } },
|
||||
{ "GPS Sim", ui::Color::yellow(), &bitmap_icon_gps_sim, [&nav](){ nav.push<GpsSimAppView>(); } },
|
||||
{ "Jammer", ui::Color::yellow(), &bitmap_icon_jammer, [&nav](){ nav.push<JammerView>(); } },
|
||||
{ "Jammer", ui::Color::green(), &bitmap_icon_jammer, [&nav](){ nav.push<JammerView>(); } },
|
||||
{ "Key fob", ui::Color::orange(), &bitmap_icon_keyfob, [&nav](){ nav.push<KeyfobView>(); } },
|
||||
{ "LGE tool", ui::Color::yellow(), &bitmap_icon_lge, [&nav](){ nav.push<LGEView>(); } },
|
||||
{ "Morse", ui::Color::green(), &bitmap_icon_morse, [&nav](){ nav.push<MorseView>(); } },
|
||||
|
||||
Loading…
Reference in New Issue
Block a user