diff --git a/.gitignore b/.gitignore index 8523ae6..3655197 100644 --- a/.gitignore +++ b/.gitignore @@ -116,4 +116,6 @@ _deps c/build !c/Makefile go/go_p2fa.h -c/libs/go_p2fa.h \ No newline at end of file +c/libs/go_p2fa.h + +test.go diff --git a/c/Makefile b/c/Makefile index 644e977..8971525 100644 --- a/c/Makefile +++ b/c/Makefile @@ -27,7 +27,7 @@ else ifeq ($(USELIB_RPI), USE_LGPIO_LIB) else ifeq ($(USELIB_RPI), USE_DEV_LIB) LIB_RPI += -lgpiod -lm endif -LIB_RPI += -L./libs -lgo_p2fa +LIB_RPI += -L./libs -lgo_p2fa -Wl,-rpath,./libs DEBUG_RPI = -D $(USELIB_RPI) -D RPI USELIB_JETSONI = USE_DEV_LIB diff --git a/c/src/p2fa.c b/c/src/p2fa.c index 1898a09..3596071 100644 --- a/c/src/p2fa.c +++ b/c/src/p2fa.c @@ -26,11 +26,22 @@ int draw() { EPD_2in13_V4_Init(); Paint_Clear(WHITE); + Paint_DrawString(32, 10, "Hello, World!", &Font16, WHITE, BLACK); + const char *confName = "default"; GoString confStr = {confName, strlen(confName)}; const char *code = getCode(confStr); Paint_DrawString(5, 5, code, &Font24, WHITE, BLACK); + Paint_DrawRectangle(10, 112, 240, 92, BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY); + uint64_t *timeLeft = getTimeRemainingMS(30); + for (int j = 0; j < 3; ++j) { + for (int i = getTimeRemainingMS(30); i > 200; i = getTimeRemainingMS(30)) { + Paint_DrawRectangle(10, 112, (timeLeft/(30*1000)) * 240, 92, BLACK, DOT_PIXEL_1X1, DRAW_FILL_FULL); + DEV_Delay_ms(100); + } + } + DEV_Delay_ms(5000); Debug("Clear...\r\n");