TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-12-05 19:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Udpdated jammer baseband code, should work again

Browse Source
This commit is contained in:
furrtek
2017-01-17 08:42:35 +00:00
parent 368f0f7fb0
commit 7cb38f858e
12 changed files with 172 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/application/baseband_api.cpp
View File

@@ -155,6 +155,13 @@ void set_adsb() {
send_message(&message);
}
void set_jammer() {
const JammerConfigureMessage message {
1
};
send_message(&message);
}
void set_rds_data(const uint16_t message_length) {
const RDSConfigureMessage message {
message_length

1
firmware/application/baseband_api.hpp
View File

@@ -65,6 +65,7 @@ void set_ook_data(const uint32_t stream_length, const uint32_t samples_per_bit,
const uint32_t pause_symbols);
void set_pocsag(const pocsag::BitRate bitrate);
void set_adsb();
void set_jammer();
void set_rds_data(const uint16_t message_length);
//void set_dtmf_data(const uint32_t bw, const uint32_t tone_length, const uint32_t pause_length);

7
firmware/application/main.cpp
View File

@@ -23,7 +23,12 @@
// Color bitmaps generated with:
// Gimp image > indexed colors (16), then "xxd -i *.bmp"
//BUG: Bad console scroll init
//BUG: (fixed ?) Bad console scroll init
//BUG: POCSAG misses alphanum messages, cuts them off sometimes
//BUG: Jammer channels are wrong (not enough) when using multiple ranges
//TODO: Array for checkboxes and texts, options_preset "CUSTOM" on manual freq. entry, in jammer
//TODO: Digital mode for Waveform widget
//TEST: Imperial in whipcalc
//TEST: Numbers

39
firmware/application/ui_encoders.cpp
View File

@@ -239,45 +239,6 @@ void EncodersView::on_type_change(size_t index) {
format_string += ' ';
text_format.set(format_string);
/*word_format = encoder_def->word_format;
size_t address_start = word_format.find_first_of("A");
size_t data_start = word_format.find_first_of("D");
size_t format_length = word_format.length();
if (address_start == std::string::npos) address_start = format_length;
if (data_start == std::string::npos) data_start = format_length;
// Never did anything so dirty :(
if (!address_start) {
address_length = data_start;
data_length = format_length - address_length;
} else {
data_length = address_start;
address_length = format_length - data_length;
}
if (address_length) {
text_format_a.hidden(false);
text_format_a.set_parent_rect(
{ (2 + address_start) * 8, 12 * 8, address_length * 8, 16 }
);
text_format_a.set_style(&style_address);
text_format_a.set(std::string(address_length, 'A'));
} else {
text_format_a.hidden(true);
}
if (data_length) {
text_format_d.hidden(false);
text_format_d.set_parent_rect(
{ (2 + data_start) * 8, 12 * 8, data_length * 8, 16 }
);
text_format_d.set_style(&style_data);
text_format_d.set(std::string(data_length, 'D'));
} else {
text_format_d.hidden(true);
}*/
generate_frame();
}

137
firmware/application/ui_jammer.cpp
View File

@@ -90,9 +90,11 @@ void JammerView::update_text(uint8_t id, rf::Frequency f) {
}
}
void JammerView::on_retune(const rf::Frequency freq) {
if (freq > 0)
void JammerView::on_retune(const rf::Frequency freq, const uint32_t range) {
if (freq) {
transmitter_model.set_tuning_frequency(freq);
text_range_number.set(to_string_dec_uint(range, 2, ' '));
}
}
JammerView::JammerView(NavigationView& nav) {
@@ -102,14 +104,14 @@ JammerView::JammerView(NavigationView& nav) {
static constexpr Style style_val {
.font = font::fixed_8x16,
.background = Color::green(),
.foreground = Color::black(),
.background = Color::black(),
.foreground = Color::green(),
};
static constexpr Style style_cancel {
.font = font::fixed_8x16,
.background = Color::red(),
.foreground = Color::black(),
.background = Color::black(),
.foreground = Color::red(),
};
static constexpr Style style_info {
@@ -122,6 +124,7 @@ JammerView::JammerView(NavigationView& nav) {
add_children({
&text_type,
&text_range_number,
&options_modulation,
&text_sweep,
&options_sweep,
@@ -189,78 +192,86 @@ JammerView::JammerView(NavigationView& nav) {
button_transmit.on_select = [this, &nav, jammer_ranges](Button&) {
uint8_t c, i = 0;
size_t num_ranges;
rf::Frequency start_freq, range_bw, ch_width;
rf::Frequency start_freq, range_bw, range_bw_sub, ch_width;
bool out_of_ranges = false;
// Disable all ranges by default
for (i = 0; i < 9; i++)
jammer_ranges[i].enabled = false;
for (c = 0; c < 9; c++)
jammer_ranges[c].enabled = false;
// Generate jamming "channels", maximum: 9
// Convert ranges min/max to center/bw
for (c = 0; c < 3; c++) {
range_bw = abs(frequency_range[c].max - frequency_range[c].min); // Total bw for range
if (frequency_range[c].min < frequency_range[c].max)
start_freq = frequency_range[c].min;
else
start_freq = frequency_range[c].max;
if (range_bw > 500000) {
// Example: 600kHz
// int(600000 / 500000) = 2
// CH-BW = 600000 / 2 = 300000
// Center-A = min + CH-BW / 2 = 150000
// BW-A = CH-BW = 300000
// Center-B = min + CH-BW + Center-A = 450000
// BW-B = CH-BW = 300000
num_ranges = 0;
while (range_bw > 500000) {
range_bw -= 500000;
num_ranges++;
}
ch_width = range_bw / num_ranges;
for (c = 0; c < num_ranges; c++) {
if (range_bw) {
// Sort
if (frequency_range[c].min < frequency_range[c].max)
start_freq = frequency_range[c].min;
else
start_freq = frequency_range[c].max;
if (range_bw > 500000) {
// Example: 600kHz
// int(600000 / 500000) = 2
// CH-BW = 600000 / 2 = 300000
// Center-A = min + CH-BW / 2 = 150000
// BW-A = CH-BW = 300000
// Center-B = min + CH-BW + Center-A = 450000
// BW-B = CH-BW = 300000
num_ranges = 0;
range_bw_sub = range_bw;
do {
range_bw_sub -= 500000;
num_ranges++;
} while (range_bw_sub > 500000);
ch_width = range_bw / num_ranges;
for (c = 0; c < num_ranges; c++) {
if (i >= 9) {
out_of_ranges = true;
break;
}
jammer_ranges[i].enabled = true;
jammer_ranges[i].width = ch_width;
jammer_ranges[i].center = start_freq + (ch_width / 2) + (ch_width * c);
jammer_ranges[i].duration = 15360 * options_hop.selected_index_value();
i++;
}
} else {
if (i >= 9) {
out_of_ranges = true;
break;
} else {
jammer_ranges[i].enabled = true;
jammer_ranges[i].width = range_bw;
jammer_ranges[i].center = start_freq + (range_bw / 2);
jammer_ranges[i].duration = 15360 * options_hop.selected_index_value();
i++;
}
jammer_ranges[i].enabled = true;
jammer_ranges[i].width = ch_width;
jammer_ranges[i].center = start_freq + (ch_width / 2) + (ch_width * c);
jammer_ranges[i].duration = 2280000 / 10; // ?
i++;
}
} else {
if (i >= 9) {
out_of_ranges = true;
} else {
jammer_ranges[i].enabled = true;
jammer_ranges[i].width = range_bw;
jammer_ranges[i].center = start_freq + (range_bw / 2);
jammer_ranges[i].duration = 2280000 / 10; // ?
i++;
}
}
if (!out_of_ranges) {
if (jamming == true) {
jamming = false;
button_transmit.set_style(&style_val);
button_transmit.set_text("START");
radio::disable();
} else {
jamming = true;
button_transmit.set_style(&style_cancel);
button_transmit.set_text("STOP");
//transmitter_model.set_tuning_frequency(433920000); // TODO
transmitter_model.set_sampling_rate(1536000U);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();
}
}
if (!out_of_ranges) {
if (jamming == true) {
jamming = false;
button_transmit.set_style(&style_val);
button_transmit.set_text("START");
radio::disable();
} else {
nav.display_modal("Error", "Jamming bandwidth too large.");
jamming = true;
button_transmit.set_style(&style_cancel);
button_transmit.set_text("STOP");
transmitter_model.set_sampling_rate(1536000U);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();
baseband::set_jammer();
}
} else {
nav.display_modal("Error", "Jamming bandwidth too large.");
}
};

28
firmware/application/ui_jammer.hpp
View File

@@ -49,7 +49,7 @@ private:
freq_range_t frequency_range[3];
void update_text(uint8_t id, rf::Frequency f);
void on_retune(const rf::Frequency freq);
void on_retune(const rf::Frequency freq, const uint32_t range);
// TODO: TDD UMTS, voir doc Arcep
// TODO: BT: 2 400 et 2 483,5 MHz
@@ -100,8 +100,8 @@ private:
{ false, 0, 0 }},
// GPS L1 & L2
{{ true, 1575420000 - 50000, 1575420000 + 50000}, // BW: 100kHz
{ true, 1227600000 - 50000, 1227600000 + 50000 }, // BW: 100kHz
{{ true, 1575420000 - 1000000, 1575420000 + 1000000}, // BW: 2MHz
{ true, 1227600000 - 1000000, 1227600000 + 1000000 }, // BW: 2MHz
{ false, 0, 0 }},
// WLAN 2.4G CH1
@@ -177,6 +177,11 @@ private:
}
};
Text text_range_number {
{ 14 * 8, 1 * 16, 2 * 8, 16 },
"--"
};
Text text_sweep {
{ 1 * 8, 2 * 16, 6 * 8, 16 },
"Sweep:"
@@ -202,14 +207,13 @@ private:
};
OptionsField options_hop {
{ 12 * 8, 4 * 16 },
6,
5,
{
{ " 10s", 0 },
{ " 5s", 1 },
{ " 1s", 2 },
{ " 0.1s", 3 },
{ " 10ms", 4 },
{ " 1ms", 5 }
{ " 10ms", 1 },
{ "100ms", 10 },
{ " 1s", 100 },
{ " 5s", 500 },
{ " 10s", 1000 }
}
};
@@ -263,7 +267,7 @@ private:
"Range 3"
};
std::array<Button, 6> buttons_freq;
std::array<Button, 6> buttons_freq { };
Text text_info1 {
{ 3 * 8, 8 * 16 - 4 + 2, 25 * 8, 16 },
@@ -294,7 +298,7 @@ private:
Message::ID::Retune,
[this](Message* const p) {
const auto message = static_cast<const RetuneMessage*>(p);
this->on_retune(message->freq);
this->on_retune(message->freq, message->range);
}
};
};