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

some fixes, sill have troubles with dummy socket/fd

Browse Source
This commit is contained in:
Edward Emelianov
2026-03-06 12:20:10 +03:00
parent 7c2aaf1cb0
commit 205a190820
11 changed files with 203 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Daemons/weatherdaemon_multimeteo/plugins/CMakeLists.txt
View File

@@ -6,8 +6,8 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(PLUGINS REQUIRED usefull_macros)
include_directories(${PLUGINS_INCLUDE_DIRS} ..)
link_directories(${PLUGINS_LIBRARY_DIRS})
link_libraries(${$PLUGINS_LIBRARIES} -fPIC)
link_directories(${PLUGINS_LIBRARY_DIRS} ..)
link_libraries(${$PLUGINS_LIBRARIES} ${PROJLIB} -fPIC)
set(LIBS "")

96
Daemons/weatherdaemon_multimeteo/plugins/dummy.c
View File

@@ -16,94 +16,72 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// dummy meteostation sending data each `dt` seconds
#include <pthread.h>
#include <signal.h>
#include <usefull_macros.h>
// dummy meteostation sending data each `tpoll` seconds
#include "weathlib.h"
#define NS (6)
extern sensordata_t sensor;
static double dt = 1.;
static void (*freshdatahandler)(const struct sensordata_t* const) = NULL; // do nothing with fresh data
static pthread_t thread;
static val_t values[NS] = { // fields `name` and `comment` have no sense until value meaning is `IS_OTHER`
{.name = "WIND", .comment = "wind speed, m/s", .sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_WIND},
{.name = "WINDDIR", .comment = "wind direction azimuth (from south over west), deg", .sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_WINDDIR},
{.name = "EXTTEMP", .comment = "external temperature, degC", .sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_AMB_TEMP},
{.name = "PRESSURE", .comment = "atmospheric pressure, hPa", .sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_PRESSURE},
{.name = "HUMIDITY", .comment = "air relative humidity, %%", .sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_HUMIDITY},
{.name = "PRECIP", .comment = "precipitations flag (0 - no, 1 - yes)", .sense = VAL_OBLIGATORY, .type = VALT_UINT, .meaning = IS_PRECIP},
static const val_t values[NS] = { // fields `name` and `comment` have no sense until value meaning is `IS_OTHER`
{.sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_WIND},
{.sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_WINDDIR},
{.sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_AMB_TEMP},
{.sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_PRESSURE},
{.sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_HUMIDITY},
{.sense = VAL_OBLIGATORY, .type = VALT_UINT, .meaning = IS_PRECIP},
};
static void *mainthread(void _U_ *U){
FNAME();
double t0 = sl_dtime();
while(1){
float f = values[0].value.f + (drand48() - 0.5) / 2.;
if(f >= 0.) values[0].value.f = f;
f = values[1].value.f + (drand48() - 0.5) * 4.;
if(f > 160. && f < 200.) values[1].value.f = f;
f = values[2].value.f + (drand48() - 0.5) / 20.;
if(f > 13. && f < 21.) values[2].value.f = f;
f = values[3].value.f + (drand48() - 0.5) / 100.;
if(f > 585. && f < 615.) values[3].value.f = f;
f = values[4].value.f + (drand48() - 0.5) / 10.;
if(f > 60. && f <= 100.) values[4].value.f = f;
values[5].value.u = (f > 98.) ? 1 : 0;
float f = sensor.values[0].value.f + (drand48() - 0.5) / 2.;
if(f >= 0.) sensor.values[0].value.f = f;
f = sensor.values[1].value.f + (drand48() - 0.5) * 4.;
if(f > 160. && f < 200.) sensor.values[1].value.f = f;
f = sensor.values[2].value.f + (drand48() - 0.5) / 20.;
if(f > 13. && f < 21.) sensor.values[2].value.f = f;
f = sensor.values[3].value.f + (drand48() - 0.5) / 100.;
if(f > 585. && f < 615.) sensor.values[3].value.f = f;
f = sensor.values[4].value.f + (drand48() - 0.5) / 10.;
if(f > 60. && f <= 100.) sensor.values[4].value.f = f;
sensor.values[5].value.u = (f > 98.) ? 1 : 0;
time_t cur = time(NULL);
for(int i = 0; i < NS; ++i) values[i].time = cur;
if(freshdatahandler) freshdatahandler(&sensor);
while(sl_dtime() - t0 < dt) usleep(500);
for(int i = 0; i < NS; ++i) sensor.values[i].time = cur;
if(sensor.freshdatahandler) sensor.freshdatahandler(&sensor);
while(sl_dtime() - t0 < sensor.tpoll) usleep(500);
t0 = sl_dtime();
}
return NULL;
}
static int init(int N, time_t pollt, int _U_ fd){
static int init(struct sensordata_t* s, int N, time_t pollt, int _U_ fd){
FNAME();
values[0].value.f = 1.;
values[1].value.f = 180.;
values[2].value.f = 17.;
values[3].value.f = 600.;
values[4].value.f = 80.;
values[5].value.u = 0;
if(pthread_create(&thread, NULL, mainthread, NULL)) return 0;
if(pthread_create(&s->thread, NULL, mainthread, NULL)) return 0;
if(pollt) s->tpoll = pollt;
s->values = MALLOC(val_t, NS);
for(int i = 0; i < NS; ++i) s->values[i] = values[i];
sensor.values[0].value.f = 1.;
sensor.values[1].value.f = 180.;
sensor.values[2].value.f = 17.;
sensor.values[3].value.f = 600.;
sensor.values[4].value.f = 80.;
sensor.values[5].value.u = 0;
sensor.PluginNo = N;
if(pollt) dt = (double) pollt; // refresh each `pollt` seconds
return NS;
}
static int onrefresh(void (*handler)(const struct sensordata_t* const)){
FNAME();
if(!handler) return FALSE;
freshdatahandler = handler;
return TRUE;
}
static void die(){
FNAME();
if(0 == pthread_kill(thread, 9)){
DBG("Killed, join");
pthread_join(thread, NULL);
DBG("Done");
}
}
/**
* @brief getval - value's getter
* @param o (o) - value
* @param N - it's index
* @return FALSE if failed
*/
static int getval(val_t *o, int N){
static int getval(struct sensordata_t* s, val_t *o, int N){
if(N < 0 || N >= NS) return FALSE;
if(o) *o = values[N];
if(o) *o = s->values[N];
return TRUE;
}
@@ -111,7 +89,7 @@ sensordata_t sensor = {
.name = "Dummy weatherstation",
.Nvalues = NS,
.init = init,
.onrefresh = onrefresh,
.onrefresh = common_onrefresh,
.get_value = getval,
.die = die,
.kill = common_kill,
};

111
Daemons/weatherdaemon_multimeteo/plugins/fdexample.c
View File

@@ -16,11 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <pthread.h>
#include <signal.h> // pthread_kill
#include <string.h>
#include <time.h>
#include <usefull_macros.h>
#include "weathlib.h"
@@ -28,19 +25,13 @@
#define NS (4)
static time_t Tpoll = 10;
extern sensordata_t sensor;
static int fdes = -1;
static sl_ringbuffer_t *rb;
static pthread_t thread;
static void (*freshdatahandler)(const struct sensordata_t* const) = NULL;
static void die();
static val_t values[NS] = { // fields `name` and `comment` have no sense until value meaning is `IS_OTHER`
{.name = "WIND", .sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_WIND},
{.name = "EXTTEMP", .sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_AMB_TEMP},
{.name = "PRESSURE", .sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_PRESSURE},
{.name = "HUMIDITY", .sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_HUMIDITY},
static const val_t values[NS] = { // fields `name` and `comment` have no sense until value meaning is `IS_OTHER`
{.sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_WIND},
{.sense = VAL_OBLIGATORY, .type = VALT_FLOAT, .meaning = IS_AMB_TEMP},
{.sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_PRESSURE},
{.sense = VAL_RECOMMENDED, .type = VALT_FLOAT, .meaning = IS_HUMIDITY},
};
static int format_values(char *buf){
@@ -52,8 +43,8 @@ static int format_values(char *buf){
DBG("TOKEN: %s", token);
if(sl_str2d(&v, token)){
DBG("next value: %g", v);
values[gotvals].value.f = (float) v;
values[gotvals].time = tnow;
sensor.values[gotvals].value.f = (float) v;
sensor.values[gotvals].time = tnow;
++gotvals;
}
token = strtok(NULL, ",");
@@ -91,32 +82,34 @@ static void *mainthread(void _U_ *U){
time_t task = 0;
const char begging[] = "Enter comma-separated data: wind, exttemp, pressure, humidity\n";
char buf[128];
while(fdes > -1){
while(sensor.fdes > -1){
time_t tnow = time(NULL);
int canread = sl_canread(fdes);
int canread = sl_canread(sensor.fdes);
if(canread < 0){
WARNX("Disconnected fd %d", fdes);
WARNX("Disconnected fd %d", sensor.fdes);
break;
}else if(canread == 1){
ssize_t got = read(fdes, buf, 128);
ssize_t got = read(sensor.fdes, buf, 128);
if(got > 0){
sl_RB_write(rb, (uint8_t*)buf, got);
sl_RB_write(sensor.ringbuffer, (uint8_t*)buf, got);
}else if(got < 0){
DBG("Disconnected?");
break;
}
}
if(sl_RB_readline(rb, buf, 127) > 0){
if(NS == format_values(buf) && freshdatahandler)
freshdatahandler(&sensor);
if(sl_RB_readline(sensor.ringbuffer, buf, 127) > 0){
if(NS == format_values(buf) && sensor.freshdatahandler)
sensor.freshdatahandler(&sensor);
}
if(tnow >= task){
DBG("write %s", begging);
ssize_t got = writedata(fdes, begging, sizeof(begging)-1);
if(got > 0) task = tnow + Tpoll;
else if(got < 0){
close(fdes);
fdes = -1;
if(sensor.tpoll){
if(tnow >= task){
DBG("write %s", begging);
ssize_t got = writedata(sensor.fdes, begging, sizeof(begging)-1);
if(got > 0) task = tnow + sensor.tpoll;
else if(got < 0){
close(sensor.fdes);
sensor.fdes = -1;
}
}
}
}
@@ -124,55 +117,35 @@ static void *mainthread(void _U_ *U){
return NULL;
}
static int init(int N, time_t pollt, int fd){
static int init(struct sensordata_t *s, int N, time_t pollt, int fd){
FNAME();
if(!(rb = sl_RB_new(BUFSIZ))){
WARNX("Can't init ringbuffer!");
return 0;
}
if(pthread_create(&thread, NULL, mainthread, NULL)) return 0;
if(!s) return -1;
s->fdes = fd;
if(s->fdes < 0) return -1;
sensor.PluginNo = N;
if(pollt) Tpoll = pollt;
fdes = fd;
if(fdes < 0) return -1;
if(pollt) s->tpoll = pollt;
if(pthread_create(&s->thread, NULL, mainthread, NULL)) return -1;
s->values = MALLOC(val_t, NS);
// don't use memcpy, as `values` could be aligned
for(int i = 0; i < NS; ++i) s->values[i] = values[i];
if(!(s->ringbuffer = sl_RB_new(BUFSIZ))){
WARNX("Can't init ringbuffer!");
return -1;
}
return NS;
}
static int onrefresh(void (*handler)(const struct sensordata_t* const)){
FNAME();
if(!handler) return FALSE;
freshdatahandler = handler;
static int getval(struct sensordata_t *s, val_t *o, int N){
if(!s || N < 0 || N >= NS) return FALSE;
if(o) *o = s->values[N];
return TRUE;
}
static int getval(val_t *o, int N){
if(N < 0 || N >= NS) return FALSE;
if(o) *o = values[N];
return TRUE;
}
static void die(){
FNAME();
if(0 == pthread_kill(thread, -9)){
DBG("Killed, join");
pthread_join(thread, NULL);
DBG("Done");
}
DBG("Delete RB");
sl_RB_delete(&rb);
if(fdes > -1){
close(fdes);
DBG("FD closed");
}
DBG("FDEXAMPLE: died");
}
sensordata_t sensor = {
.name = "Dummy socket or serial device weatherstation",
.Nvalues = NS,
.init = init,
.onrefresh = onrefresh,
.onrefresh = common_onrefresh,
.get_value = getval,
.die = die,
.kill = common_kill,
};