Merge branch 'dev' into 'master'

附加变更项1.将CNG指示灯改为NG，只更改切图，其他逻辑不变

See merge request !37

code/Sources/Implementation/src/GUI.c

@@ -772,7 +772,7 @@ void Telltale_LCD_Display(void)
 	//天然气状态指示灯
   if (TelltaleLCDFlag.Sig.LCD31 == 1)
 	{
-	   TFT_LCD_Display_Sprite(LAYER_LED31, SN_zhishideng_32X592Y190_png, 592, 190, 64);
+	   TFT_LCD_Display_Sprite(LAYER_LED31, SN_zz_zhishideng_32X592Y190_png, 600, 190, 64);
   }
 	else 
 	  TFT_LCD_Clear_Layer(LAYER_LED31);
@@ -780,7 +780,7 @@ void Telltale_LCD_Display(void)
 	//天然气泄露指示灯
   if (TelltaleLCDFlag.Sig.LCD32 == 1)
 	{
-	   TFT_LCD_Display_Sprite(LAYER_LED32, SN_zhishideng_32X123Y190_png, 123, 190, 64);
+	   TFT_LCD_Display_Sprite(LAYER_LED32, SN_zz_zhishideng_32X123Y190_png, 131, 190, 64);
   }
 	else 
 	  TFT_LCD_Clear_Layer(LAYER_LED32);
@@ -788,7 +788,7 @@ void Telltale_LCD_Display(void)
 	//天然气气量低状态指示灯
   if (TelltaleLCD_Flag33 == 1)
 	{
-	   TFT_LCD_Display_Sprite(LAYER_LED33, SN_zhishideng_31X592Y230_png, 592, 230, 64);
+	   TFT_LCD_Display_Sprite(LAYER_LED33, SN_zz_zhishideng_31X592Y230_png, 600, 230, 64);
   }
 	else 
 	  TFT_LCD_Clear_Layer(LAYER_LED33);