Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-09-18 12:05:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Yet another POCSAG bugfix (multi-batch messages are not cut anymore)

Browse source 
Added BCH ECC functions for checking, error correction and encoding
This commit is contained in:
furrtek 2017-02-06 20:32:33 +00:00
parent 98f89a84bb
commit 24abe4b427
9 changed files with 627 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

7
firmware/application/CMakeLists.txt
View file

@ -135,14 +135,15 @@ set(CPPSRC
debounce.cpp
touch.cpp
touch_adc.cpp
encoder.cpp
audio.cpp
adsb.cpp
afsk.cpp
audio.cpp
${COMMON}/bch_code.cpp
bht.cpp
ctcss.cpp
rds.cpp
encoder.cpp
freqman.cpp
rds.cpp
${COMMON}/lcd_ili9341.cpp
${COMMON}/ui.cpp
${COMMON}/ui_text.cpp

30
firmware/application/Makefile
View file

@ -2030,6 +2030,33 @@ __/common/ais_packet.cpp.s:
cd /home/furrtek/portapack-hackrf && $(MAKE) -f firmware/application/CMakeFiles/application.elf.dir/build.make firmware/application/CMakeFiles/application.elf.dir/__/common/ais_packet.cpp.s
.PHONY : __/common/ais_packet.cpp.s
__/common/bch_code.obj: __/common/bch_code.cpp.obj
.PHONY : __/common/bch_code.obj
# target to build an object file
__/common/bch_code.cpp.obj:
cd /home/furrtek/portapack-hackrf && $(MAKE) -f firmware/application/CMakeFiles/application.elf.dir/build.make firmware/application/CMakeFiles/application.elf.dir/__/common/bch_code.cpp.obj
.PHONY : __/common/bch_code.cpp.obj
__/common/bch_code.i: __/common/bch_code.cpp.i
.PHONY : __/common/bch_code.i
# target to preprocess a source file
__/common/bch_code.cpp.i:
cd /home/furrtek/portapack-hackrf && $(MAKE) -f firmware/application/CMakeFiles/application.elf.dir/build.make firmware/application/CMakeFiles/application.elf.dir/__/common/bch_code.cpp.i
.PHONY : __/common/bch_code.cpp.i
__/common/bch_code.s: __/common/bch_code.cpp.s
.PHONY : __/common/bch_code.s
# target to generate assembly for a file
__/common/bch_code.cpp.s:
cd /home/furrtek/portapack-hackrf && $(MAKE) -f firmware/application/CMakeFiles/application.elf.dir/build.make firmware/application/CMakeFiles/application.elf.dir/__/common/bch_code.cpp.s
.PHONY : __/common/bch_code.cpp.s
__/common/buffer.obj: __/common/buffer.cpp.obj
.PHONY : __/common/buffer.obj
@ -5544,6 +5571,9 @@ help:
@echo "... __/common/ais_packet.obj"
@echo "... __/common/ais_packet.i"
@echo "... __/common/ais_packet.s"
@echo "... __/common/bch_code.obj"
@echo "... __/common/bch_code.i"
@echo "... __/common/bch_code.s"
@echo "... __/common/buffer.obj"
@echo "... __/common/buffer.i"
@echo "... __/common/buffer.s"

71
firmware/application/pocsag_app.cpp
View file

@ -36,7 +36,7 @@ using namespace pocsag;
#include "utility.hpp"
void POCSAGLogger::on_packet(const pocsag::POCSAGPacket& packet, const uint32_t frequency) {
std::string entry = pocsag::bitrate_str(packet.bitrate()) + " " + to_string_dec_uint(frequency) + "Hz ";
std::string entry = to_string_dec_uint(frequency) + "Hz " + pocsag::bitrate_str(packet.bitrate()) + " RAW: ";
// Raw hex dump of all the codewords
for (size_t c = 0; c < 16; c++)
@ -47,20 +47,15 @@ void POCSAGLogger::on_packet(const pocsag::POCSAGPacket& packet, const uint32_t
void POCSAGLogger::on_decoded(
const pocsag::POCSAGPacket& packet,
const std::string info,
const std::string text) {
// Decoded address and message
log_file.write_entry(packet.timestamp(), info);
log_file.write_entry(packet.timestamp(), text);
}
namespace ui {
void POCSAGAppView::update_freq(rf::Frequency f) {
char finalstr[10] = { 0 };
options_freq.set_selected_index(0);
options_freq.set_selected_index(0); // "Entered"
set_target_frequency(f);
portapack::persistent_memory::set_tuned_frequency(f); // Maybe not ?
@ -68,14 +63,11 @@ void POCSAGAppView::update_freq(rf::Frequency f) {
auto mhz = to_string_dec_int(f / 1000000, 4);
auto hz100 = to_string_dec_int((f / 100) % 10000, 4, '0');
strcat(finalstr, mhz.c_str());
strcat(finalstr, ".");
strcat(finalstr, hz100.c_str());
this->button_setfreq.set_text(finalstr);
this->button_setfreq.set_text(mhz + "." + hz100);
}
POCSAGAppView::POCSAGAppView(NavigationView& nav) {
baseband::run_image(portapack::spi_flash::image_tag_pocsag);
add_children({
@ -91,15 +83,19 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav) {
&console
});
receiver_model.set_sampling_rate(3072000);
receiver_model.set_baseband_bandwidth(1750000);
receiver_model.enable();
check_log.set_value(logging);
check_log.on_select = [this](Checkbox&, bool v) {
logging = v;
};
options_bitrate.set_selected_index(1); // 1200bps
options_bitrate.on_change = [this](size_t, OptionsField::value_t v) {
this->on_bitrate_changed(v);
};
options_bitrate.set_selected_index(1); // 1200bps
options_freq.on_change = [this](size_t, OptionsField::value_t v) {
this->on_band_changed(v);
@ -116,19 +112,13 @@ POCSAGAppView::POCSAGAppView(NavigationView& nav) {
logger = std::make_unique<POCSAGLogger>();
if (logger) logger->append("pocsag.txt");
receiver_model.set_sampling_rate(3072000);
receiver_model.set_baseband_bandwidth(1750000);
receiver_model.enable();
const auto new_volume = volume_t::decibel(60 - 99) + audio::headphone::volume_range().max;
/*const auto new_volume = volume_t::decibel(60 - 99) + audio::headphone::volume_range().max;
receiver_model.set_headphone_volume(new_volume);
audio::output::start();
baseband::set_pocsag(pocsag::BitRate::FSK1200);
audio::output::start();*/
}
POCSAGAppView::~POCSAGAppView() {
audio::output::stop();
//audio::output::stop();
receiver_model.disable();
baseband::shutdown();
}
@ -145,8 +135,9 @@ void POCSAGAppView::set_parent_rect(const Rect new_parent_rect) {
void POCSAGAppView::on_packet(const POCSAGPacketMessage * message) {
std::string alphanum_text = "";
// Log raw data
if (logger && logging) logger->on_packet(message->packet, target_frequency());
// Log raw data whatever it contains
if (logger && logging)
logger->on_packet(message->packet, target_frequency());
if (message->packet.flag() != NORMAL) {
console.writeln(
@ -155,45 +146,47 @@ void POCSAGAppView::on_packet(const POCSAGPacketMessage * message) {
);
}
bool result = decode_batch(message->packet, &pocsag_state);
bool result = pocsag_decode_batch(message->packet, &pocsag_state);
if (result) {
std::string console_info;
console_info = to_string_time(message->packet.timestamp()) + " ";
console_info += pocsag::bitrate_str(message->packet.bitrate());
console_info += " ADDR:" + to_string_dec_uint(pocsag_state.address);
console_info += " F" + to_string_dec_uint(pocsag_state.function);
if (pocsag_state.out_type == ADDRESS) {
// Address only
console_info = to_string_time(message->packet.timestamp()) + " ";
console_info += pocsag::bitrate_str(message->packet.bitrate()) + " ";
console_info += "ADDR:" + to_string_dec_uint(pocsag_state.address);
console_info += " F" + to_string_dec_uint(pocsag_state.function);
console.writeln(console_info);
if (logger) logger->on_decoded(message->packet, console_info, pocsag_state.output);
if (logger && logging)
logger->on_decoded(message->packet, console_info);
last_address = pocsag_state.address;
} else if (pocsag_state.out_type == MESSAGE) {
if (pocsag_state.address != last_address) {
// New message
console_info = to_string_time(message->packet.timestamp()) + " ";
console_info += pocsag::bitrate_str( message->packet.bitrate()) + " ";
console_info += "ADDR:" + to_string_dec_uint(pocsag_state.address);
console_info += " F" + to_string_dec_uint(pocsag_state.function);
console.writeln(console_info);
console.writeln("Alpha:" + pocsag_state.output);
if (logger) logger->on_decoded(message->packet, console_info, pocsag_state.output);
if (logger && logging) {
logger->on_decoded(message->packet, console_info);
logger->on_decoded(message->packet, pocsag_state.output);
}
last_address = pocsag_state.address;
} else {
// Message continues...
console.writeln(pocsag_state.output);
if (logger && logging)
logger->on_decoded(message->packet, pocsag_state.output);
}
} else if (pocsag_state.out_type == EMPTY)
console.writeln("-");
console.write(pocsag_state.output);
}
}
}

12
firmware/application/pocsag_app.hpp
View file

@ -27,12 +27,13 @@
#include "ui_navigation.hpp"
#include "ui_receiver.hpp"
#include "ui_rssi.hpp"
#include "ui_channel.hpp"
//#include "ui_channel.hpp"
#include "event_m0.hpp"
#include "log_file.hpp"
#include "bch_code.hpp"
#include "pocsag.hpp"
#include "pocsag_packet.hpp"
@ -43,7 +44,7 @@ public:
}
void on_packet(const pocsag::POCSAGPacket& packet, const uint32_t frequency);
void on_decoded(const pocsag::POCSAGPacket& packet, const std::string info, const std::string text);
void on_decoded(const pocsag::POCSAGPacket& packet, const std::string text);
private:
LogFile log_file { };
@ -69,7 +70,12 @@ private:
static constexpr uint32_t sampling_rate = 3072000;
//static constexpr uint32_t baseband_bandwidth = 1750000;
bool logging { false };
BCHCode BCH_code {
{ 1, 0, 1, 0, 0, 1 },
5, 31, 21, 2
};
bool logging { true };
uint32_t last_address = 0xFFFFFFFF;
pocsag::POCSAGState pocsag_state { };