Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: forgot bit reversal for POCSAG alphanumeric messages

Browse Source
This commit is contained in:
furrtek 2016-08-23 17:50:18 +02:00
parent 9418565d8b
commit 86e3b55a54
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/application/pocsag_app.cpp
View File

@ -176,6 +176,12 @@ void POCSAGAppView::on_packet(const POCSAGPacketMessage * message) {
while (ascii_idx >= 7) { while (ascii_idx >= 7) {
ascii_idx -= 7; ascii_idx -= 7;
ascii_char = (ascii_data >> ascii_idx) & 0x7F; ascii_char = (ascii_data >> ascii_idx) & 0x7F;
// Bottom's up
ascii_char = (ascii_char & 0xF0) >> 4 | (ascii_char & 0x0F) << 4; // 01234567 -> 45670123
ascii_char = (ascii_char & 0xCC) >> 2 | (ascii_char & 0x33) << 2; // 45670123 -> 67452301
ascii_char = (ascii_char & 0xAA) >> 2 | (ascii_char & 0x55); // 67452301 -> *7654321
alphanum_text += ascii_char; alphanum_text += ascii_char;
} }
ascii_data = ascii_data << 20; ascii_data = ascii_data << 20;
@ -188,10 +194,6 @@ void POCSAGAppView::on_packet(const POCSAGPacketMessage * message) {
output_text += c; output_text += c;
} }
console.writeln(output_text);
if (logger) logger->on_decoded(message->packet, output_text);
} else { } else {
// Address // Address
if (codeword == POCSAG_IDLE) { if (codeword == POCSAG_IDLE) {
@ -204,10 +206,13 @@ void POCSAGAppView::on_packet(const POCSAGPacketMessage * message) {
} }
if (eom) { if (eom) {
if (address || function) if (address || function) {
console.writeln(output_text);
if (logger) logger->on_decoded(message->packet, output_text);
console.writeln(to_string_time(message->packet.timestamp()) + " ADDR:" + to_string_hex(address, 6) + " F:" + to_string_dec_uint(function) + " "); console.writeln(to_string_time(message->packet.timestamp()) + " ADDR:" + to_string_hex(address, 6) + " F:" + to_string_dec_uint(function) + " ");
else } else {
console.writeln(to_string_time(message->packet.timestamp()) + " Tone only "); console.writeln(to_string_time(message->packet.timestamp()) + " Tone only ");
}
ascii_idx = 0; ascii_idx = 0;
ascii_data = 0; ascii_data = 0;

BIN
firmware/portapack-h1-havoc.bin
View File

Binary file not shown.