eddy/small_tel
1
0
Fork 0
mirror of https://github.com/eddyem/small_tel.git synced 2026-03-21 09:10:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed for new vesrion of usefull_macros

Browse Source
This commit is contained in:
Edward Emelianov
2026-01-26 16:54:50 +03:00
parent 50cbaea550
commit a80347643f
25 changed files with 107 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Auxiliary_utils/Hydreon/cmdlnopts.c
View File

@@ -49,7 +49,7 @@ static glob_pars const Gdefault = {
* Define command line options by filling structure:
* name has_arg flag val type argptr help
*/
static myoption cmdlnopts[] = {
static sl_option_t cmdlnopts[] = {
// common options
{"help", NO_ARGS, NULL, 'h', arg_int, APTR(&help), _("show this help")},
{"device", NEED_ARG, NULL, 'd', arg_string, APTR(&G.device), _("serial device name (default: )" DEFAULT_DEV ")")},
@@ -75,10 +75,10 @@ glob_pars *parse_args(int argc, char **argv){
char helpstring[1024], *hptr = helpstring;
snprintf(hptr, hlen, "Usage: %%s [args]\n\n\tWhere args are:\n");
// format of help: "Usage: progname [args]\n"
change_helpstring(helpstring);
sl_helpstring(helpstring);
// parse arguments
parseargs(&argc, &argv, cmdlnopts);
if(help) showhelp(-1, cmdlnopts);
sl_parseargs(&argc, &argv, cmdlnopts);
if(help) sl_showhelp(-1, cmdlnopts);
if(argc > 0){
WARNX("Ignore %d unknown parameters: ");
for (i = 0; i < argc; i++)

16
Auxiliary_utils/Hydreon/dumpregs.c
View File

@@ -57,7 +57,7 @@ static void dumpRchanges(rg11 *new, rg11 *old){
int start = 1;
for(int i = 0; i < RREGNUM; ++i){
if(o[i] != n[i]){
sl_putlogt(start, globlog, LOGLEVEL_MSG, "%s=%d", regname(i), n[i]);
sl_putlogt(start, sl_globlog, LOGLEVEL_MSG, "%s=%d", regname(i), n[i]);
DBG("%s=%d", regname(i), n[i]);
if(start) start = 0;
}
@@ -68,7 +68,7 @@ static void dumpRchanges(rg11 *new, rg11 *old){
uint8_t f = 1;
for(int i = 0; i < RGBITNUM; ++i, f <<= 1){
if(xOr & f){
sl_putlogt(start, globlog, LOGLEVEL_MSG, "%s=%d", rgbitname(i), (new->RGBits & f) ? 1 : 0);
sl_putlogt(start, sl_globlog, LOGLEVEL_MSG, "%s=%d", rgbitname(i), (new->RGBits & f) ? 1 : 0);
DBG("%s=%d", rgbitname(i), (new->RGBits & f) ? 1 : 0);
if(start) start = 0;
}
@@ -82,7 +82,7 @@ static void dumpSchanges(slowregs *new, slowregs *old){
int start = 1;
for(int i = 0; i < SREGNUM; ++i){
if(o[i] != n[i]){
sl_putlogt(start, globlog, LOGLEVEL_MSG, "%s=%d", slowname(i), n[i]);
sl_putlogt(start, sl_globlog, LOGLEVEL_MSG, "%s=%d", slowname(i), n[i]);
DBG("%s=%d", slowname(i), n[i]);
if(start) start = 0;
}
@@ -147,12 +147,12 @@ static void puttotable(rg11 *R, slowregs *S){
}
int main(int argc, char **argv){
initial_setup();
sl_init();
char *self = strdup(argv[0]);
G = parse_args(argc, argv);
if(G->timeout < 5) ERRX("Timeout should be not less than 5 seconds");
if(!G->logfile && !G->outfile) ERRX("Point at least log or output file name");
check4running(self, G->pidfile);
sl_check4running(self, G->pidfile);
if(!hydreon_open(G->device)) return 1;
if(G->logfile) OPENLOG(G->logfile, LOGLEVEL_ANY, 0);
if(G->outfile){
@@ -166,9 +166,9 @@ int main(int argc, char **argv){
signal(SIGINT, signals); // ctrl+C - quit
signal(SIGQUIT, signals); // ctrl+\ - quit
signal(SIGTSTP, SIG_IGN); // ignore ctrl+Z
double t0 = dtime();
double t0 = sl_dtime();
puttotable(NULL, NULL);
while(dtime() - t0 < (double)G->timeout){ // dump only changes
while(sl_dtime() - t0 < (double)G->timeout){ // dump only changes
if(!hydreon_getpacket(&Rregs, &Sregs)) continue;
int changes = FALSE;
if(memcmp(&Rregs, &oRregs, RREGNUM + 1)){ // Rregs changed -> log changes
@@ -182,7 +182,7 @@ int main(int argc, char **argv){
changes = TRUE;
}
if(changes) puttotable(&Rregs, &Sregs);
t0 = dtime();
t0 = sl_dtime();
}
signals(-1); // never reached
return 0;

10
Auxiliary_utils/Hydreon/hydreon.c
View File

@@ -20,7 +20,7 @@
#include "hydreon.h"
static TTY_descr *dev = NULL;
static sl_tty_t *dev = NULL;
// regular registers names
static const char* rregnames[RREGNUM] = {
@@ -121,7 +121,7 @@ int hydreon_getpacket(rg11 *Rregs, slowregs *Sregs){
if(!dev) return 0;
static int buflen = 0;
static char strbuf[BUFLEN];
int l = read_tty(dev);
int l = sl_tty_read(dev);
if(l < 1) return FALSE;
char s = dev->buf[0];
if(s == 's'){ // start of new packet -> encode old
@@ -146,13 +146,13 @@ int hydreon_getpacket(rg11 *Rregs, slowregs *Sregs){
* @return TRUE or FALSE if failed
*/
int hydreon_open(const char *devname){
dev = new_tty((char*)devname, 1200, 1);
dev = sl_tty_new((char*)devname, 1200, 1);
if(!dev) return FALSE;
dev = tty_open(dev, 1);
dev = sl_tty_open(dev, 1);
if(!dev) return FALSE;
return TRUE;
}
void hydreon_close(){
if(dev) close_tty(&dev);
if(dev) sl_tty_close(&dev);
}