mirror of
https://github.com/portapack-mayhem/mayhem-firmware.git
synced 2025-08-23 09:57:33 +00:00
Udpdated jammer baseband code, should work again
This commit is contained in:
@@ -27,27 +27,29 @@
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#define POLY_MASK_32 0xB4BCD35C
|
||||
|
||||
void JammerProcessor::execute(const buffer_c8_t& buffer) {
|
||||
|
||||
if (!configured) return;
|
||||
|
||||
for (size_t i = 0; i<buffer.count; i++) {
|
||||
for (size_t i = 0; i < buffer.count; i++) {
|
||||
|
||||
if (s >= 10000) { //shared_memory.jammer_ranges[ir].duration
|
||||
s = 0;
|
||||
for (;;) {
|
||||
ir++;
|
||||
if (ir > 15) ir = 0;
|
||||
if (jammer_ranges[ir].enabled == true) break;
|
||||
if (!jammer_duration) {
|
||||
// Find next enabled range
|
||||
for (ir = 0; ir < 9; ir++) {
|
||||
current_range++;
|
||||
if (current_range == 9) current_range = 0;
|
||||
if (jammer_ranges[current_range].enabled)
|
||||
break;
|
||||
}
|
||||
jammer_bw = jammer_ranges[ir].width / 2;
|
||||
|
||||
message.freq = jammer_ranges[ir].center;
|
||||
jammer_duration = jammer_ranges[current_range].duration;
|
||||
jammer_bw = jammer_ranges[current_range].width / 6; // TODO: Exact value
|
||||
|
||||
// Ask for retune
|
||||
message.freq = jammer_ranges[current_range].center;
|
||||
message.range = current_range;
|
||||
shared_memory.application_queue.push(message);
|
||||
} else {
|
||||
s++;
|
||||
jammer_duration--;
|
||||
}
|
||||
|
||||
// Ramp
|
||||
@@ -61,7 +63,7 @@ void JammerProcessor::execute(const buffer_c8_t& buffer) {
|
||||
r++;
|
||||
}*/
|
||||
|
||||
// Phase
|
||||
// Phase noise
|
||||
if (r >= 70) {
|
||||
aphase += ((aphase>>4) ^ 0x4573) << 14;
|
||||
r = 0;
|
||||
@@ -70,69 +72,32 @@ void JammerProcessor::execute(const buffer_c8_t& buffer) {
|
||||
}
|
||||
|
||||
aphase += 8830;
|
||||
sample = sine_table_i8[(sphase & 0x03FC0000) >> 18];
|
||||
sample = sine_table_i8[(aphase & 0x03FC0000) >> 18];
|
||||
|
||||
// FM
|
||||
delta = sample * jammer_bw;
|
||||
|
||||
phase = (phase + delta);
|
||||
phase += delta;
|
||||
sphase = phase + (64 << 18);
|
||||
|
||||
re = (sine_table_i8[(sphase & 0x03FC0000) >> 18]);
|
||||
im = (sine_table_i8[(phase & 0x03FC0000) >> 18]);
|
||||
|
||||
|
||||
buffer.p[i] = {(int8_t)re, (int8_t)im};
|
||||
//buffer.p[i] = {re, im};
|
||||
}
|
||||
};
|
||||
|
||||
void JammerProcessor::on_message(const Message* const msg) {
|
||||
const auto message = *reinterpret_cast<const JammerConfigureMessage*>(msg);
|
||||
|
||||
jammer_ranges = (JammerRange*)shared_memory.bb_data.data;
|
||||
|
||||
/*const auto message = *reinterpret_cast<const DTMFTXConfigMessage*>(msg);
|
||||
|
||||
if (message.id == Message::ID::DTMFTXConfig) {
|
||||
if (message.id == Message::ID::JammerConfigure) {
|
||||
jammer_ranges = (JammerRange*)shared_memory.bb_data.data;
|
||||
jammer_duration = 0;
|
||||
current_range = -1;
|
||||
|
||||
// Translate DTMF message to index in DTMF frequencies table
|
||||
tone_ptr = &shared_memory.tx_data[0];
|
||||
for (;;) {
|
||||
tone_code = *tone_ptr;
|
||||
if (tone_code == 0xFF)
|
||||
break; // End of message
|
||||
else if (tone_code <= 9)
|
||||
// That's already fine bro.
|
||||
*tone_ptr = tone_code;
|
||||
else if (tone_code == 'A')
|
||||
*tone_ptr = 10;
|
||||
else if (tone_code == 'B')
|
||||
*tone_ptr = 11;
|
||||
else if (tone_code == 'C')
|
||||
*tone_ptr = 12;
|
||||
else if (tone_code == 'D')
|
||||
*tone_ptr = 13;
|
||||
else if (tone_code == '#')
|
||||
*tone_ptr = 14;
|
||||
else if (tone_code == '*')
|
||||
*tone_ptr = 15;
|
||||
else {
|
||||
*tone_ptr = 0xFF; // Invalid character, stop here
|
||||
}
|
||||
tone_ptr++;
|
||||
}
|
||||
|
||||
// 1<<18 = 262144
|
||||
// m = (262144 * a) / 1536000
|
||||
// a = 262144 / 1536000 (*1000 = 171)
|
||||
bw = 171 * (message.bw);
|
||||
tone_length = message.tone_length * 154; // 153.6
|
||||
pause_length = message.pause_length * 154; // 153.6
|
||||
as = 0;
|
||||
tone = false;
|
||||
timer = 0;
|
||||
tone_idx = 0;
|
||||
|
||||
configured = true;
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
int main() {
|
||||
|
@@ -38,18 +38,17 @@ private:
|
||||
|
||||
BasebandThread baseband_thread { 1536000, this, NORMALPRIO + 20, baseband::Direction::Transmit };
|
||||
|
||||
JammerRange * jammer_ranges;
|
||||
JammerRange * jammer_ranges { };
|
||||
|
||||
int32_t lfsr32 = 0xABCDE;
|
||||
uint32_t s;
|
||||
int8_t r, ir, re, im;
|
||||
int64_t jammer_bw, jammer_center;
|
||||
int feedback;
|
||||
int32_t lfsr;
|
||||
uint32_t sample_count;
|
||||
uint32_t aphase, phase, sphase;
|
||||
int32_t sample, delta;
|
||||
RetuneMessage message;
|
||||
uint32_t jammer_duration { 0 };
|
||||
int8_t r { 0 }, ir { 0 };
|
||||
int32_t current_range { 0 };
|
||||
int64_t jammer_center { 0 };
|
||||
uint32_t sample_count { 0 };
|
||||
uint32_t aphase { 0 }, phase { 0 }, delta { 0 }, sphase { 0 };
|
||||
int32_t sample { 0 }, jammer_bw { 0 };
|
||||
int8_t re, im;
|
||||
RetuneMessage message { };
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -28,12 +28,13 @@
|
||||
#include <cstdint>
|
||||
|
||||
void OOKProcessor::execute(const buffer_c8_t& buffer) {
|
||||
int8_t re, im;
|
||||
|
||||
// This is called at 2.28M/2048 = 1113Hz
|
||||
|
||||
if (!configured) return;
|
||||
|
||||
for (size_t i = 0; i<buffer.count; i++) {
|
||||
for (size_t i = 0; i < buffer.count; i++) {
|
||||
|
||||
// Synthesis at 2.28M/10 = 228kHz
|
||||
if (!s) {
|
||||
@@ -89,7 +90,7 @@ void OOKProcessor::execute(const buffer_c8_t& buffer) {
|
||||
im = 0;
|
||||
}
|
||||
|
||||
buffer.p[i] = {(int8_t)re, (int8_t)im};
|
||||
buffer.p[i] = {re, im};
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -37,22 +37,21 @@ private:
|
||||
|
||||
BasebandThread baseband_thread { 2280000, this, NORMALPRIO + 20, baseband::Direction::Transmit };
|
||||
|
||||
uint32_t samples_per_bit;
|
||||
uint8_t repeat;
|
||||
uint32_t length;
|
||||
uint32_t pause;
|
||||
uint32_t samples_per_bit { 0 };
|
||||
uint8_t repeat { 0 };
|
||||
uint32_t length { 0 };
|
||||
uint32_t pause { 0 };
|
||||
|
||||
uint32_t pause_counter = 0;
|
||||
uint8_t repeat_counter = 0;
|
||||
int8_t re, im;
|
||||
uint8_t s = 0;
|
||||
uint16_t bit_pos = 0;
|
||||
uint8_t cur_bit = 0;
|
||||
uint32_t sample_count;
|
||||
uint32_t tone_phase, phase, sphase;
|
||||
int32_t tone_sample, sig, frq;
|
||||
uint32_t pause_counter { 0 };
|
||||
uint8_t repeat_counter { 0 };
|
||||
uint8_t s { 0 };
|
||||
uint16_t bit_pos { 0 };
|
||||
uint8_t cur_bit { 0 };
|
||||
uint32_t sample_count { 0 };
|
||||
uint32_t tone_phase { 0 }, phase { 0 }, sphase { 0 };
|
||||
int32_t tone_sample { 0 }, sig { 0 }, frq { 0 };
|
||||
|
||||
TXDoneMessage txdone_message;
|
||||
TXDoneMessage txdone_message { };
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user