From c90f4b843d75aa711c10002d719fe8ba15c7b36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Sat, 14 Nov 2026 23:55:34 +0100 Subject: [PATCH 01/11] Tx seems to work --- .idea/editor.xml | 101 +++++++++++++++++ app/ooksender.c | 288 +++++++++++++++++++++++++++++++++++++++++++++++ app/ooksender.h | 35 ++++++ ui/ooksender.c | 84 ++++++++++++++ ui/ooksender.h | 18 +++ 5 files changed, 526 insertions(+) create mode 100644 .idea/editor.xml create mode 100644 app/ooksender.c create mode 100644 app/ooksender.h create mode 100644 ui/ooksender.c create mode 100644 ui/ooksender.h diff --git a/.idea/editor.xml b/.idea/editor.xml new file mode 100644 index 0000000..ca29dcc --- /dev/null +++ b/.idea/editor.xml @@ -0,0 +1,101 @@ + + + + + \ No newline at end of file diff --git a/app/ooksender.c b/app/ooksender.c new file mode 100644 index 0000000..c9fcea5 --- /dev/null +++ b/app/ooksender.c @@ -0,0 +1,288 @@ +// +// Created by bruno on 3/30/25. +// + +#include "messages.h" +#include "ui/ui.h" +#include "driver/uart.h" +#include "driver/systick.h" + +#define T9Count 9 + +const char T9Table[10][T9Count] = { + {'#', '(', ')', ';', ':', '<', '>', '/', '0'}, + {',', '.', '?', '&', '!', ' ', '-', '_', '1'}, + {'a', 'b', 'c', 'A', 'B', 'C', '[', ']', '2'}, + {'d', 'e', 'f', 'D', 'E', 'F', '@', '%', '3'}, + {'g', 'h', 'i', 'G', 'H', 'I', '~', '$', '4'}, + {'j', 'k', 'l', 'J', 'K', 'L', '|', '*', '5'}, + {'m', 'n', 'o', 'M', 'N', 'O', '{', '}', '6'}, + {'p', 'q', 'r', 's', 'P', 'Q', 'R', 'S', '7'}, + {'t', 'u', 'v', 'T', 'U', 'V', '"', '\'', '8'}, + {'w', 'x', 'y', 'z', 'W', 'X', 'Y', 'Z', '9'} +}; + + +uint8_t gActiveMessage = 0; +uint8_t gActiveMessageBank = 0; + +StoredPacket loadedPacket; + +uint8_t gKeyTimeout = 0; + +void MESSAGES_SAVE() { + uint8_t Data[8]; + EEPROM_ReadBuffer(SEQParameterEEPROM, Data, 8); + uint8_t msgIndex = Data[1]; + if (msgIndex >= MESSAGES_COUNT) { + msgIndex = 0; + } + msgIndex++; + Data[1] = msgIndex; + EEPROM_WriteBuffer(SEQParameterEEPROM, Data); + EEPROM_WriteBuffer(MESSAGES_START + (msgIndex * sizeof(StoredPacket)) + 0, + (uint8_t *) &inBoundPacket + 4); // metadata + EEPROM_WriteBuffer(MESSAGES_START + (msgIndex * sizeof(StoredPacket)) + 8, + (uint8_t *) &inBoundPacket + 12); // message part 1 + EEPROM_WriteBuffer(MESSAGES_START + (msgIndex * sizeof(StoredPacket)) + 16, + (uint8_t *) &inBoundPacket + 20); // message part 2 + EEPROM_WriteBuffer(MESSAGES_START + (msgIndex * sizeof(StoredPacket)) + 24, + (uint8_t *) &inBoundPacket + 28); // message part 3 + EEPROM_WriteBuffer(MESSAGES_START + (msgIndex * sizeof(StoredPacket)) + 32, + (uint8_t *) &inBoundPacket + 36); // message part 4 + +} + +void MESSAGES_GET() { + if (gActiveMessage == MESSAGES_COUNT) { + memcpy(&loadedPacket, (uint8_t *) &dataPacket + (sizeof(DataPacket) - sizeof(StoredPacket)), + sizeof(StoredPacket)); + } else { + EEPROM_ReadBuffer(MESSAGES_START + (gActiveMessage * sizeof(StoredPacket)), &loadedPacket, + sizeof(StoredPacket)); + } +} + +void MESSAGES_DELETE() { + +} + +void updatePrevChar(KEY_Code_t Key) { + if (Key != prevKey) { + prevKey = Key; + } + +} + +void MESSAGES_TimeSlice500ms(void) { + if (gKeyTimeout && gKeyTimeout++ > 2) { + gKeyTimeout = 0; + prevKey = KEY_EXIT; + } +} + +void MESSAGES_ProcessKeys(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) { + gKeyTimeout = 1; + if (gEnteringSMS != SMS_NOT_ENTERING && Key <= KEY_9) { + if (!bKeyHeld) { + if (!dataPTR || dataPTR < dataPacket.data) { + dataPTR = dataPacket.data; + } + } + if (gEnteringSMS == SMS_ENTERING_MESSAGE) { + if (bKeyPressed) { + if (prevKey != Key) { + dataPTR++; + //if (dataPTR - dataPacket.data >= DataPacketDataSize) { + if (dataPTR - dataPacket.data >= 19) { + dataPTR = dataPacket.data; + } + prevLetter = 0; + } + *(dataPTR - 1) = T9Table[Key][prevLetter]; + if (!bKeyHeld) { + prevLetter++; + } else { + prevLetter--; + } + prevLetter = (prevLetter) % T9Count; + updatePrevChar(Key); + } + return; + } else if (gEnteringSMS == SMS_ENTERING_DEST) { + if (!bKeyHeld) { + if (bKeyPressed) { + dataPacket.dest *= 10; + dataPacket.dest += Key; + prevLetter = 0; + } + return; + } + } + } + + + switch (Key) { + case KEY_PTT: + case KEY_MENU: + if (gEnteringSMS == SMS_NOT_ENTERING) { + if (bKeyPressed) { + gEnteringSMS = SMS_ENTERING_DEST; + updatePrevChar(Key); + } + } else if (gEnteringSMS == SMS_ENTERING_DEST) { + if (bKeyPressed) { + memset(dataPacket.data, 0, DataPacketDataSize); + prepareDataPacket(); + dataPacket.flags = 0x80 | (gCurrentVfo->OUTPUT_POWER & 0x07); + if (dataPacket.src == 665 || dataPacket.src == 664) { + + uint8_t out[5]; + if (dataPacket.src == 665) { + const uint32_t id24 = 0xFFFFFF & (dataPacket.dest >> 4); + const uint8_t btn = 0x0F & (dataPacket.dest); + // mask just in case +// uint32_t id24 = 0x00A38C; +// uint8_t btn = 0x04; + + // 3-byte big-endian ID + out[0] = (id24 >> 16) & 0xFF; + out[1] = (id24 >> 8) & 0xFF; + out[2] = (id24 >> 0) & 0xFF; + + // first nibble redundancy copy: 0xBB if btn=0xB + out[3] = (btn << 4) | 0x04; + + // second copy with MSB flipped (btn ^ 0x8) in the high nibble + out[4] = ((btn ^ 0x8) << 4); + } else { + out[0] = (dataPacket.dest >> 8) & 0xFF; + out[1] = dataPacket.dest & 0xFF; + } + + BK4819_EnterTxMute(); + RADIO_SetTxParameters(); + + uint16_t datX = BK4819_REG_30_ENABLE_VCO_CALIB | + BK4819_REG_30_ENABLE_UNKNOWN | + BK4819_REG_30_DISABLE_RX_LINK | + BK4819_REG_30_DISABLE_AF_DAC | + BK4819_REG_30_ENABLE_DISC_MODE | + BK4819_REG_30_ENABLE_PLL_VCO | + BK4819_REG_30_ENABLE_PA_GAIN | + BK4819_REG_30_DISABLE_MIC_ADC | + BK4819_REG_30_ENABLE_TX_DSP | + BK4819_REG_30_DISABLE_RX_DSP; + BK4819_WriteRegister(BK4819_REG_30, + datX); + BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, false); + SYSTEM_DelayMs(20); + + for (unsigned int x = 0; x < 15; x++) { + for (unsigned int y = 0; y < (dataPacket.src == 665 ? 5 : 2); y++) { + for (unsigned char i = 7; i < 8; i--) { + if ((out[y] >> i) & 1) { +// datX |= BK4819_REG_30_ENABLE_PA_GAIN; + BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, true); + SYSTICK_DelayUs(400 * (dataPacket.src == 665 ? 3 : 2) - 325); + BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, false); +// datX &= ~BK4819_REG_30_ENABLE_PA_GAIN; + SYSTICK_DelayUs(400 * 1 - 325); + } else { + BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, true); +// datX |= BK4819_REG_30_ENABLE_PA_GAIN; + SYSTICK_DelayUs(400 * 1 - 325); + BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, false); +// datX &= ~BK4819_REG_30_ENABLE_PA_GAIN; + SYSTICK_DelayUs(400 * (dataPacket.src == 665 ? 3 : 2) - 325); + } + } + } + BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, false); + SYSTEM_DelayMs((dataPacket.src == 665 ? 3 : 15)); + } + BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, false); + SYSTEM_DelayMs(100); + BK4819_WriteRegister(BK4819_REG_30, 0xC1FE); + gEnteringSMS = SMS_NOT_ENTERING; + } else { + gEnteringSMS = SMS_ENTERING_MESSAGE; + } + } + return; + } else if (gEnteringSMS == SMS_ENTERING_MESSAGE) { + if (bKeyPressed) { + if (strlen((char *) dataPacket.data)) { + MSG_FSKSendData(&dataPacket); + gEnteringSMS = SMS_NOT_ENTERING; + } + } + return; + } + break; + case KEY_UP: + if (gEnteringSMS == SMS_NOT_ENTERING) { + if (bKeyPressed) { + gActiveMessageBank++; + gActiveMessage = gActiveMessageBank * 3; + if (gActiveMessage > MESSAGES_COUNT) { + gActiveMessage = 0; + } + if (gActiveMessageBank >= MESSAGES_COUNT / 3) { + gActiveMessageBank = 0; + } + MESSAGES_GET(); + } + } + break; + case KEY_DOWN: + if (gEnteringSMS == SMS_NOT_ENTERING) { + if (bKeyPressed) { + gActiveMessageBank--; + gActiveMessage = gActiveMessageBank * 3; + if (gActiveMessage >= MESSAGES_COUNT) { + gActiveMessage = MESSAGES_COUNT - 1; + } + if (gActiveMessageBank > MESSAGES_COUNT / 3) { + gActiveMessageBank = MESSAGES_COUNT / 3 - 1; + } + MESSAGES_GET(); + } + } + break; + case KEY_EXIT: + if (gEnteringSMS != SMS_NOT_ENTERING) { + if (bKeyHeld) { + if (bKeyPressed) { + gEnteringSMS = SMS_NOT_ENTERING; + dataPTR = dataPacket.data; + memset(dataPacket.data, 0, DataPacketDataSize); + } + } else { + if (bKeyPressed) { + if (gEnteringSMS == SMS_ENTERING_MESSAGE) { + if (dataPacket.data <= dataPTR) { + *dataPTR = '\0'; + if (dataPacket.data < dataPTR) { + dataPTR--; + } + *dataPTR = '\0'; + } + } else if (gEnteringSMS == SMS_ENTERING_DEST) { + dataPacket.dest /= 10; + } + } + } + } else { + if (bKeyPressed) { + gRequestDisplayScreen = DISPLAY_MAIN; + } + } + updatePrevChar(Key); + break; + default: + if (!bKeyHeld && bKeyPressed) + gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL; + break; + } +} \ No newline at end of file diff --git a/app/ooksender.h b/app/ooksender.h new file mode 100644 index 0000000..00a685f --- /dev/null +++ b/app/ooksender.h @@ -0,0 +1,35 @@ +// +// Created by bruno on 3/30/25. +// + +//#ifndef BRNQUANFW_MESSAGES_H +//#define BRNQUANFW_MESSAGES_H +#include "fskmodem.h" +#include "../driver/keyboard.h" +#include "../driver/eeprom.h" + +#define MESSAGES_START (0x1C08) +#define MESSAGES_COUNT (12) + +typedef struct { + uint32_t src; + uint8_t seq; + uint8_t ttl; + uint8_t flags; + uint8_t data[DataPacketDataSize]; +} StoredPacket; + +extern uint8_t gActiveMessage; +extern uint8_t gActiveMessageBank; + +extern StoredPacket loadedPacket; + +extern uint8_t gKeyTimeout; + +void MESSAGES_GET(); +void MESSAGES_DELETE(); +void MESSAGES_SAVE(); +void MESSAGES_ProcessKeys(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld); +void MESSAGES_TimeSlice500ms(void); + +//#endif //BRNQUANFW_MESSAGES_H diff --git a/ui/ooksender.c b/ui/ooksender.c new file mode 100644 index 0000000..a3eb6cd --- /dev/null +++ b/ui/ooksender.c @@ -0,0 +1,84 @@ +// +// Created by bruno on 3/30/25. +// + +#include "messages.h" + + +// Convert a 32-bit number to a string (10 digits, zero-padded) +void u32_to_str(uint32_t num, char *str) { + for (int i = 9; i >= 0; i--) { + str[i] = '0' + (num % 10); + num /= 10; + } + str[10] = '\0'; +} + +// Convert an 8-bit number to a 2-digit string (zero-padded) +void u8_to_str(uint8_t num, char *str) { + str[0] = '0' + (num / 100); // Hundreds place + str[1] = '0' + ((num / 10) % 10); // Tens place + str[2] = '0' + (num % 10); // Ones place + str[3] = '\0'; +} + + +void UI_DisplayMessages(void) { + char String[19]; + UI_DisplayClear(); + if (gEnteringSMS != SMS_NOT_ENTERING) { + if (gEnteringSMS == SMS_ENTERING_DEST) { + UI_PrintString("SMS dest", 0, 0, 0 /*, 8 */); + u32_to_str(dataPacket.dest, String); + UI_PrintStringSmallNormal(String, 0, 0, 2); + } else if (gEnteringSMS == SMS_ENTERING_MESSAGE) { + UI_PrintString("SMS data", 0, 0, 0 /*, 8 */); + UI_PrintStringSmallNormal((const char *) dataPacket.data, 1, 0, 1); + memset(gFrameBuffer[1] + 2 + (7 * strlen((const char *) dataPacket.data)), gKeyTimeout == 0 ? 0xFF : 0x80, + 6); + } + } else { + uint8_t Data[8]; + EEPROM_ReadBuffer(SEQParameterEEPROM, Data, 8); + uint8_t msgIndex = Data[1]; // index of latest written message + + // Determine oldest message index (next to be overwritten) + uint8_t startIndex = (msgIndex + 1) % MESSAGES_COUNT; + + // Each bank shows 3 messages + uint8_t messagesPerPage = 3; + + // Compute offset for scrolling (0 = newest, higher = older) + uint8_t pageOffset = gActiveMessageBank * messagesPerPage; + + for (uint8_t ixa = 0; ixa < messagesPerPage; ixa++) { + // Logical order from oldest to newest + uint8_t logicalIndex = (startIndex + pageOffset + ixa) % MESSAGES_COUNT; + + // If out of stored range, stop + if (pageOffset + ixa >= MESSAGES_COUNT) + break; + + gActiveMessage = logicalIndex; + MESSAGES_GET(); + + // Build the display string + u32_to_str(gActiveMessage == MESSAGES_COUNT ? dataPacket.dest : loadedPacket.src, &String[0]); + String[10] = '-'; + u8_to_str(loadedPacket.seq, &String[11]); + String[14] = '-'; + + // Display a visual index (0,1,2,3... not EEPROM slot) + uint8_t visualIndex = ixa + (gActiveMessageBank * 3); + String[15] = (visualIndex < 10) ? ('0' + visualIndex) : ('A' + visualIndex - 10); + String[16] = '-'; + String[17] = (gActiveMessage < 10) ? ('0' + gActiveMessage) : ('A' + gActiveMessage - 10); + String[18] = 0; + + // Print both metadata and message + UI_PrintString(String, 2, 0, ixa * 2); + UI_PrintString((const char *) loadedPacket.data, 2, 0, ixa * 2 + 1); + } + } + ST7565_BlitFullScreen(); +} \ No newline at end of file diff --git a/ui/ooksender.h b/ui/ooksender.h new file mode 100644 index 0000000..993bb06 --- /dev/null +++ b/ui/ooksender.h @@ -0,0 +1,18 @@ +// +// Created by bruno on 3/30/25. +// + +#ifndef BRNQUANFW_MESSAGES_H +#define BRNQUANFW_MESSAGES_H +#include "stdio.h" +#include "helper.h" +#include "../driver/st7565.h" +#include "string.h" +#include "../app/messages.h" +#include "../app/fskmodem.h" + +void UI_DisplayMessages(void); +void u8_to_str(uint8_t num, char *str); +void u32_to_str(uint32_t num, char *str); + +#endif //BRNQUANFW_MESSAGES_H -- 2.56.0 From ccf49de07b50ef7d88a6d8fbec5e62ee212967a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Sat, 14 Nov 2026 23:55:43 +0100 Subject: [PATCH 02/11] TX seems to work --- .gitignore | 14 ++ .idea/editor.xml | 245 ++++++++++++++++++++++++++++ Makefile | 5 +- README.md | 4 + app/app.c | 2 + app/fskmodem.c | 277 +++++++++++++++++++++++++++++++- app/fskmodem.h | 2 +- app/main.c | 4 + app/messages.c | 147 +++++------------ app/messages.h | 2 + app/ooksender.c | 371 +++++++++++++------------------------------ app/ooksender.h | 46 +++--- app/pocsag.c | 239 ++++++++++++++++++++++++++++ app/pocsag.h | 33 ++++ app/uart.c | 7 + driver/bk4819-regs.h | 2 + settings.c | 2 +- settings.h | 3 +- tests/test_pocsag.c | 96 +++++++++++ ui/menu.c | 5 +- ui/menu.h | 2 +- ui/messages.c | 13 +- ui/messages.h | 6 +- ui/ooksender.c | 103 ++++-------- ui/ooksender.h | 12 +- ui/ui.c | 2 + ui/ui.h | 1 + 27 files changed, 1163 insertions(+), 482 deletions(-) create mode 100644 app/pocsag.c create mode 100644 app/pocsag.h create mode 100644 tests/test_pocsag.c diff --git a/.gitignore b/.gitignore index 83460c3..3b98a92 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,17 @@ compile_commands.json .vscode /docs k5_eeprom.raw +eeprom-main-calib.bin +eeprom-mine-calib.bin +eeprom-mine-full.bin +eeprom-minede-full.bin +eeprom-minemde-full.bin +eeprom-second-calib.bin +eeprom-second-full.bin +eeprom-seconddd-calib.bin +K5TOOL.exe +K5TOOL.log +K5TOOL.log.bak +f4hwn +f4hwn.bin +f4hwn.packed.bin diff --git a/.idea/editor.xml b/.idea/editor.xml index ca29dcc..1798069 100644 --- a/.idea/editor.xml +++ b/.idea/editor.xml @@ -1,6 +1,251 @@ +