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

fix weatherdaemon for new usefull_macros

Browse Source
This commit is contained in:
Edward Emelianov
2025-06-23 11:08:39 +03:00
parent cc8e915546
commit 453a56429d
34 changed files with 2979 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Daemons/weatherdaemon/term.c
View File

@@ -29,7 +29,7 @@
#define BUFLEN (4096)
TTY_descr *ttydescr = NULL;
sl_tty_t *ttydescr = NULL;
extern glob_pars *GP;
static char buf[BUFLEN];
@@ -51,15 +51,20 @@ 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();
if(ptr[-1] == '\n'){
DBG("Got newline");
ptr[-1] = 0;
break;
}
d0 = sl_dtime();
}
}while(dtime() - d0 < WAIT_TMOUT && LL);
}while(sl_dtime() - d0 < WAIT_TMOUT && LL);
if(r){
//buf[r] = 0;
DBG("buf: %s", buf);
@@ -75,10 +80,10 @@ static char *read_string(){
int try_connect(char *device, int baudrate){
if(!device) return 0;
fflush(stdout);
ttydescr = new_tty(device, baudrate, 1024);
if(ttydescr) ttydescr = tty_open(ttydescr, 1); // exclusive open
ttydescr = sl_tty_new(device, baudrate, 1024);
if(ttydescr) ttydescr = sl_tty_open(ttydescr, 1); // exclusive open
if(!ttydescr) return 0;
while(read_tty(ttydescr)); // clear rbuf
while(sl_tty_read(ttydescr)); // clear rbuf
LOGMSG("Connected to %s", device);
return 1;
}
@@ -111,16 +116,17 @@ static int getpar(char *string, double *Val, char *Name){
* Poll serial port for new dataportion
* @return: NULL if no data received, pointer to string if valid data received
*/
char *poll_device(){
char *poll_device(char *ans, int anslen){
FNAME();
static char ans[BUFLEN];
// gust (>10m/s) time
static time_t gustt = 0., btagustt = 0.;
char *ptr = ans, *r = NULL;
if(!GP->emul){
if(write_tty(ttydescr->comfd, "?U\r\n", 4))
if(sl_tty_write(ttydescr->comfd, "?U\r\n", 4))
return NULL;
}
double t0 = dtime();
while(dtime() - t0 < T_POLLING_TMOUT){
double t0 = sl_dtime();
while(sl_dtime() - t0 < T_POLLING_TMOUT){
if((r = read_string())){ // parse new data
DBG("got %s", r);
if(strncmp(r, "<?U>", 4)){
@@ -135,21 +141,29 @@ char *poll_device(){
char *eol = strchr(r, '\n');
if(eol) *eol = 0;
double d;
size_t L = BUFLEN, l;
int L = anslen - 1, l;
time_t tnow = time(NULL);
#define PRINT(...) do{l = snprintf(ptr, L, __VA_ARGS__); if(l > 0){ L -= l; ptr += l;}}while(0)
if(getpar(r, &d, "RT")) PRINT("Rain=%g\n", d);
if(getpar(r, &d, "WU")) PRINT("Clouds=%.1f\n", d);
if(getpar(r, &d, "TE")) PRINT("Exttemp=%.1f\n", d);
if(getpar(r, &d, "WG")) PRINT("Wind=%.1f\n", d/3.6);
if(getpar(r, &d, "WG")){
d /= 3.6;
PRINT("Wind=%.1f\n", d);
if(d > GUST_WIND) gustt = tnow;
}
if(tnow - gustt < GUST_MAX_TIME) PRINT("Gusttime=%lld\n", (long long)gustt);
// now get BTA parameters
if(check_shm_block(&sdat)){
PRINT("BTAExttemp=%.1f\n", val_T1);
PRINT("BTAPres=%.1f\n", val_B);
PRINT("BTAWind=%.1f\n", val_Wnd);
if(val_Wnd > GUST_WIND) btagustt = tnow;
if(tnow - btagustt < GUST_MAX_TIME) PRINT("BTAGusttime=%lld\n", (long long)btagustt);
PRINT("BTAHumid=%.1f\n", val_Hmd);
}
#undef PRINT
snprintf(ptr, L, "Time=%lld\n", (long long)time(NULL));
snprintf(ptr, L, "Time=%lld\n", (long long)tnow);
DBG("Buffer: %s", ans);
return ans;
}