TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-12-03 07:41:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup, random mode in DTMF TX

Browse Source
This commit is contained in:
furrtek
2016-09-23 20:17:29 +02:00
parent bb29efeda6
commit 55ba0b5e06
6 changed files with 106 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
firmware/baseband/proc_dtmf_tx.cpp
View File

@@ -28,9 +28,6 @@
#include <cstdint>
// 153600 = 1000ms
//
void DTMFTXProcessor::execute(const buffer_c8_t& buffer){
// This is called at 1536000/2048 = 750Hz
@@ -38,7 +35,6 @@ void DTMFTXProcessor::execute(const buffer_c8_t& buffer){
if (!configured) return;
//ai = 0;
for (size_t i = 0; i<buffer.count; i++) {
if (!as) {
@@ -47,33 +43,21 @@ void DTMFTXProcessor::execute(const buffer_c8_t& buffer){
if (!timer) {
if (tone) {
tone = false;
timer = pause_length * 154; // 153.6
timer = pause_length;
} else {
tone = true;
timer = tone_length * 154; // 153.6
tone_code = shared_memory.tx_data[tone_idx]; //tone_list[tone_idx];
timer = tone_length;
tone_code = shared_memory.tx_data[tone_idx];
if (tone_code == 0xFF) {
txdone_message.n = 64; // End of list
txdone_message.n = 0xFF; // End of list
shared_memory.application_queue.push(txdone_message);
configured = false;
tone = false;
} else {
txdone_message.n = tone_idx; // New tone
txdone_message.n = tone_idx; // New tone (progress)
shared_memory.application_queue.push(txdone_message);
if (tone_code == 'A')
tone_code = 10;
else if (tone_code == 'B')
tone_code = 11;
else if (tone_code == 'C')
tone_code = 12;
else if (tone_code == 'D')
tone_code = 13;
else if (tone_code == '#')
tone_code = 14;
else if (tone_code == '*')
tone_code = 15;
tone_idx++;
}
}
@@ -109,18 +93,45 @@ void DTMFTXProcessor::execute(const buffer_c8_t& buffer){
}
void DTMFTXProcessor::on_message(const Message* const msg) {
char * tone_ptr;
const auto message = *reinterpret_cast<const DTMFTXConfigMessage*>(msg);
if (message.id == Message::ID::DTMFTXConfig) {
// 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;
pause_length = message.pause_length;
tone_length = message.tone_length * 154; // 153.6
pause_length = message.pause_length * 154; // 153.6
as = 0;
//memcpy(tone_list, shared_memory.tx_data, 32);
//tone_list[31] = 0;
tone = false;
timer = 0;
tone_idx = 0;

45
firmware/baseband/proc_dtmf_tx.hpp
View File

@@ -26,7 +26,15 @@
#include "baseband_processor.hpp"
#include "baseband_thread.hpp"
#define DTMF_PHASEINC (436.91) // (65536*1024)/1536000*10
#define DTMF_PHASEINC 436.91 // (65536*1024)/1536000*10
#define DTMF_C0 (uint32_t)(1209*DTMF_PHASEINC)
#define DTMF_C1 (uint32_t)(1336*DTMF_PHASEINC)
#define DTMF_C2 (uint32_t)(1477*DTMF_PHASEINC)
#define DTMF_C3 (uint32_t)(1633*DTMF_PHASEINC)
#define DTMF_R0 (uint32_t)(697*DTMF_PHASEINC)
#define DTMF_R1 (uint32_t)(770*DTMF_PHASEINC)
#define DTMF_R2 (uint32_t)(852*DTMF_PHASEINC)
#define DTMF_R3 (uint32_t)(941*DTMF_PHASEINC)
class DTMFTXProcessor : public BasebandProcessor {
public:
@@ -41,32 +49,31 @@ private:
// 0123456789ABCD#*
const uint32_t DTMF_LUT[16][2] = {
{ (uint32_t)(1336*DTMF_PHASEINC), (uint32_t)(941*DTMF_PHASEINC) },
{ (uint32_t)(1209*DTMF_PHASEINC), (uint32_t)(697*DTMF_PHASEINC) },
{ (uint32_t)(1336*DTMF_PHASEINC), (uint32_t)(697*DTMF_PHASEINC) },
{ (uint32_t)(1477*DTMF_PHASEINC), (uint32_t)(697*DTMF_PHASEINC) },
{ (uint32_t)(1209*DTMF_PHASEINC), (uint32_t)(770*DTMF_PHASEINC) },
{ (uint32_t)(1336*DTMF_PHASEINC), (uint32_t)(770*DTMF_PHASEINC) },
{ (uint32_t)(1477*DTMF_PHASEINC), (uint32_t)(770*DTMF_PHASEINC) },
{ (uint32_t)(1209*DTMF_PHASEINC), (uint32_t)(852*DTMF_PHASEINC) },
{ (uint32_t)(1336*DTMF_PHASEINC), (uint32_t)(852*DTMF_PHASEINC) },
{ (uint32_t)(1477*DTMF_PHASEINC), (uint32_t)(852*DTMF_PHASEINC) },
{ (uint32_t)(1633*DTMF_PHASEINC), (uint32_t)(697*DTMF_PHASEINC) },
{ (uint32_t)(1633*DTMF_PHASEINC), (uint32_t)(770*DTMF_PHASEINC) },
{ (uint32_t)(1633*DTMF_PHASEINC), (uint32_t)(852*DTMF_PHASEINC) },
{ (uint32_t)(1633*DTMF_PHASEINC), (uint32_t)(941*DTMF_PHASEINC) },
{ (uint32_t)(1477*DTMF_PHASEINC), (uint32_t)(941*DTMF_PHASEINC) },
{ (uint32_t)(1209*DTMF_PHASEINC), (uint32_t)(941*DTMF_PHASEINC) }
{ DTMF_C1, DTMF_R3 },
{ DTMF_C0, DTMF_R0 },
{ DTMF_C1, DTMF_R0 },
{ DTMF_C2, DTMF_R0 },
{ DTMF_C0, DTMF_R1 },
{ DTMF_C1, DTMF_R1 },
{ DTMF_C2, DTMF_R1 },
{ DTMF_C0, DTMF_R2 },
{ DTMF_C1, DTMF_R2 },
{ DTMF_C2, DTMF_R2 },
{ DTMF_C3, DTMF_R0 },
{ DTMF_C3, DTMF_R1 },
{ DTMF_C3, DTMF_R2 },
{ DTMF_C3, DTMF_R3 },
{ DTMF_C2, DTMF_R3 },
{ DTMF_C0, DTMF_R3 }
};
uint32_t tone_length, pause_length;
uint32_t as, bw;
uint8_t tone_list[32];
uint8_t tone_idx = 0, tone_code = 0;
uint32_t timer = 0;
bool tone = false;
bool tone = false; // Tone / pause
int8_t re, im;
int8_t sample;