diff --git a/App/apps/aprstx/README.md b/App/apps/aprstx/README.md
index e57d5e44..28cf2fad 100644
--- a/App/apps/aprstx/README.md
+++ b/App/apps/aprstx/README.md
@@ -7,7 +7,7 @@ which is also the test receiver.
| Step | State |
|---|---|
| Frame and bit stream model (`test/tx_model.py`) | **Done**: identical to the RX app's AX.25 reference, decoded by the RX model |
-| Radio app (`aprstx_app.c`) | **v0.1 works on the radio** (2026-09-30); v0.2 edits the position on the radio, frequency bottom right as Beacon (builds: 2812 B; radio test pending); v0.3 adds the SSID and path to the editor, the edited field in bold (not built yet) |
+| Radio app (`aprstx_app.c`) | **v0.1 works on the radio** (2026-09-30); v0.2 edits the position; v0.3 adds the SSID and path; v0.4 adds the corrected 20x20 bitmap and the 48-symbol selector (not built here) |
| On-air test: APRS RX on a second radio, FT3D | **Done** (2026-09-30, v0.1: frames received by a UV-K1 running APRS RX and by the FT3D, first try, default level 66 and twist 0) |
## Station settings (`gen_assets.py`, then rebuild)
@@ -18,7 +18,7 @@ which is also the test receiver.
| `DEST` | `APZK5` (APZ = experimental software) |
| `PATH` | `1` = `WIDE1-1`, an index in `PATHS`: `DIRECT` (no digipeater), `WIDE1-1`, `WIDE1-1,WIDE2-1`; the **default**, until one is chosen on the radio |
| `LAT`, `LON` | `4850.90N`, `00216.25E`: the **default** position, until one is edited on the radio (key 5) |
-| `SYMBOL` | `/[` (person) |
+| `SYMBOL` | `/[` (person): the default, until one of the 48 symbols is chosen on the radio |
| `COMMENT` | `UV-K5 & UV-K1 APRS TX` (43 characters at most) |
Frame sent: `F4HWN-7>APZK5,WIDE1-1:!4850.90N/00216.25E[UV-K5 & UV-K1 APRS TX` (66 bytes,
@@ -27,6 +27,10 @@ If the boot message is not a plain callsign (empty, more than 6 characters once
spaces are dropped, or with a `/`), the app shows `No boot callsign` and does not
transmit.
+In the normal view, the TX frequency is aligned left below the separator and
+the selected APRS symbol is shown as a 20x20 bitmap at x=108. The 48-symbol
+Yaesu bitmap set is stored in the app assets; the editor keeps the full width.
+
## Keys (UV-K5 and UV-K1)
| Key | Action |
@@ -37,8 +41,8 @@ transmit.
| 2 / F then 2 | Twist `tw` up / down, -4..+8: 2200 Hz gain = level × (8 + tw) / 8 (-6..+6 dB) |
| F | Arm the next key's down direction (1, 2), as FoxHunt's F; icon in the status bar while armed |
| * | Scroll view / compact view (saved): compact shows the source in bold, then the path, the position `48 50.90N 002 16.25E`, the symbol and the comment in the tiny 3x5 font, 32 characters a row, without scroll |
-| 5 | Edit the position, SSID and path |
-| EXIT | Quit (level, twist, position, SSID, path and view are saved) |
+| 5 | Edit the position, SSID, path and symbol |
+| EXIT | Quit (level, twist, position, SSID, path, symbol and view are saved) |
### Editor (v0.3)
@@ -47,24 +51,27 @@ LAT 48 50.90 N
LON 002 16.25 E
SSID 7
PATH WIDE1-1
+SYMB /[
-0-9 digit * change F+* back
+0-9, * change, F+* back
UP/DN move MENU ok EXIT
```
The field under the cursor is drawn in bold: a digit or the N/S, E/W letter of
-the position, or the whole SSID or path value. Type the 13 digits in a row, as a
+the position, or the whole SSID, path or symbol value. Type the 13 digits in a row, as a
frequency: `485090` then `0021625` (degrees, minutes, hundredths of a minute: the
APRS format, read as is from a GPS or aprs.fi in degrees-minutes). The cursor
skips the separators and N/S, and goes on from the latitude to the longitude;
-UP/DOWN also stop on N/S and E/W, then take it on to SSID and PATH.
+UP/DOWN also stop on N/S and E/W, then take it on to SSID, PATH and SYMB.
+When SYMB is selected, both shortened help rows remain visible and the edited
+20x20 symbol is previewed at x=108, the same position as on the normal screen.
| Key | Action |
|---|---|
| 0-9 | Digit at the cursor, then the next one (on a position digit) |
-| * | N/S (latitude line), E/W (longitude line), next SSID 0-15 (SSID), next path (PATH) |
-| F then * | Previous SSID or path (the `F` icon in the status bar while F is armed, as in FoxHunt; F again disarms it) |
-| UP / DOWN | Move the cursor: 6 digits, N/S, 7 digits, E/W, SSID, PATH |
+| * | N/S (latitude line), E/W (longitude line), next SSID 0-15 (SSID), next path (PATH), or next symbol (SYMB) |
+| F then * | Previous SSID, path or symbol (the `F` icon in the status bar while F is armed, as in FoxHunt; F again disarms it) |
+| UP / DOWN | Move the cursor: 6 digits, N/S, 7 digits, E/W, SSID, PATH, SYMB |
| MENU | Check (degrees ≤ 90 / 180, minutes < 60) and keep: the frame is rebuilt; `Invalid position` otherwise |
| EXIT | Cancel |
@@ -72,9 +79,10 @@ Paths: `DIRECT` (heard only by the stations and iGates in range), `WIDE1-1` (one
repeat by a nearby digipeater), `WIDE1-1,2-1` (`WIDE1-1,WIDE2-1`: the usual
mobile / portable path, two repeats).
-Everything is saved on exit (`cfg_save`, 12 bytes: magic 0xA8, level, twist, 13
+Everything is saved on exit (`cfg_save`, 13 bytes: magic 0xA8, level, twist, 13
digits and the hemispheres in nibbles, `0x80 | path << 4 | SSID`, then the view:
-14 compact, anything else scroll). A v0.2 config (10 bytes: byte 10 erased)
+14 compact, anything else scroll, then the symbol index). An older config with
+byte 12 erased uses the default person symbol. A v0.2 config (10 bytes: byte 10 erased)
keeps its position and takes the default SSID and path; an 11-byte config
(byte 11 erased) opens in the scroll view; a v0.1 config (magic 0xA7) is
ignored: defaults.
@@ -109,8 +117,8 @@ SPI writes, a few tens of µs out of 833. `tx_mute` + `tx_end` restore RX.
`test/tx_model.py` (needs `../aprsrx/test`): frame from the real assets vs
`ax25.build`, bit stream vs `ax25.hdlc_bits`, bad boot callsigns refused, an
edited position (south/west) vs `ax25.build`, every path with SSID 0, 15 and 9
-vs `ax25.build`, the config round trip (and a v0.2 config falling back to the
-default SSID and path), the editor rows and bold column, the editor keys (13
+and a selected symbol vs `ax25.build`, the config round trip (and a v0.2 config
+falling back to the default SSID, path and symbol), the editor rows and bold column, the editor keys (13
digits typed in a row, cursor stops, `*` and F then `*` on each field; the
UP/DOWN keys through `nav_dir()`, with SET_NAV on and off), the position limits,
then
diff --git a/App/apps/aprstx/aprstx_app.c b/App/apps/aprstx/aprstx_app.c
index b0b22afd..352f892b 100644
--- a/App/apps/aprstx/aprstx_app.c
+++ b/App/apps/aprstx/aprstx_app.c
@@ -20,8 +20,8 @@
*
* The source is the boot-message callsign (API boot_callsign) with an SSID;
* destination, the WIDE path entries, symbol and comment are AX.25-encoded in
- * gen_assets.py (assets). The position, the SSID and the path (DIRECT, WIDE1-1
- * or WIDE1-1,WIDE2-1) are edited on the radio (key 5) and saved; gen_assets.py
+ * gen_assets.py (assets). The position, the SSID, the path (DIRECT, WIDE1-1
+ * or WIDE1-1,WIDE2-1) and the symbol are edited on the radio (key 5) and saved; gen_assets.py
* holds the defaults. The frame is built at launch and after each edit, FCS
* included.
*
@@ -36,14 +36,14 @@
* 1 px per loop · 1 / F then 1 tone level up / down (deviation, REG_70 gain
* 10-127) · 2 / F then 2 twist up / down: 2200 Hz gain = level x (8 + tw) / 8,
* tw -4..+8 (-6..+6 dB), for a receiver's de-emphasis · 5 edit the position,
- * SSID and path · * scroll view / compact view · EXIT quit. F as FoxHunt's: the next key goes down, an icon
+ * SSID, path and symbol · * scroll view / compact view · EXIT quit. F as FoxHunt's: the next key goes down, an icon
* in the status bar while armed.
* Editor (the field under the cursor in bold): 0-9 type a digit (the cursor
* skips the separators and N/S, and moves on) · * toggle N/S or E/W on the
- * position lines, next SSID or path on theirs · F then * the previous SSID or
- * path · UP/DOWN move the cursor (6 digits, N/S, 7 digits, E/W, SSID, path) ·
+ * position lines, next SSID, path or symbol on theirs · F then * the previous
+ * value · UP/DOWN move the cursor (6 digits, N/S, 7 digits, E/W, SSID, path, symbol) ·
* MENU check and keep · EXIT cancel.
- * Level, twist, position, SSID, path and view are saved on exit (cfg_save, 12
+ * Level, twist, position, SSID, path, symbol and view are saved on exit (cfg_save, 13
* bytes).
*/
@@ -89,16 +89,17 @@
their place while armed; not while transmitting:
the capsule ends at x = 72 */
/* editor cursor stops: 0-5 the latitude digits, N/S, 7-13 the longitude
- * digits, E/W, SSID, path */
+ * digits, E/W, SSID, path, symbol */
#define CUR_NS LAT_DIGITS
#define CUR_EW (POS_DIGITS + 1u)
#define CUR_SSID (CUR_EW + 1u)
#define CUR_PATH (CUR_EW + 2u)
+#define CUR_SYM (CUR_EW + 3u)
#define FIELD_COL 5u /* "SSID " / "PATH ": the value's column */
#define CFG_MAGIC 0xA8u /* 0xA7 (v0.1: level and twist only) is ignored */
-#define CFG_LEN 12u /* magic, level, twist, 13 digits + hemispheres in nibbles,
+#define CFG_LEN 13u /* magic, level, twist, 13 digits + hemispheres in nibbles,
then 0x80 | path << 4 | SSID (v0.2 configs: defaults),
- then the view (CW_COMPACT, else scroll: 0xFF before v0.4) */
+ the view, then the symbol index (default if erased) */
#define LOOP_MS 40u
#define REFRESH_LOOPS 125u /* a redraw every 5 s without a key (battery) */
@@ -116,6 +117,7 @@ static struct {
bool fArm; /* editor: F pressed, the next key goes back */
uint8_t hemi, ehemi, cur; /* hemispheres, edited ones, editor cursor */
uint8_t ssid, essid, path, epath; /* source SSID, path, and the edited ones */
+ uint8_t sym, esym; /* transmitted symbol and edited index */
uint8_t tick; /* loops since the last draw() */
uint8_t top, lim, vrow; /* scroll (px) and its limit, row being drawn */
uint8_t cw; /* view: 0 scroll, CW_COMPACT compact */
@@ -197,8 +199,9 @@ static char *brk(char *o){
/* The frequency (10 Hz units) drawn as the main screen draws it (ui/main.c,
* ENABLE_BIG_FREQ): the big digits up to the kHz on lines 4-5, the last two
* digits in the small font on line 5 right after them (from 1 GHz, the whole
- * string in the big font), the group centred. Big digits are 13 px (drawn from
- * +2), the point 3 px: the group shows (n big digits x 13 + 14) px. No division. */
+ * string in the big font). The group is aligned left to reserve the rightmost
+ * 20 columns for the APRS symbol. Big digits are 13 px (drawn from +2), the
+ * point 3 px. No division. */
static void drawFreq(uint32_t f){
const app_api_t *A=g.A;
uint16_t m=0;
@@ -208,11 +211,19 @@ static void drawFreq(uint32_t f){
for(uint8_t i=0;i<5u;i++) *o++=(char)('0'+sub(&f,P10[i]));
*o='\0';
uint8_t n=(uint8_t)(o-str), big=(uint8_t)(n-3u); /* digits before "00" */
- if(m>=1000u){ A->print_string(str,(uint8_t)((128u-n*8u)>>1),0,4,8); return; }
- uint8_t x=(uint8_t)(((128u-(big*13u+14u))>>1)-2u);
- A->print_normal(str+n-2u,(uint8_t)(x+big*13u+3u),0,5); /* "00" */
+ if(m>=1000u){ A->print_string(str,0,0,4,8); return; }
+ A->print_normal(str+n-2u,(uint8_t)(big*13u+3u),0,5); /* "00" */
str[n-2u]='\0';
- A->display_freq(str,x,4,false); /* "144.800" */
+ A->display_freq(str,0,4,false); /* "144.800" */
+}
+
+#define SYM_X 108u
+_Static_assert(SYM_X+SYM_W<=128u,"APRS symbol must fit on screen");
+static void drawSymbol(uint8_t x,uint8_t sym){
+ const app_api_t *A=g.A;
+ uint16_t off=(uint16_t)(SYM_BITMAPS+(uint16_t)sym*SYM_BYTES);
+ for(uint8_t page=0;page<3u;page++)
+ A->asset_read((uint16_t)(off+page*SYM_W),A->fb[4u+page]+x,SYM_W);
}
/* AX.25 address field -> "F4HWN-7" */
static char *putCall(char *o,const uint8_t *a){
@@ -258,7 +269,7 @@ static void build(void){
if(g.path){ A->asset_read(F_WIDE,f+14,(uint16_t)(k-14u)); f[k-1]|=1u; }
f[k++]=0x03; f[k++]=0xF0; /* UI frame, no layer 3 */
uint8_t sym[2];
- A->asset_read(F_SYM,sym,2);
+ A->asset_read((uint16_t)(SYM_CODES+g.sym*2u),sym,2);
f[k++]='!'; /* position, no messaging */
k=(uint8_t)(putCoord(f+k,g.pos,LAT_DIGITS,(g.hemi&1u)?'S':'N')-f);
f[k++]=sym[0]; /* symbol table */
@@ -332,13 +343,12 @@ static void editRow(const char *label,uint8_t line,const uint8_t *d,uint8_t n,ch
if((uint8_t)cur<=n){ str[0]=str[col]; str[1]='\0'; g.A->print_bold(str,(uint8_t)(col*7u),0,line); }
}
-/* "SSID 7" / "PATH WIDE1-1" on a normal-font line, the value in bold when the
- * cursor is on it */
-static void fieldRow(const char *label,const char *val,uint8_t line,bool sel){
+/* A labelled value on a normal-font line, at x; the value is bold when selected. */
+static void fieldRow(const char *label,const char *val,uint8_t x,uint8_t line,bool sel){
char *o=put(put(str,label),val);
*o='\0';
- g.A->print_normal(str,0,0,line);
- if(sel) g.A->print_bold(val,FIELD_COL*7u,0,line);
+ g.A->print_normal(str,x,0,line);
+ if(sel) g.A->print_bold(val,(uint8_t)(x+FIELD_COL*7u),0,line);
}
/* ---- display ---- */
@@ -365,10 +375,19 @@ static void draw(void){
(int8_t)(c-(int8_t)(CUR_NS+1u)));
char v[3];
*puti(v,g.essid)='\0';
- fieldRow(s+T_SSID,v,2,g.cur==CUR_SSID);
- fieldRow(s+T_PATH,s+T_PATHS+g.epath*T_PATHS_STRIDE,3,g.cur==CUR_PATH);
- tiny(40,put(str,s+T_HELP1));
- tiny(48,put(str,g.status==ST_BADPOS?s+T_BADPOS:s+T_HELP2));
+ fieldRow(s+T_SSID,v,0,2,g.cur==CUR_SSID);
+ fieldRow(s+T_PATH,s+T_PATHS+g.epath*T_PATHS_STRIDE,0,3,g.cur==CUR_PATH);
+ A->asset_read((uint16_t)(SYM_CODES+g.esym*2u),v,2); v[2]='\0';
+ if(g.cur==CUR_SYM){
+ fieldRow(s+T_SYM,v,0,4,true);
+ drawSymbol(SYM_X,g.esym);
+ tiny(40,put(str,s+T_HELP1));
+ tiny(48,put(str,g.status==ST_BADPOS?s+T_BADPOS:s+T_HELP2));
+ } else {
+ fieldRow(s+T_SYM,v,0,4,false);
+ tiny(40,put(str,s+T_HELP1));
+ tiny(48,put(str,g.status==ST_BADPOS?s+T_BADPOS:s+T_HELP2));
+ }
} else {
g.vrow=0;
if(g.flen){
@@ -427,6 +446,7 @@ static void draw(void){
* blank px between) */
for(uint8_t x=0;x<128u;x++) b[384u+x]=(uint8_t)((b[384u+x]&0x7Fu)|((~x&1u)<<7));
drawFreq(A->tx_freq());
+ drawSymbol(SYM_X,g.sym);
/* bottom line: "lvl 66 tw +0 sent 3", or why nothing was sent */
if(g.status==ST_DENIED||g.status==ST_NOCALL)
@@ -488,7 +508,7 @@ static void handleKeys(void){
if(key==APP_KEY_F){ g.fArm=!g.fArm; return; }
bool back=g.fArm; /* F then a key: it goes backwards (down) */
g.fArm=false;
- if(g.edit){ /* position, SSID and path editor */
+ if(g.edit){ /* position, SSID, path and symbol editor */
g.status=ST_IDLE;
uint8_t cur=g.cur;
bool lon=cur>CUR_NS && cur<=CUR_EW; /* on the longitude line */
@@ -503,13 +523,16 @@ static void handleKeys(void){
else if(key==APP_KEY_STAR){
if(cur<=CUR_EW) g.ehemi^=(uint8_t)(lon?2u:1u); /* on a digit or the letter */
else if(cur==CUR_SSID) g.essid=(uint8_t)((g.essid+(back?15u:1u))&15u);
- else if(back) g.epath=(uint8_t)(g.epath?g.epath-1u:PATH_MAX);
- else g.epath=(uint8_t)(g.epathnav_dir(key);
if(d<0 && g.cur) g.cur--;
- if(d>0 && g.cur0 && g.curasset_read(POS_DEF,g.pos,POS_DIGITS);
api->asset_read(POS_DEF+POS_DIGITS,&g.hemi,1);
api->cfg_load(c,CFG_LEN);
@@ -565,6 +589,7 @@ void app_main(const app_api_t *api){
h=c[10]; /* 0x80 | path << 4 | SSID; erased (0xFF) or 0: defaults */
if((h&0xC0u)==0x80u && ((h>>4)&3u)<=PATH_MAX){ g.ssid=(uint8_t)(h&15u); g.path=(uint8_t)((h>>4)&3u); }
if(c[11]==CW_COMPACT) g.cw=CW_COMPACT;
+ if(c[12]cfg_save(c,CFG_LEN);
}
diff --git a/App/apps/aprstx/build.sh b/App/apps/aprstx/build.sh
index 4fe2a58a..66b02fe2 100755
--- a/App/apps/aprstx/build.sh
+++ b/App/apps/aprstx/build.sh
@@ -8,7 +8,7 @@ set -euo pipefail
APP="$(basename "$PWD")" # breakout, foxhunt, beacon, fm, ...
APP_NAME="APRS TX" # <-- the only per-app line
-APP_VER="0.3"
+APP_VER="0.4"
APP_API_MIN=2
APP_VMA=${APP_VMA:-0x20000280} # pinned overlay VMA (Core/py32f071xb.ld)
OUT="${APP_NAME// /}" # blob basename ("Broadcast FM" -> BroadcastFM)
diff --git a/App/apps/aprstx/gen_assets.py b/App/apps/aprstx/gen_assets.py
index 1c8710a7..1389a538 100755
--- a/App/apps/aprstx/gen_assets.py
+++ b/App/apps/aprstx/gen_assets.py
@@ -17,6 +17,7 @@ sys.dont_write_bytecode = True
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, os.path.join(HERE, ".."))
from app_assets import Assets
+from aprs_symbols_20 import BITMAPS, BYTES_PER_ICON, CODES, WIDTH
# ---- station settings ----
SSID = 7 # F4HWN-7 (0-15, 0 = no SSID)
@@ -44,7 +45,8 @@ UI = [
("T_LON", "LON "),
("T_SSID", "SSID "), # FIELD_COL (5) characters: the value
("T_PATH", "PATH "), # starts at the same column
- ("T_HELP1", "0-9 digit * change F+* back"), # * on the bold field
+ ("T_SYM", "SYMB "), # selected APRS table/code pair
+ ("T_HELP1", "0-9, * change, F+* back"), # * on the bold field
("T_HELP2", "UP/DN move MENU ok EXIT"),
("T_BADPOS", "Invalid position"),
]
@@ -89,8 +91,13 @@ a.const("CFG_PATH", PATH)
a.raw("F_DEST", addr(DEST))
a.raw("F_WIDE", b"".join(addr(h) for h in WIDE))
a.u8("POS_DEF", POS + [HEMI])
-a.raw("F_SYM", SYMBOL.encode("ascii"))
a.raw("F_COMMENT", COMMENT.encode("ascii"))
+a.raw("SYM_CODES", "".join(CODES).encode("ascii"))
+a.raw("SYM_BITMAPS", BITMAPS)
+a.const("SYM_INDEX", CODES.index(SYMBOL))
+a.const("SYM_COUNT", len(CODES))
+a.const("SYM_W", WIDTH)
+a.const("SYM_BYTES", BYTES_PER_ICON)
a.u8("BMP_F", [0x3e,0x7f,0x41,0x75,0x75,0x75,0x7d,0x7f,0x3e]) # F armed, as FoxHunt / FM / Beacon
# scroll marks (status bar, x = 75, as APRS RX): up only, down only, both; up
# in bits 0-2 (rows hidden above), down in bits 4-6 (rows hidden below)
diff --git a/App/apps/aprstx/test/tx_model.py b/App/apps/aprstx/test/tx_model.py
index 58c8d126..afe6c8bb 100644
--- a/App/apps/aprstx/test/tx_model.py
+++ b/App/apps/aprstx/test/tx_model.py
@@ -51,25 +51,26 @@ def pos_ok(d):
CW_COMPACT = 14 # aprstx_app.c: the compact view
-def cfg_pack(lvl, tw, pos, hemi, ssid, path, cw=0):
- c = [0xA8, lvl, tw & 0xFF] + [0] * 9
+def cfg_pack(lvl, tw, pos, hemi, ssid, path, cw=0, sym=5):
+ c = [0xA8, lvl, tw & 0xFF] + [0] * 10
for i, x in enumerate(pos): c[3 + i // 2] |= x << ((i & 1) * 4)
c[9] |= hemi << 4
c[10] = 0x80 | path << 4 | ssid
c[11] = cw
+ c[12] = sym
return bytes(c)
def cfg_unpack(c, D):
"""aprstx_app.c app_main(): position, hemispheres, SSID, path (the
- defaults when byte 10 is erased or from a v0.2 config) and view (scroll
- unless byte 11 is CW_COMPACT: erased before v0.4)"""
+ defaults when byte 10 is erased or from a v0.2 config), view (scroll unless
+ byte 11 is CW_COMPACT) and symbol (default when byte 12 is erased)"""
pos = [(c[3 + i // 2] >> ((i & 1) * 4)) & 15 for i in range(13)]
cw = CW_COMPACT if c[11] == CW_COMPACT else 0
h = c[10]
if (h & 0xC0) == 0x80 and (h >> 4) & 3 <= 2:
- return pos, c[9] >> 4, h & 15, (h >> 4) & 3, cw
- return pos, c[9] >> 4, D["CFG_SSID"], D["CFG_PATH"], cw
+ return pos, c[9] >> 4, h & 15, (h >> 4) & 3, cw, c[12] if c[12] < D["SYM_COUNT"] else D["SYM_INDEX"]
+ return pos, c[9] >> 4, D["CFG_SSID"], D["CFG_PATH"], cw, c[12] if c[12] < D["SYM_COUNT"] else D["SYM_INDEX"]
def edit_row(label, d, h, cur):
@@ -86,7 +87,7 @@ def edit_row(label, d, h, cur):
return o + h, col
-CUR_NS, CUR_EW, CUR_SSID, CUR_PATH = 6, 14, 15, 16
+CUR_NS, CUR_EW, CUR_SSID, CUR_PATH, CUR_SYM = 6, 14, 15, 16, 17
def nav_dir(key, set_nav):
@@ -96,7 +97,7 @@ def nav_dir(key, set_nav):
return d if set_nav else -d
-def editor_keys(keys, ed, hemi=0, ssid=7, path=1, cur=0, set_nav=True):
+def editor_keys(keys, ed, hemi=0, ssid=7, path=1, sym=5, cur=0, set_nav=True):
"""aprstx_app.c handleKeys() in the editor: digits 0-9, '*', raw UP 'U' /
DOWN 'D' through nav_dir(), 'F'"""
ed = list(ed)
@@ -116,16 +117,18 @@ def editor_keys(keys, ed, hemi=0, ssid=7, path=1, cur=0, set_nav=True):
elif k == "*":
if cur <= CUR_EW: hemi ^= 2 if lon else 1
elif cur == CUR_SSID: ssid = (ssid + (15 if back else 1)) & 15
- elif back: path = path - 1 if path else 2
- else: path = path + 1 if path < 2 else 0
+ elif cur == CUR_PATH:
+ path = path - 1 if back and path else 2 if back else path + 1 if path < 2 else 0
+ elif back: sym = sym - 1 if sym else 47
+ else: sym = sym + 1 if sym < 47 else 0
else:
d = nav_dir(k, set_nav)
if d < 0 and cur: cur -= 1
- if d > 0 and cur < CUR_PATH: cur += 1
- return ed, hemi, ssid, path, cur
+ if d > 0 and cur < CUR_SYM: cur += 1
+ return ed, hemi, ssid, path, sym, cur
-def build_c(blob, D, call=CALL, pos=None, hemi=None, ssid=None, path=None):
+def build_c(blob, D, call=CALL, pos=None, hemi=None, ssid=None, path=None, sym=None):
"""aprstx_app.c build()"""
if not call or len(call) > 6 or "/" in call:
return None
@@ -135,9 +138,10 @@ def build_c(blob, D, call=CALL, pos=None, hemi=None, ssid=None, path=None):
hemi = pd[13] if hemi is None else hemi
ssid = D["CFG_SSID"] if ssid is None else ssid
path = D["CFG_PATH"] if path is None else path
- sym = rd("F_SYM").decode()
- info = "!" + put_coord(pos[:6], "S" if hemi & 1 else "N") + sym[0] + \
- put_coord(pos[6:], "W" if hemi & 2 else "E") + sym[1] + rd("F_COMMENT").decode()
+ sym = D["SYM_INDEX"] if sym is None else sym
+ pair = rd("SYM_CODES")[sym * 2:sym * 2 + 2].decode()
+ info = "!" + put_coord(pos[:6], "S" if hemi & 1 else "N") + pair[0] + \
+ put_coord(pos[6:], "W" if hemi & 2 else "E") + pair[1] + rd("F_COMMENT").decode()
f = bytearray(rd("F_DEST"))
f += bytes(ord(call[i]) << 1 if i < len(call) else 0x40 for i in range(6))
f.append(0x60 | (ssid << 1) | (0 if path else 1))
@@ -229,10 +233,16 @@ def main():
want = build("F4HWN-%d" % sid if sid else "F4HWN", dst="APZK5", path=WIDE[:path], info=info)
ok &= f3 == want
print("SSID %2d, path %d frame:" % (sid, path), f3 == want, decode(f3))
+ f3 = build_c(blob, D, sym=0)
+ want = build("F4HWN-7", dst="APZK5", path=["WIDE1-1"],
+ info="!4850.90N/00216.25E#UV-K5 & UV-K1 APRS TX")
+ ok &= f3 == want
+ print("selected /# symbol frame:", f3 == want, decode(f3))
c = cfg_pack(70, -2, pos, 3, 9, 2, CW_COMPACT)
- good = len(c) == 12 and cfg_unpack(c, D) == (pos, 3, 9, 2, CW_COMPACT)
+ good = len(c) == 13 and cfg_unpack(c, D) == (pos, 3, 9, 2, CW_COMPACT, 5)
old = cfg_pack(70, -2, pos, 3, 0, 0)[:10] # a v0.2 config: byte 10 erased or 0
- good &= all(cfg_unpack(old + bytes([b, 0xFF]), D) == (pos, 3, D["CFG_SSID"], D["CFG_PATH"], 0)
+ good &= all(cfg_unpack(old + bytes([b, 0xFF, 0xFF]), D) ==
+ (pos, 3, D["CFG_SSID"], D["CFG_PATH"], 0, D["SYM_INDEX"])
for b in (0xFF, 0x00)) # byte 11 erased: scroll view
ok &= good
print("config round trip, v0.2 config -> default SSID and path, scroll view:", good, c.hex())
@@ -250,21 +260,23 @@ def main():
# the cursor. Run for both SET_NAV settings: the raw key moving the cursor
# forward (nav_dir +1) is UP with SET_NAV, DOWN without.
typed = editor_keys("3352131511256", [0] * 13)
- good &= typed == (pos, 0, 7, 1, 13)
+ good &= typed == (pos, 0, 7, 1, 5, 13)
good &= editor_keys("2*", pos)[:2] == ([2] + pos[1:], 1) # '*' on a LAT digit
for sn in (True, False):
N, P = ("U", "D") if sn else ("D", "U") # next / previous field
k = lambda keys, **kw: editor_keys(keys, pos, set_nav=sn, **kw)
- good &= k(N)[4] == 1 and k(P)[4] == 0 and k(N + P)[4] == 0 # the raw keys' direction
- good &= k(P * 13 + N * 6 + "*")[1:] == (0 ^ 1, 7, 1, CUR_NS)
+ good &= k(N)[5] == 1 and k(P)[5] == 0 and k(N + P)[5] == 0 # the raw keys' direction
+ good &= k(P * 13 + N * 6 + "*")[1:] == (0 ^ 1, 7, 1, 5, CUR_NS)
good &= k(N * 14 + "*" + "5")[:2] == (pos, 2) # E/W: '*', a digit ignored
- good &= k(N * 15 + "**")[2:] == (9, 1, CUR_SSID)
- good &= k(N * 16 + "**" + N)[3:] == (0, CUR_PATH) # stops on the last field
+ good &= k(N * 15 + "**")[2:] == (9, 1, 5, CUR_SSID)
+ good &= k(N * 16 + "**" + N)[3:] == (0, 5, CUR_SYM)
good &= k(N * 15 + "F*F*")[2] == 5 # F then '*': SSID back
good &= k(N * 15 + "F*" * 8, ssid=3)[2] == 11 # ... wrapping 0 -> 15
good &= k(N * 16 + "F*F*F*")[3] == 1 # path back, 1 -> 0 -> 2 -> 1
good &= k(N * 15 + "FF*")[2] == 8 # F twice: disarmed
- good &= k(N * 15 + "F" + N + "*")[3:] == (2, CUR_PATH) # F used by a move, '*' forward
+ good &= k(N * 15 + "F" + N + "*")[3:] == (2, 5, CUR_PATH) # F used by a move, '*' forward
+ good &= k(N * 17 + "**")[4:] == (7, CUR_SYM) # symbol forward
+ good &= k(N * 17 + "F*")[4:] == (4, CUR_SYM) # symbol backward
ok &= good
print("editor keys (SET_NAV on and off):", good)
checks = [([4,8,5,0,9,0,0,0,2,1,6,2,5], True), ([9,0,0,0,0,0,1,8,0,0,0,0,0], True),
+