force to new usefull_macros lib

This commit is contained in:
2025-06-23 16:35:29 +03:00
parent db2c0e2d9c
commit 89815e8981
28 changed files with 1717 additions and 88 deletions

View File

@@ -29,8 +29,8 @@
#define BUFLEN (4096)
static TTY_descr *ttydescr = NULL;
extern glob_pars *GP;
static sl_tty_t *ttydescr = NULL;
static int emulate = FALSE;
static char buf[BUFLEN];
static const char *emultemplate = "0R0,S=1.9,D=217.2,P=787.7,T=10.8,H=69.0,R=31.0,Ri=0.0,Rs=Y";
@@ -41,7 +41,7 @@ static const char *emultemplate = "0R0,S=1.9,D=217.2,P=787.7,T=10.8,H=69.0,R=31.
*/
static char *read_string(){
//static int done = 0;
if(GP->emul){
if(emulate){
strncpy(buf, emultemplate, BUFLEN);
return buf;
}
@@ -49,16 +49,16 @@ static char *read_string(){
size_t r = 0, l;
int LL = BUFLEN - 1;
char *ptr = buf;
double d0 = dtime();
double d0 = sl_dtime();
do{
if((l = read_tty(ttydescr))){
if((l = sl_tty_read(ttydescr))){
strncpy(ptr, ttydescr->buf, LL);
r += l; LL -= l; ptr += l;
//DBG("l=%zd, r=%zd, LL=%d", l, r, LL);
d0 = dtime();
d0 = sl_dtime();
if(r > 2 && ptr[-1] == '\n') break;
}
}while(dtime() - d0 < WAIT_TMOUT && LL);
}while(sl_dtime() - d0 < WAIT_TMOUT && LL);
if(r){
//buf[r] = 0;
//DBG("buf: %s", buf);
@@ -71,20 +71,25 @@ static char *read_string(){
* Try to connect to `device` at baudrate speed
* @return 1 if OK
*/
int try_connect(char *device, int baudrate){
if(!device) return 0;
int try_connect(char *device, int baudrate, int emul){
if(emul){
emulate = TRUE;
DBG("Emulation mode");
return TRUE;
}
if(!device) return FALSE;
fflush(stdout);
ttydescr = new_tty(device, baudrate, 1024);
if(ttydescr) ttydescr = tty_open(ttydescr, 1); // exclusive open
if(!ttydescr) return 0;
while(read_tty(ttydescr)); // clear rbuf
ttydescr = sl_tty_new(device, baudrate, 1024);
if(ttydescr) ttydescr = sl_tty_open(ttydescr, 1); // exclusive open
if(!ttydescr) return FALSE;
while(sl_tty_read(ttydescr)); // clear rbuf
LOGMSG("Connected to %s", device);
return 1;
return TRUE;
}
// stop polling thread and close tty
void stop_tty(){
if(ttydescr) close_tty(&ttydescr);
if(ttydescr) sl_tty_close(&ttydescr);
}
static weather_t lastweather;
@@ -120,7 +125,7 @@ static int parseans(char *str, weather_t *w){
str += el->parlen;
char *endptr;
*el->weatherpar = strtod(str, &endptr);
DBG("found par: %s, val=%g", el->parname, *el->weatherpar);
//DBG("found par: %s, val=%g", el->parname, *el->weatherpar);
if(endptr == str){
DBG("Wrong double value");
*el->weatherpar = 0.;
@@ -133,19 +138,19 @@ static int parseans(char *str, weather_t *w){
str = strchr(str, ',');
//DBG("next=%s", str);
}while(str && *str);
lastweather.tmeasure = dtime();
lastweather.tmeasure = sl_dtime();
if(w) memcpy(w, &lastweather, sizeof(weather_t));
return TRUE;
}
// get weather measurements; return FALSE if something failed
int getlastweather(weather_t *w){
if(!GP->emul){
if(write_tty(ttydescr->comfd, "!0R0\r\n", 6))
if(!emulate){
if(sl_tty_write(ttydescr->comfd, "!0R0\r\n", 6))
return FALSE;
}
double t0 = dtime();
while(dtime() - t0 < T_POLLING_TMOUT){
double t0 = sl_dtime();
while(sl_dtime() - t0 < T_POLLING_TMOUT){
char *r = NULL;
if((r = read_string())){ // parse new data
//DBG("got %s", r);