diff --git a/c/src/p2fa.c b/c/src/p2fa.c index 0190f8b..edb3d47 100644 --- a/c/src/p2fa.c +++ b/c/src/p2fa.c @@ -28,103 +28,6 @@ void Handler(int sigNum) { exit(0); } -int drawn() { - if(DEV_Module_Init()!=0){ - return -1; - } - EPD_2in13_V4_Init(); - EPD_2in13_V4_Clear(); - - UBYTE *BlackImage; - UWORD ImageSize = ((EPD_2in13_V4_WIDTH % 8 == 0)? (EPD_2in13_V4_WIDTH / 8 ): (EPD_2in13_V4_WIDTH / 8 + 1)) * EPD_2in13_V4_HEIGHT; - if((BlackImage = (UBYTE *)malloc(ImageSize)) == NULL) { - Debug("Failed to apply for black memory...\r\n"); - return -1; - } - - Paint_NewImage(BlackImage, EPD_2in13_V4_WIDTH, EPD_2in13_V4_HEIGHT, 90, WHITE); - Debug("Drawing\r\n"); - //1.Select Image - EPD_2in13_V4_Init(); - Paint_SelectImage(BlackImage); - Paint_Clear(WHITE); - - // 2.Drawing on the image - Paint_DrawPoint(5, 10, BLACK, DOT_PIXEL_1X1, DOT_STYLE_DFT); - Paint_DrawPoint(5, 25, BLACK, DOT_PIXEL_2X2, DOT_STYLE_DFT); - Paint_DrawPoint(5, 40, BLACK, DOT_PIXEL_3X3, DOT_STYLE_DFT); - Paint_DrawPoint(5, 55, BLACK, DOT_PIXEL_4X4, DOT_STYLE_DFT); - - Paint_DrawLine(20, 10, 70, 60, BLACK, DOT_PIXEL_1X1, LINE_STYLE_SOLID); - Paint_DrawLine(70, 10, 20, 60, BLACK, DOT_PIXEL_1X1, LINE_STYLE_SOLID); - Paint_DrawRectangle(20, 10, 70, 60, BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY); - Paint_DrawRectangle(85, 10, 135, 60, BLACK, DOT_PIXEL_1X1, DRAW_FILL_FULL); - - Paint_DrawLine(45, 15, 45, 55, BLACK, DOT_PIXEL_1X1, LINE_STYLE_DOTTED); - Paint_DrawLine(25, 35, 70, 35, BLACK, DOT_PIXEL_1X1, LINE_STYLE_DOTTED); - Paint_DrawCircle(45, 35, 20, BLACK, DOT_PIXEL_1X1, DRAW_FILL_EMPTY); - Paint_DrawCircle(110, 35, 20, WHITE, DOT_PIXEL_1X1, DRAW_FILL_FULL); - - Paint_DrawString(140, 15, "waveshare", &Font16, BLACK, WHITE); - Paint_DrawNum(140, 40, 123456789, &Font16, BLACK, WHITE); - - EPD_2in13_V4_Display_Base(BlackImage); - DEV_Delay_ms(3000); - - Paint_NewImage(BlackImage, EPD_2in13_V4_WIDTH, EPD_2in13_V4_HEIGHT, 90, WHITE); - Debug("Partial refresh\r\n"); - Paint_SelectImage(BlackImage); - - PAINT_TIME sPaint_time; - sPaint_time.Hour = 12; - sPaint_time.Min = 34; - sPaint_time.Sec = 56; - UBYTE num = 10; - for (;;) { - sPaint_time.Sec = sPaint_time.Sec + 1; - if (sPaint_time.Sec == 60) { - sPaint_time.Min = sPaint_time.Min + 1; - sPaint_time.Sec = 0; - if (sPaint_time.Min == 60) { - sPaint_time.Hour = sPaint_time.Hour + 1; - sPaint_time.Min = 0; - if (sPaint_time.Hour == 24) { - sPaint_time.Hour = 0; - sPaint_time.Min = 0; - sPaint_time.Sec = 0; - } - } - } - Paint_ClearWindows(150, 80, 150 + Font20.Width * 7, 80 + Font20.Height, WHITE); - Paint_DrawTime(150, 80, &sPaint_time, &Font20, WHITE, BLACK); - - num = num - 1; - if (num == 0) { - break; - } - EPD_2in13_V4_Display_Partial(BlackImage); - DEV_Delay_ms(500);//Analog clock 1s - - } - DEV_Delay_ms(5000); - - Debug("Clear...\r\n"); - EPD_2in13_V4_Init(); - EPD_2in13_V4_Clear(); - - Debug("Goto Sleep...\r\n"); - EPD_2in13_V4_Sleep(); - free(BlackImage); - BlackImage = NULL; - - DEV_Delay_ms(2000);//important, at least 2s - // close 5V - Debug("close 5V, Module enters 0 power consumption ...\r\n"); - - DEV_Module_Exit(); - return 0; -} - int draw() { if (DEV_Module_Init() != 0) { return -1; @@ -138,71 +41,62 @@ int draw() { Debug("Failed to apply for black memory...\n"); return -1; } - Paint_NewImage(BlackImage, EPD_2in13_V4_WIDTH, EPD_2in13_V4_HEIGHT, 90, WHITE); - EPD_2in13_V4_Init(); - Paint_SelectImage(BlackImage); - Paint_Clear(WHITE); - Paint_DrawString(10, 40, "Hello, World!", &Font16, WHITE, BLACK); + while(1) { - const char *confName = "default"; - GoString confStr = {confName, strlen(confName)}; - const char *code = getCode(confStr); - Debug("Code: %s\n", code); - Paint_DrawString(5, 5, code, &Font24, WHITE, BLACK); - Paint_DrawRectangle(10, 112, 240, 92, WHITE, DOT_PIXEL_1X1, DRAW_FILL_FULL); - EPD_2in13_V4_Display_Base(BlackImage); + Paint_NewImage(BlackImage, EPD_2in13_V4_WIDTH, EPD_2in13_V4_HEIGHT, 90, WHITE); + EPD_2in13_V4_Init(); + Paint_SelectImage(BlackImage); + Paint_Clear(WHITE); - Paint_NewImage(BlackImage, EPD_2in13_V4_WIDTH, EPD_2in13_V4_HEIGHT, 90, WHITE); - Paint_SelectImage(BlackImage); + Paint_DrawString(10, 40, "Hello, World!", &Font16, WHITE, BLACK); - clock_t startTime; - clock_t endTime; - int elapsedTime; - int progBarCurrentIndex = 11; - int progBarEndIndex; - for (int i = getTimeRemainingMS(30); i > 4500; i = getTimeRemainingMS(30)) { - startTime = clock(); + const char *confName = "default"; + GoString confStr = {confName, strlen(confName)}; + const char *code = getCode(confStr); + Debug("Code: %s\n", code); + Paint_DrawString(5, 5, code, &Font24, WHITE, BLACK); - Debug("Time Left: %d\n", i); - double percentLeft = ((double)i / (double)(30 * 1000)); - Debug("Percent Left: %d\n", percentLeft); - progBarEndIndex = 228 - ((int)(228 * percentLeft)); - Debug("Progress Bar Start: %d\nProgress Bar End: %d\n", progBarCurrentIndex, progBarEndIndex); - Paint_ClearWindows(progBarCurrentIndex, 111, progBarEndIndex, 93, WHITE); - while (progBarCurrentIndex < progBarEndIndex) { - Debug("Line: %d,111 - %d,93\n", progBarCurrentIndex, progBarEndIndex); - Paint_DrawLine(progBarCurrentIndex, 111, progBarCurrentIndex, 93, BLACK, DOT_PIXEL_1X1, LINE_STYLE_SOLID); - ++progBarCurrentIndex; - } - EPD_2in13_V4_Display_Partial(BlackImage); - endTime = clock(); - elapsedTime = (int)((endTime - startTime) / CLOCKS_PER_SEC); - Debug("Elapsed Time %d\n", elapsedTime); - if (elapsedTime < 3000) { - Debug("Delay for %dms\n", (3000 - (elapsedTime * 1000))); - DEV_Delay_ms(3000 - (elapsedTime * 1000)); + Paint_DrawRectangle(10, 112, 240, 92, WHITE, DOT_PIXEL_1X1, DRAW_FILL_FULL); + EPD_2in13_V4_Display_Base(BlackImage); + + Paint_NewImage(BlackImage, EPD_2in13_V4_WIDTH, EPD_2in13_V4_HEIGHT, 90, WHITE); + Paint_SelectImage(BlackImage); + + clock_t startTime; + clock_t endTime; + int elapsedTime; + int progBarCurrentIndex = 11; + int progBarEndIndex; + int lastI = 30 * 1000; + for (int i = getTimeRemainingMS(30);; i = getTimeRemainingMS(30)) { + if (i > lastI) break; + startTime = clock(); + + Debug("Time Left: %d\n", i); + double percentLeft = ((double) i / (double) (30 * 1000)); + Debug("Percent Left: %.3f\n", percentLeft); + progBarEndIndex = 228 - ((int) (228 * percentLeft)); + Debug("Progress Bar Start: %d\nDebug: Progress Bar End: %d\n", progBarCurrentIndex, progBarEndIndex); + Paint_ClearWindows(progBarCurrentIndex, 111, progBarEndIndex, 93, WHITE); + while (progBarCurrentIndex < progBarEndIndex) { + Debug("Line: %d,111 - %d,93\n", progBarCurrentIndex, progBarEndIndex); + Paint_DrawLine(progBarCurrentIndex, 111, progBarCurrentIndex, 93, BLACK, DOT_PIXEL_1X1, + LINE_STYLE_SOLID); + ++progBarCurrentIndex; + } + EPD_2in13_V4_Display_Partial(BlackImage); + endTime = clock(); + elapsedTime = (int) ((endTime - startTime) / CLOCKS_PER_SEC); + Debug("Elapsed Time %d\n", elapsedTime); + if (elapsedTime < 1000) { + Debug("Delay for %dms\n", (1000 - (elapsedTime * 1000))); + DEV_Delay_ms(1000 - (elapsedTime * 1000)); + } + lastI = i; } } - - DEV_Delay_ms(2000); - - Debug("Clear...\r\n"); - EPD_2in13_V4_Init(); - EPD_2in13_V4_Clear(); - - Debug("Goto Sleep...\r\n"); - EPD_2in13_V4_Sleep(); - free(BlackImage); - BlackImage = NULL; - - DEV_Delay_ms(2000);//important, at least 2s - // close 5V - Debug("close 5V, Module enters 0 power consumption ...\r\n"); - - DEV_Module_Exit(); - return 0; } int main() {