seems like it works

This commit is contained in:
2026-04-09 18:35:06 +03:00
parent e551b94499
commit 5be6876f9e
14 changed files with 527 additions and 265 deletions

View File

@@ -20,6 +20,8 @@
#include "weathlib.h"
#define SENSOR_NAME "Old Reinhard meteostation"
//static const char *emultemplate = "<?U> 06:50:36, 20.01.00, TE-2.20, DR1405.50, WU2057.68, RT0.00, WK1.00, WR177.80, WT-2.20, FE0.69, RE0.00, WG7.36, WV260.03, TI0.00, FI0.00,";
enum{
@@ -34,17 +36,15 @@ enum{
NAMOUNT
};
extern sensordata_t sensor;
static const val_t values[NAMOUNT] = {
[NWIND] = {.sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_WIND},
[NWIND] = {.sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_WIND},
[NWINDDIR] = {.sense = VAL_RECOMMENDED,.type = VALT_FLOAT, .meaning = IS_WINDDIR},
[NHUMIDITY] = {.sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_HUMIDITY},
[NAMB_TEMP] = {.sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_AMB_TEMP},
[NPRESSURE] = {.sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_PRESSURE},
[NHUMIDITY] = {.sense = VAL_BROKEN, .type = VALT_FLOAT, .meaning = IS_HUMIDITY},
[NAMB_TEMP] = {.sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_AMB_TEMP},
[NPRESSURE] = {.sense = VAL_BROKEN, .type = VALT_FLOAT, .meaning = IS_PRESSURE},
[NCLOUDS] = {.sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_CLOUDS},
[NPRECIP] = {.sense = VAL_OBLIGATORY, .type = VALT_UINT, .meaning = IS_PRECIP},
[NPRECIPLVL]= {.sense = VAL_RECOMMENDED,.type = VALT_FLOAT, .meaning = IS_PRECIP_LEVEL},
[NPRECIP] = {.sense = VAL_RECOMMENDED, .type = VALT_UINT, .meaning = IS_PRECIP},
[NPRECIPLVL]= {.sense = VAL_UNNECESSARY,.type = VALT_FLOAT, .meaning = IS_PRECIP_LEVEL},
};
/**
@@ -70,124 +70,118 @@ static int getpar(char *string, double *Val, char *Name){
return TRUE;
}
static void *mainthread(void _U_ *U){
static void *mainthread(void *s){
FNAME();
char buf[BUFSIZ];
time_t tpoll = 0;
while(sensor.fdes > -1){
sensordata_t *sensor = (sensordata_t *)s;
while(sensor->fdes > -1){
time_t tnow = time(NULL);
if(tnow - tpoll > sensor.tpoll){
if(sl_tty_write(sensor.fdes, "?U\r\n", 4)){
if(tnow - tpoll > sensor->tpoll){
if(sl_tty_write(sensor->fdes, "?U\r\n", 4)){
WARN("Can't ask new data");
break;
}
DBG("poll @%zd, pollt=%zd", tnow, sensor.tpoll);
DBG("poll @%zd, pollt=%zd", tnow, sensor->tpoll);
tpoll = tnow;
}
int canread = sl_canread(sensor.fdes);
int canread = sl_canread(sensor->fdes);
if(canread < 0){
WARNX("Disconnected fd %d", sensor.fdes);
WARNX("Disconnected fd %d", sensor->fdes);
break;
}else if(canread == 1){
ssize_t got = read(sensor.fdes, buf, BUFSIZ);
ssize_t got = read(sensor->fdes, buf, BUFSIZ);
if(got > 0){
sl_RB_write(sensor.ringbuffer, (uint8_t*)buf, got);
sl_RB_write(sensor->ringbuffer, (uint8_t*)buf, got);
}else if(got < 0){
DBG("Disconnected?");
break;
}
}
if(sl_RB_datalen(sensor.ringbuffer) > BUFSIZ-1){
if(sl_RB_datalen(sensor->ringbuffer) > BUFSIZ-1){
WARNX("Overfull? Clear data from ring buffer");
sl_RB_clearbuf(sensor.ringbuffer);
sl_RB_clearbuf(sensor->ringbuffer);
}
if(sl_RB_readto(sensor.ringbuffer, '\n', (uint8_t*)buf, BUFSIZ-1) > 0){
if(sl_RB_readto(sensor->ringbuffer, '\n', (uint8_t*)buf, BUFSIZ-1) > 0){
tnow = time(NULL);
DBG("Got next: %s", buf);
pthread_mutex_lock(&sensor.valmutex);
pthread_mutex_lock(&sensor->valmutex);
double d;
//int Ngot = 0;
if(getpar(buf, &d, "RE")){
//++Ngot;
sensor.values[NPRECIPLVL].value.f = (float) d;
sensor.values[NPRECIPLVL].time = tnow;
sensor->values[NPRECIPLVL].value.f = (float) d;
sensor->values[NPRECIPLVL].time = tnow;
DBG("Got precip. lvl: %g", d);
}
if(getpar(buf, &d, "RT")){
//++Ngot;
sensor.values[NPRECIP].value.u = (d > 0.) ? 1 : 0;
sensor.values[NPRECIP].time = tnow;
sensor->values[NPRECIP].value.u = (d > 0.) ? 1 : 0;
sensor->values[NPRECIP].time = tnow;
DBG("Got precip.: %g", d);
}
if(getpar(buf, &d, "WU")){
//++Ngot;
sensor.values[NCLOUDS].value.f = (float) d;
sensor.values[NCLOUDS].time = tnow;
sensor->values[NCLOUDS].value.f = (float) d;
sensor->values[NCLOUDS].time = tnow;
DBG("Got clouds.: %g", d);
}
if(getpar(buf, &d, "TE")){
//++Ngot;
sensor.values[NAMB_TEMP].value.f = (float) d;
sensor.values[NAMB_TEMP].time = tnow;
sensor->values[NAMB_TEMP].value.f = (float) d;
sensor->values[NAMB_TEMP].time = tnow;
DBG("Got ext. T: %g", d);
}
if(getpar(buf, &d, "WG")){
//++Ngot;
d /= 3.6;
DBG("Wind: %g", d);
sensor.values[NWIND].value.f = (float) d;
sensor.values[NWIND].time = tnow;
sensor->values[NWIND].value.f = (float) d;
sensor->values[NWIND].time = tnow;
}
if(getpar(buf, &d, "WR")){
//++Ngot;
sensor.values[NWINDDIR].value.f = (float) d;
sensor.values[NWINDDIR].time = tnow;
sensor->values[NWINDDIR].value.f = (float) d;
sensor->values[NWINDDIR].time = tnow;
DBG("Winddir: %g", d);
}
if(getpar(buf, &d, "DR")){
//++Ngot;
sensor.values[NPRESSURE].value.f = (float) (d * 0.7500616);
sensor.values[NPRESSURE].time = tnow;
sensor->values[NPRESSURE].value.f = (float) (d * 0.7500616);
sensor->values[NPRESSURE].time = tnow;
DBG("Pressure: %g", d);
}
if(getpar(buf, &d, "FE")){
//++Ngot;
sensor.values[NHUMIDITY].value.f = (float) d;
sensor.values[NHUMIDITY].time = tnow;
sensor->values[NHUMIDITY].value.f = (float) d;
sensor->values[NHUMIDITY].time = tnow;
DBG("Humidity: %g", d);
}
pthread_mutex_unlock(&sensor.valmutex);
if(sensor.freshdatahandler) sensor.freshdatahandler(&sensor);
pthread_mutex_unlock(&sensor->valmutex);
if(sensor->freshdatahandler) sensor->freshdatahandler(sensor);
}
}
common_kill(&sensor);
sensor->kill(sensor);
return NULL;
}
static int init(struct sensordata_t *s, int N, time_t pollt, int fd){
sensordata_t *sensor_new(int N, time_t pollt, int fd){
FNAME();
if(!s || fd < 0) return -1;
sensor.PluginNo = N;
sensor.fdes = fd;
if(fd < 0) return NULL;
sensordata_t *s = common_new();
if(!s) return NULL;
s->Nvalues = NAMOUNT;
s->PluginNo = N;
s->fdes = fd;
strncpy(s->name, SENSOR_NAME, NAME_LEN);
if(pollt) s->tpoll = pollt;
if(pthread_create(&s->thread, NULL, mainthread, NULL)) return -1;
s->values = MALLOC(val_t, NAMOUNT);
for(int i = 0; i < NAMOUNT; ++i) s->values[i] = values[i];
if(!(s->ringbuffer = sl_RB_new(BUFSIZ))){
WARNX("Can't init ringbuffer!");
common_kill(s);
return -1;
if(!(s->ringbuffer = sl_RB_new(BUFSIZ)) ||
pthread_create(&s->thread, NULL, mainthread, (void*)s)){
s->kill(s);
return NULL;
}
return NAMOUNT;
return s;
}
sensordata_t sensor = {
.name = "Old Reinhard meteostation",
.Nvalues = NAMOUNT,
.init = init,
.onrefresh = common_onrefresh,
.valmutex = PTHREAD_MUTEX_INITIALIZER,
.get_value = common_getval,
.kill = common_kill,
};