loic/ina260-zmq-publisher
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/ina260-zmq-publisher.git synced 2025-04-06 03:46:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor changes

Browse source
This commit is contained in:
Loic Guegan 2023-07-17 18:37:38 +02:00
parent 76f13c34f3
commit 5d7436ba49
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.mk
View file

@ -19,7 +19,7 @@ LOGGERS_DIR=/tmp/ina260_logs/
# LOGGERS_DELAY defines the delay between 2 consecutive # LOGGERS_DELAY defines the delay between 2 consecutive
# ina260 power read performed by the logger # ina260 power read performed by the logger
# Unit is milliseconds # Unit is milliseconds
LOGGERS_DELAY=0 LOGGERS_DELAY=1000
# SUBSCRIBER_DIR will contain all the measurments # SUBSCRIBER_DIR will contain all the measurments
# received from the publishers # received from the publishers
SUBSCRIBER_DIR=./data SUBSCRIBER_DIR=./data

8
src/logger.c
View file

@ -114,14 +114,14 @@ int main (int argc, char *argv [])
fgets(buffer,STATIC_LEN,regptr); fgets(buffer,STATIC_LEN,regptr);
// Get power measurement timestamp: // Get power measurement timestamp:
clock_gettime(CLOCK_REALTIME,&power_ts); clock_gettime(CLOCK_REALTIME,&power_ts);
char line[STATIC_LEN]; char line[MAX_RECORD_LEN];
sprintf(line,"%ld,%ld,%d\n",power_ts.tv_sec,power_ts.tv_nsec,atoi(buffer)); sprintf(line,"%ld,%ld,%d\n",power_ts.tv_sec,power_ts.tv_nsec,atoi(buffer));
int linelen=strlen(line); int linelen=strlen(line);
if((queues[queue_id].size+linelen)>ZMQ_MSG_SIZE){ if((queues[queue_id].size+MAX_RECORD_LEN)>ZMQ_MSG_SIZE){
printf("To many measurements to publish. Please increase ZMQ_MSG_SIZE\n"); printf("To many measurements to publish. Please increase ZMQ_MSG_SIZE\n");
} else { } else {
memcpy(queues[queue_id].msg+queues[queue_id].size,line,linelen); sprintf(queues[queue_id].msg+queues[queue_id].size,"%ld,%ld,%d\n",power_ts.tv_sec,power_ts.tv_nsec,atoi(buffer));
queues[queue_id].size+=linelen; queues[queue_id].size+=strlen(queues[queue_id].msg+queues[queue_id].size);
} }
// Reset power register file: // Reset power register file:
fseek(regptr,0,SEEK_SET); fseek(regptr,0,SEEK_SET);

2
src/subscriber.c
View file

@ -79,7 +79,7 @@ int main (int argc, char *argv [])
// Write all the measurements: // Write all the measurements:
if(line>4){ if(line>4){
fwrite(token, strlen(token), 1, fptr); fwrite(token, strlen(token), 1, fptr);
//printf("%s\n",token); printf("%s\n",token);
fwrite("\n",1,1,fptr); fwrite("\n",1,1,fptr);
} }

1
src/utils.h
View file

@ -10,6 +10,7 @@
#define INA260_SYSFS "/sys/kernel/ina260" #define INA260_SYSFS "/sys/kernel/ina260"
#define INA260_POWER_REGISTER "registers/power" #define INA260_POWER_REGISTER "registers/power"
#define STATIC_LEN 255 #define STATIC_LEN 255
#define MAX_RECORD_LEN 100
#define MAX_QUEUES 1 #define MAX_QUEUES 1
#ifndef ZMQ_TOKEN #ifndef ZMQ_TOKEN