bak 0307

Core/Src/freertos.c

@@ -152,7 +152,7 @@ void StartScanKeyTask(void const * argument)
     OLED_Refresh(); 
 	open_close_lock();
 	workinfo_W();
-	scanMac();
+	//scanMac();
   }
   /* USER CODE END StartScanKeyTask */
 }
@@ -175,7 +175,6 @@ void StarBT4GTask(void const * argument)
 	  
 	  
 	  
-	  
   }
   /* USER CODE END StarBT4GTask */
 }

Core/Src/key.c

@@ -842,12 +842,14 @@ uint8_t KEY_4_Scan(void)
 						case 0:
 						case 1:
 						{
+							scanMac();
 							SET_MENU_STATUS(0,0,0,0);
 							break;
 						}
 						case 2:
 						case 3:
 						{
+							scanMac();
 							SET_MENU_STATUS(1,1,0,1);
 							break;
 						}
@@ -862,6 +864,7 @@ uint8_t KEY_4_Scan(void)
 							S2 = read_flash_16(Sn2StatusAddr);
 							S3 = read_flash_16(Sn3StatusAddr);
 							S4 = read_flash_16(Sn4StatusAddr);
+							scanMac();
 							SET_MENU_STATUS(3,3,0,2);
 							break;
 						}	
@@ -877,6 +880,7 @@ uint8_t KEY_4_Scan(void)
 							S2 = read_flash_16(Sn2StatusAddr);
 							S3 = read_flash_16(Sn3StatusAddr);
 							S4 = read_flash_16(Sn4StatusAddr);
+							scanMac();
 							SET_MENU_STATUS(2,3,0,2);
 							break;
 						}

Core/Src/main.c

@@ -195,6 +195,7 @@ void SystemClock_Config(void)
 /* USER CODE BEGIN 4 */
 void readLockStatusinit(void)
 {
+  scanMac();
   uint16_t S1bd = read_flash_16(Sn1Addr);
   uint16_t S2bd = read_flash_16(Sn2Addr);
   uint16_t S3bd = read_flash_16(Sn3Addr);

Core/Src/mba32a.c

@@ -552,7 +552,15 @@ void modifyOledBmp(void)
 {
 	if (S1 == 0x1111)
 	{
-		menu.home |= 0x1000;
+		if(menu.home && 0xF000 == 0xF000)
+		{
+			menu.home = 0x1000;
+		}
+		else
+		{
+			menu.home |= 0x1000;
+		}
+		
 	}
 		
 	if (S1 == 0x2222)
@@ -561,29 +569,50 @@ void modifyOledBmp(void)
 	}
 	if (S2 == 0x1111)
 	{
-		menu.home |= 0x0100;
+		if(menu.home && 0x0F00 == 0x0F00)
+		{
+			menu.home |= 0x0100;
+		}
+		else
+		{
+			menu.home = 0x0100;
+		}
 	}
 		
 	if (S2 == 0x2222)
 	{
-		menu.home |= 0x0F00;
+		menu.home |= 0xF00;
 	}
 		
 	if (S3 == 0x1111)
 	{
-		menu.home |= 0x0010;
+		if(menu.home && 0x00F0 == 0x00F0)
+		{
+			menu.home |= 0x0010;
+		}
+		else
+		{
+			menu.home = 0x0010;
+		}
 	}
 	if (S3 == 0x2222)
 	{
-		menu.home |= 0x00F0;
+		menu.home |= 0xF0;
 	}
 	if (S4 == 0x1111)
 	{
-		menu.home |= 0x0001;
+		if(menu.home && 0x000F == 0x000F)
+		{
+			menu.home |= 0x0001;
+		}
+		else
+		{
+			menu.home = 0x0001;
+		}
 	}
 	if (S4 == 0x2222)
 	{
-		menu.home |= 0x000F;
+		menu.home |= 0xF;
 	}
 	
 	//ťÖ¸´null