wanghechen 6 ماه پیش
والد
کامیت
1bfc953c57
5فایلهای تغییر یافته به همراه19 افزوده شده و 18 حذف شده
  1. 2 1
      .vscode/settings.json
  2. 12 12
      components/EPD/EPD.c
  3. 2 2
      components/FONT_LIB/FONT_LIB.c
  4. 2 2
      components/c_linked_list/list.c
  5. 1 1
      main/yc_paint.c

+ 2 - 1
.vscode/settings.json

@@ -36,6 +36,7 @@
         "*.tcc": "c",
         "unordered_map": "c",
         "iot_button.h": "c",
-        "gpio.h": "c"
+        "gpio.h": "c",
+        "esp_system.h": "c"
     }
 }

+ 12 - 12
components/EPD/EPD.c

@@ -1215,12 +1215,12 @@ IRAM_ATTR bool epd_cache_quick(screen_t screen, const unsigned char *old, const
             goto err;
         }
         epd_write_data(screen, old, 38880);
-        ret = epd_check_status(screen);
-        if (!ret)
-        {
-            printf("err:2busy !!!!!\n");
-            goto err;
-        }
+        // ret = epd_check_status(screen);
+        // if (!ret)
+        // {
+        //     printf("err:2busy !!!!!\n");
+        //     goto err;
+        // }
     }
 #else
     epd_write_cmd(screen, 0x10, false);
@@ -1240,12 +1240,12 @@ IRAM_ATTR bool epd_cache_quick(screen_t screen, const unsigned char *old, const
         goto err;
     }
     epd_write_data(screen, new, 38880);
-    ret = epd_check_status(screen);
-    if (!ret)
-    {
-        printf("err:2busy !!!!!\n");
-        goto err;
-    }
+    // ret = epd_check_status(screen);
+    // if (!ret)
+    // {
+    //     printf("err:2busy !!!!!\n");
+    //     goto err;
+    // }
 
 #if 0
         if(screen == SCREEN_LEFT)

+ 2 - 2
components/FONT_LIB/FONT_LIB.c

@@ -213,7 +213,7 @@ unsigned char CheckID(unsigned char CMD, unsigned long address,
 void font_into_sleep()
 {
 
-	unsigned long j;
+	// unsigned long j;
 	FONT_CS_LOW;
 	Send_Byte(0xB9);
 	FONT_CS_HIGHT;
@@ -223,7 +223,7 @@ void font_into_sleep()
 void font_exit_sleep()
 {
 
-	unsigned long j;
+	// unsigned long j;
 	FONT_CS_LOW;
 	Send_Byte(0xAB);
 	FONT_CS_HIGHT;

+ 2 - 2
components/c_linked_list/list.c

@@ -100,14 +100,14 @@ Node *deleteNode(Node *top, int k) {
 	if (top != NULL) {
 		if (top -> n == k) {	/* if the element was found, it is deleted */
 
+			// 释放一个已分配的msgid_num
+		    deallocateMsgIdNum(top->n); 
 
 			top -> n = 0;
 			top -> cmd= 0;
 			memset(top ->data,0x00,top -> len);
 			top -> len = 0;
 
-			// 释放一个已分配的msgid_num
-		    deallocateMsgIdNum(top->n); 
 			tmp = top -> next;	/* set the temporary node to the next element (in order not to "lose" the list) */
 			heap_caps_free(top->data);//释放data
 			heap_caps_free(top);			/* frees the physical memory associated with the node to be deleted */

+ 1 - 1
main/yc_paint.c

@@ -1428,7 +1428,7 @@ static void dis_right_sms(void)
         Machine_info.batt_precent = read_battery_voltage();
         if (Machine_info.batt_precent >= 95)
         {
-            Paint_DrawBitMap_Paste((uint8_t *)gImage_filled, 480 - 47 + 37, 27 - BAT_Y_OFFSET, 8, 18, 1);
+            Paint_DrawBitMap_Paste((uint8_t *)gImage_charging, 480 - 47 + 37, 27 - BAT_Y_OFFSET, 8, 18, 1);
         }
         else
         {