0
1
mirror of https://github.com/radio95-rnt/rds95.git synced 2026-02-26 20:33:53 +01:00

massive lua api refactor

This commit is contained in:
2026-01-20 19:50:04 +01:00
parent 97f9b3069c
commit 53c9169330
15 changed files with 976 additions and 776 deletions

View File

@@ -40,52 +40,52 @@ function data_handle(data)
data = data:lower()
if data == "ver" then return string.format("rds95 core v. %s - (C) 2025 radio95 - lua parser\r\n", core_version)
elseif data == "init" then
set_rds_program_defaults()
dp.set_rds_program_defaults()
return "+\r\n"
elseif data == "reset" then
reset_rds()
dp.reset_rds()
return "+\r\n"
elseif data == "pi" then return string.format("PI=%s\r\n", string.format("%x", get_rds_pi()))
elseif data == "pty" then return string.format("PTY=%s\r\n", string.format("%d", get_rds_pty()))
elseif data == "ecc" then return string.format("ECC=%s\r\n", string.format("%x", get_rds_ecc()))
elseif data == "slcd" then return string.format("SLCD=%s\r\n", string.format("%x", get_rds_slc_data()))
elseif data == "ct" then return string.format("CT=%s\r\n", string.format("%d", (get_rds_ct() and 1 or 0)))
elseif data == "dpty" then return string.format("DPTY=%s\r\n", string.format("%d", (get_rds_dpty() and 1 or 0)))
elseif data == "tp" then return string.format("TP=%s\r\n", string.format("%d", (get_rds_tp() and 1 or 0)))
elseif data == "ta" then return string.format("TA=%s\r\n", string.format("%d", (get_rds_ta() and 1 or 0)))
elseif data == "rt1en" then return string.format("RT1EN=%s\r\n", string.format("%d", (get_rds_rt1_enabled() and 1 or 0)))
elseif data == "rt2en" then return string.format("RT2EN=%s\r\n", string.format("%d", (get_rds_rt2_enabled() and 1 or 0)))
elseif data == "ptynen" then return string.format("PTYNEN=%s\r\n", string.format("%d", (get_rds_ptyn_enabled() and 1 or 0)))
elseif data == "rttype" then return string.format("RTTYPE=%s\r\n", string.format("%d", get_rds_rt_type()))
elseif data == "rds2mod" then return string.format("RDS2MOD=%s\r\n", string.format("%d", get_rds2_mode()))
elseif data == "pi" then return string.format("PI=%s\r\n", string.format("%x", rds.get_pi()))
elseif data == "pty" then return string.format("PTY=%s\r\n", string.format("%d", rds.get_pty()))
elseif data == "ecc" then return string.format("ECC=%s\r\n", string.format("%x", rds.get_ecc()))
elseif data == "slcd" then return string.format("SLCD=%s\r\n", string.format("%x", rds.get_slc_data()))
elseif data == "ct" then return string.format("CT=%s\r\n", string.format("%d", (rds.get_ct() and 1 or 0)))
elseif data == "dpty" then return string.format("DPTY=%s\r\n", string.format("%d", (rds.get_dpty() and 1 or 0)))
elseif data == "tp" then return string.format("TP=%s\r\n", string.format("%d", (rds.get_tp() and 1 or 0)))
elseif data == "ta" then return string.format("TA=%s\r\n", string.format("%d", (rds.get_ta() and 1 or 0)))
elseif data == "rt1en" then return string.format("RT1EN=%s\r\n", string.format("%d", (rds.get_rt1_enabled() and 1 or 0)))
elseif data == "rt2en" then return string.format("RT2EN=%s\r\n", string.format("%d", (rds.get_rt2_enabled() and 1 or 0)))
elseif data == "ptynen" then return string.format("PTYNEN=%s\r\n", string.format("%d", (rds.get_ptyn_enabled() and 1 or 0)))
elseif data == "rttype" then return string.format("RTTYPE=%s\r\n", string.format("%d", rds.get_rt_type()))
elseif data == "rds2mod" then return string.format("RDS2MOD=%s\r\n", string.format("%d", rds.get_rds2_mode()))
elseif data == "rdsgen" then return string.format("RDSGEN=%s\r\n", string.format("%d", get_rds_streams()))
elseif data == "level" then return string.format("LEVEL=%s\r\n", string.format("%d", get_rds_level() * 255))
elseif data == "link" then return string.format("LINK=%s\r\n", string.format("%d", (get_rds_link() and 1 or 0)))
elseif data == "link" then return string.format("LINK=%s\r\n", string.format("%d", (rds.get_link() and 1 or 0)))
elseif data == "rtp" then
local t1, s1, l1, t2, s2, l2 = get_rds_rtplus_tags(false)
local t1, s1, l1, t2, s2, l2 = rds.ext.get_rtplus_tags(false)
return string.format("RTP=%d,%d,%d,%d,%d,%d\r\n", t1, s1, l1, t2, s2, l2)
elseif data == "ertp" then
local t1, s1, l1, t2, s2, l2 = get_rds_rtplus_tags(true)
local t1, s1, l1, t2, s2, l2 = rds.ext.get_rtplus_tags(true)
return string.format("ERTP=%d,%d,%d,%d,%d,%d\r\n", t1, s1, l1, t2, s2, l2)
elseif data == "rtprun" then
local running = get_rds_rtp_meta(false)
local running = rds.ext.get_rtp_meta(false)
local f1 = 2 or (running and 1 or 0)
return string.format("RTPRUN=%d\r\n", f1)
elseif data == "ertprun" then
local running = get_rds_rtp_meta(true)
local running = rds.ext.get_rtp_meta(true)
local f1 = 2 or (running and 1 or 0)
return string.format("ERTPRUN=%d\r\n", f1)
elseif data == "lps" then return string.format("LPS=%s\r\n", get_rds_lps())
elseif data == "ert" then return string.format("ERT=%s\r\n", get_rds_ert())
elseif data == "grpseq" then return string.format("GRPSEQ=%s\r\n", get_rds_grpseq())
elseif data == "grpseq2" then return string.format("GRPSEQ2=%s\r\n", get_rds_grpseq2())
elseif data == "lps" then return string.format("LPS=%s\r\n", rds.get_lps())
elseif data == "ert" then return string.format("ERT=%s\r\n", rds.ext.get_ert())
elseif data == "grpseq" then return string.format("GRPSEQ=%s\r\n", rds.get_grpseq())
elseif data == "grpseq2" then return string.format("GRPSEQ2=%s\r\n", rds.get_grpseq2())
else
local eon_cmd, eon_num = data:match("^eon(%d+)([a-z]+)$")
if eon_cmd then
local eon_idx = tonumber(eon_cmd)
if not eon_idx or eon_idx < 1 or eon_idx > eon_count then return "?\r\n" end
if not eon_idx or eon_idx < 1 or eon_idx > rds.eon_count then return "?\r\n" end
eon_idx = eon_idx - 1
local enabled, pi, tp, ta, pty, ps, afs, data_val = get_rds_eon(eon_idx)
local enabled, pi, tp, ta, pty, ps, afs, data_val = rds.get_eon(eon_idx)
if eon_num == "en" then return string.format("EON%dEN=%d\r\n", eon_idx + 1, enabled and 1 or 0)
elseif eon_num == "pi" then return string.format("EON%dPI=%x\r\n", eon_idx + 1, pi)
@@ -106,48 +106,48 @@ function data_handle(data)
local eon_num, eon_type = cmd:match("^eon(%d+)([a-z]+)$")
if eon_num then
local eon_idx = tonumber(eon_num)
if not eon_idx or eon_idx < 1 or eon_idx > eon_count then return "?\r\n" end
if not eon_idx or eon_idx < 1 or eon_idx > rds.eon_count then return "?\r\n" end
eon_idx = eon_idx - 1
local enabled, pi, tp, ta, pty, ps, afs, data_val = get_rds_eon(eon_idx)
local enabled, pi, tp, ta, pty, ps, afs, data_val = rds.get_eon(eon_idx)
if eon_type == "en" then
local en_val = tonumber(value)
if not en_val then return "-\r\n" end
enabled = (en_val ~= 0)
set_rds_eon(eon_idx, enabled, pi, tp, ta, pty, ps, afs, data_val)
rds.set_eon(eon_idx, enabled, pi, tp, ta, pty, ps, afs, data_val)
return "+\r\n"
elseif eon_type == "pi" then
local pi_val = tonumber(value, 16)
if not pi_val then return "-\r\n" end
set_rds_eon(eon_idx, enabled, pi_val, tp, ta, pty, ps, afs, data_val)
rds.set_eon(eon_idx, enabled, pi_val, tp, ta, pty, ps, afs, data_val)
return "+\r\n"
elseif eon_type == "ps" then
local ps_val = value:sub(1, 24)
set_rds_eon(eon_idx, enabled, pi, tp, ta, pty, ps_val, afs, data_val)
rds.set_eon(eon_idx, enabled, pi, tp, ta, pty, ps_val, afs, data_val)
return "+\r\n"
elseif eon_type == "pty" then
local pty_val = tonumber(value)
if not pty_val then return "-\r\n" end
set_rds_eon(eon_idx, enabled, pi, tp, ta, pty_val, ps, afs, data_val)
rds.set_eon(eon_idx, enabled, pi, tp, ta, pty_val, ps, afs, data_val)
return "+\r\n"
elseif eon_type == "ta" then
if not enabled or not tp then return "-\r\n" end
local ta_val = tonumber(value)
if not ta_val then return "-\r\n" end
ta = (ta_val ~= 0)
set_rds_eon(eon_idx, enabled, pi, tp, ta, pty, ps, afs, data_val)
if ta then set_rds_ta(true) end
rds.set_eon(eon_idx, enabled, pi, tp, ta, pty, ps, afs, data_val)
if ta then rds.set_ta(true) end
return "+\r\n"
elseif eon_type == "tp" then
local tp_val = tonumber(value)
if not tp_val then return "-\r\n" end
tp = (tp_val ~= 0)
set_rds_eon(eon_idx, enabled, pi, tp, ta, pty, ps, afs, data_val)
rds.set_eon(eon_idx, enabled, pi, tp, ta, pty, ps, afs, data_val)
return "+\r\n"
elseif eon_type == "af" then
local af_table = {}
if value == "" or value == "0" then
set_rds_eon(eon_idx, enabled, pi, tp, ta, pty, ps, {}, data_val)
rds.set_eon(eon_idx, enabled, pi, tp, ta, pty, ps, {}, data_val)
return "+\r\n"
end
for freq_str in value:gmatch("([^,]+)") do
@@ -156,12 +156,12 @@ function data_handle(data)
else return "-\r\n" end
end
if #af_table > 25 then return "-\r\n" end
set_rds_eon(eon_idx, enabled, pi, tp, ta, pty, ps, af_table, data_val)
rds.set_eon(eon_idx, enabled, pi, tp, ta, pty, ps, af_table, data_val)
return "+\r\n"
elseif eon_type == "dt" then
local dt_val = tonumber(value, 16)
if not dt_val then return "-\r\n" end
set_rds_eon(eon_idx, enabled, pi, tp, ta, pty, ps, afs, dt_val)
rds.set_eon(eon_idx, enabled, pi, tp, ta, pty, ps, afs, dt_val)
return "+\r\n"
else return "?\r\n" end
end
@@ -179,7 +179,7 @@ function data_handle(data)
end
if #groups > 8 or #groups == 0 then return "-\r\n" end
set_rds_udg(xy, groups)
rds.set_udg(xy, groups)
return "+\r\n"
end
if udg2_num then
@@ -193,7 +193,7 @@ function data_handle(data)
end
if #groups > 8 or #groups == 0 then return "-" end
set_rds_udg2(xy, groups)
rds.set_udg2(xy, groups)
return "+\r\n"
end
@@ -201,67 +201,67 @@ function data_handle(data)
local pi = tonumber(value, 16)
if not pi then return "-\r\n" end
if (pi & 0xF000) == 0 then return "-\r\n" end
set_rds_pi(pi)
rds.set_pi(pi)
return "+\r\n"
elseif cmd == "ecc" then
local ecc = tonumber(value, 16)
if not ecc then return "-\r\n" end
set_rds_ecc(ecc)
rds.set_ecc(ecc)
return "+\r\n"
elseif cmd == "pty" then
local pty = tonumber(value)
if not pty then return "-\r\n" end
set_rds_pty(pty)
rds.set_pty(pty)
return "+\r\n"
elseif cmd == "slcd" then
local slc_data = tonumber(value, 16)
if not slc_data then return "-\r\n" end
set_rds_slc_data(slc_data)
rds.set_slc_data(slc_data)
return "+\r\n"
elseif cmd == "ct" then
local ct = tonumber(value)
if not ct then return "-\r\n" end
set_rds_ct(ct ~= 0)
rds.set_ct(ct ~= 0)
return "+\r\n"
elseif cmd == "dpty" then
local dpty = tonumber(value)
if not dpty then return "-\r\n" end
set_rds_dpty(dpty ~= 0)
rds.set_dpty(dpty ~= 0)
return "+\r\n"
elseif cmd == "tp" then
local tp = tonumber(value)
if not tp then return "-\r\n" end
set_rds_tp(tp ~= 0)
rds.set_tp(tp ~= 0)
return "+\r\n"
elseif cmd == "ta" then
local ta = tonumber(value)
if not ta then return "-\r\n" end
set_rds_ta(ta ~= 0)
rds.set_ta(ta ~= 0)
return "+\r\n"
elseif cmd == "rt1en" then
local en = tonumber(value)
if not en then return "-\r\n" end
set_rds_rt1_enabled(en ~= 0)
rds.set_rt1_enabled(en ~= 0)
return "+\r\n"
elseif cmd == "rt2en" then
local en = tonumber(value)
if not en then return "-\r\n" end
set_rds_rt2_enabled(en ~= 0)
rds.set_rt2_enabled(en ~= 0)
return "+\r\n"
elseif cmd == "ptynen" then
local en = tonumber(value)
if not en then return "-\r\n" end
set_rds_ptyn_enabled(en ~= 0)
rds.set_ptyn_enabled(en ~= 0)
return "+\r\n"
elseif cmd == "rttype" then
local type = tonumber(value)
if not type then return "-\r\n" end
set_rds_rt_type(type)
rds.set_rt_type(type)
return "+\r\n"
elseif cmd == "rds2mod" then
local type = tonumber(value)
if not type then return "-\r\n" end
set_rds2_mode(type)
rds.set_rds2_mode(type)
return "+\r\n"
elseif cmd == "rdsgen" then
local type = tonumber(value)
@@ -269,42 +269,42 @@ function data_handle(data)
set_rds_streams(type)
return "+\r\n"
elseif cmd == "ptyn" then
set_rds_ptyn(value)
rds.set_ptyn(value)
return "+\r\n"
elseif cmd == "ps" then
set_rds_ps(value)
rds.set_ps(value)
return "+\r\n"
elseif cmd == "tps" then
set_rds_tps(value)
rds.set_tps(value)
return "+\r\n"
elseif cmd == "rt1" or cmd == "text" then
set_rds_rt1(value)
rds.set_rt1(value)
return "+\r\n"
elseif cmd == "rt2" then
set_rds_rt2(value)
rds.set_rt2(value)
return "+\r\n"
elseif cmd == "lps" then
set_rds_lps(value)
rds.set_lps(value)
return "+\r\n"
elseif cmd == "ert" then
set_rds_ert(value)
rds.ext.set_ert(value)
return "+\r\n"
elseif cmd == "link" then
local link = tonumber(value)
if not link then return "-\r\n" end
set_rds_link(link ~= 0)
rds.set_link(link ~= 0)
return "+\r\n"
elseif cmd == "rtper" then
local period = tonumber(value)
if not period then return "-\r\n" end
set_rds_rt_switching_period(period*60)
rds.set_rt_switching_period(period*60)
return "+\r\n"
elseif cmd == "program" then
local program = tonumber(value)
if not program then return "-\r\n" end
if program < 1 or program > max_programs then return "-\r\n" end
set_rds_program(program-1)
set_rds_ta(false)
if program < 1 or program > dp.max_programs then return "-\r\n" end
dp.set_rds_program(program-1)
rds.set_ta(false)
return "+\r\n"
elseif cmd == "level" then
local level = tonumber(value)
@@ -314,20 +314,20 @@ function data_handle(data)
elseif cmd == "dttmout" then
local timeout = tonumber(value)
if not timeout then return "-\r\n" end
set_rds_rt_text_timeout(timeout*60)
rds.set_rt_text_timeout(timeout*60)
return "+\r\n"
elseif cmd == "grpseq" then
set_rds_grpseq(value)
rds.set_grpseq(value)
return "+\r\n"
elseif cmd == "grpseq2" then
set_rds_grpseq2(value)
rds.set_grpseq2(value)
return "+\r\n"
elseif cmd == "rtp" or cmd == "ertp" then
local is_ertp = (cmd == "ertp")
local t1, s1, l1, t2, s2, l2 = value:match("(%d+),(%d+),(%d+),(%d+),(%d+),(%d+)")
if not l2 then return "-\r\n" end
set_rds_rtplus_tags(
rds.ext.set_rtplus_tags(
is_ertp,
---@diagnostic disable-next-line: param-type-mismatch
tonumber(t1), tonumber(s1), tonumber(l1), tonumber(t2), tonumber(s2), tonumber(l2)
@@ -336,13 +336,13 @@ function data_handle(data)
elseif cmd == "g" then
local a, b, c, d = value:match("^(%x%x%x%x)(%x%x%x%x)(%x%x%x%x)(%x%x%x%x)$")
if a and b and c and d then
put_rds2_custom_group(tonumber(a, 16), tonumber(b, 16), tonumber(c, 16), tonumber(d, 16))
rds.put_rds2_custom_group(tonumber(a, 16), tonumber(b, 16), tonumber(c, 16), tonumber(d, 16))
return "+\r\n"
end
local b1, c1, d1 = value:match("^(%x%x%x%x)(%x%x%x%x)(%x%x%x%x)$")
if b1 and c1 and d1 then
put_rds_custom_group(tonumber(b1, 16), tonumber(c1, 16), tonumber(d1, 16))
rds.put_custom_group(tonumber(b1, 16), tonumber(c1, 16), tonumber(d1, 16))
return "+\r\n"
end
@@ -357,14 +357,14 @@ function data_handle(data)
local f2 = tonumber(f2_str) or 0
local running = (f1 & 1) ~= 0
set_rds_rtp_meta(is_ertp, running)
if f2 ~= 0 then toggle_rds_rtp(is_ertp) end
rds.ext.set_rtp_meta(is_ertp, running)
if f2 ~= 0 then rds.ext.toggle_rtp(is_ertp) end
return "+\r\n"
elseif cmd == "af" then
local af_table = {}
if value == "" or value == "0" then
set_rds_af_group0({})
rds.set_af({})
return "+\r\n"
end
@@ -376,13 +376,13 @@ function data_handle(data)
if #af_table > 25 then return "-\r\n" end
set_rds_af_group0(af_table)
rds.set_af(af_table)
return "+\r\n"
elseif cmd == "afo" then
local af_table = {}
if value == "" or value == "0" then
set_rds_af_oda({})
rds.ext.set_af_oda({})
return "+\r\n"
end
@@ -394,7 +394,7 @@ function data_handle(data)
if #af_table > 25 then return "-\r\n" end
set_rds_af_oda(af_table)
rds.ext.set_af_oda(af_table)
return "+\r\n"
else
return "?\r\n"