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 1b7bc83..6ff6c31 100755 Binary files a/logger and b/logger differ 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