TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-23 08:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Jammer bugfix: now produces all the right channels

Browse Source
This commit is contained in:
furrtek
2017-01-17 14:27:37 +00:00
parent 7cb38f858e
commit f0fbc356ad
16 changed files with 120 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
firmware/baseband/proc_jammer.cpp
View File

@@ -34,18 +34,16 @@ void JammerProcessor::execute(const buffer_c8_t& buffer) {
if (!jammer_duration) {
// Find next enabled range
for (ir = 0; ir < 9; ir++) {
do {
current_range++;
if (current_range == 9) current_range = 0;
if (jammer_ranges[current_range].enabled)
break;
}
} while (!jammer_channels[current_range].enabled);
jammer_duration = jammer_ranges[current_range].duration;
jammer_bw = jammer_ranges[current_range].width / 6; // TODO: Exact value
jammer_duration = jammer_channels[current_range].duration;
jammer_bw = jammer_channels[current_range].width / 5; // TODO: Exact value
// Ask for retune
message.freq = jammer_ranges[current_range].center;
message.freq = jammer_channels[current_range].center;
message.range = current_range;
shared_memory.application_queue.push(message);
} else {
@@ -64,7 +62,7 @@ void JammerProcessor::execute(const buffer_c8_t& buffer) {
}*/
// Phase noise
if (r >= 70) {
if (r >= 10) {
aphase += ((aphase>>4) ^ 0x4573) << 14;
r = 0;
} else {
@@ -84,7 +82,6 @@ void JammerProcessor::execute(const buffer_c8_t& buffer) {
im = (sine_table_i8[(phase & 0x03FC0000) >> 18]);
buffer.p[i] = {(int8_t)re, (int8_t)im};
//buffer.p[i] = {re, im};
}
};
@@ -92,11 +89,15 @@ void JammerProcessor::on_message(const Message* const msg) {
const auto message = *reinterpret_cast<const JammerConfigureMessage*>(msg);
if (message.id == Message::ID::JammerConfigure) {
jammer_ranges = (JammerRange*)shared_memory.bb_data.data;
jammer_duration = 0;
current_range = -1;
configured = true;
if (message.run) {
jammer_channels = (JammerChannel*)shared_memory.bb_data.data;
jammer_duration = 0;
current_range = 0;
configured = true;
} else {
configured = false;
}
}
}

4
firmware/baseband/proc_jammer.hpp
View File

@@ -38,11 +38,11 @@ private:
BasebandThread baseband_thread { 1536000, this, NORMALPRIO + 20, baseband::Direction::Transmit };
JammerRange * jammer_ranges { };
JammerChannel * jammer_channels { };
uint32_t jammer_duration { 0 };
int8_t r { 0 }, ir { 0 };
int32_t current_range { 0 };
uint32_t current_range { 0 };
int64_t jammer_center { 0 };
uint32_t sample_count { 0 };
uint32_t aphase { 0 }, phase { 0 }, delta { 0 }, sphase { 0 };