From a049e4b17e5c065925fa860741337480c18004f3 Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Fri, 14 Jul 2023 22:03:40 +0200 Subject: [PATCH] Minor changes --- Makefile | 4 ++-- config.mk | 3 ++- logger | Bin 15232 -> 15720 bytes src/logger/Makefile | 5 ++++- src/logger/main.c | 29 +++++++++++++++++++++++++++-- src/utils.h | 7 ------- 6 files changed, 35 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 391df65..4e4b383 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ client: $(MAKE) -C src/client/ CC=$(CC) OUT=$(PWD) CONF=$(CONF) logger: - @echo "---------- Building client..." + @echo "---------- Building logger..." CFLAGS=$(CFLAGS) \ $(MAKE) -C src/logger/ CC=$(CC) OUT=$(PWD) CONF=$(CONF) @@ -26,4 +26,4 @@ clean: $(MAKE) clean -C src/client/ $(MAKE) clean -C src/logger/ -.PHONY: clean publisher client +.PHONY: clean publisher client logger diff --git a/config.mk b/config.mk index 29fdf7c..f37dfdf 100644 --- a/config.mk +++ b/config.mk @@ -1,2 +1,3 @@ PUBLISHER_PORT=5556 -PUBLISHER_ADDR=localhost \ No newline at end of file +PUBLISHER_ADDR=localhost +LOGGER_DIR=./logs \ No newline at end of file diff --git a/logger b/logger index 1b7bc836bdd01d9e997c3e95863f3a00d25affbe..6ff6c3181c42f1c8cd32f928ff252fd1f2d7c637 100755 GIT binary patch literal 15720 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 Dzs&iz diff --git a/src/logger/Makefile b/src/logger/Makefile index ad4f0ca..fc04b6d 100644 --- a/src/logger/Makefile +++ b/src/logger/Makefile @@ -1,8 +1,11 @@ include $(CONF) EXEC=logger +DEFINES=\ +-DLOGGER_DIR=$(LOGGER_DIR) + all: main.c - $(CC) $^ -o $(OUT)/$(EXEC) $(CFLAGS) + $(CC) $^ -o $(OUT)/$(EXEC) $(CFLAGS) $(DEFINES) clean: rm -f $(OUT)/$(EXEC) diff --git a/src/logger/main.c b/src/logger/main.c index a9bbb50..6ee3ac8 100644 --- a/src/logger/main.c +++ b/src/logger/main.c @@ -4,10 +4,35 @@ #include #include #include +#include #include +#include +#include + + +void start(char *power_path); int main (int argc, char *argv []) { - - return 0; + if(argc != 2){ + printf("Usage: %s ",argv[0]); + exit(1); + } + + // Extract bus id and ina260 chip address + char busid[10]; + char chipaddr[10]; + char *base=basename(argv[1]); + sscanf(base,"%[^-]-%[^-]",busid,chipaddr); + + start("/home/loic/out.txt"); + + return 0; +} + +void start(char *power_path){ + if (access(power_path, F_OK) != 0){ + printf("Could not read %s\n",power_path); + exit(2); + } } \ No newline at end of file diff --git a/src/utils.h b/src/utils.h index 4761b04..8e15094 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,10 +1,3 @@ #define STR(symbol) #symbol #define STRINGIFY(symbol) STR(symbol) -#ifndef PUBLISHER_PORT -#error PUBLISHER_PORT undefined -#endif - -#ifndef PUBLISHER_ADDR -#error PUBLISHER_ADDR undefined -#endif