From a1810b89e66f184c62a0588ae7d57c91d0c376e8 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 30 May 2024 20:06:09 +0800
Subject: [PATCH] 继续测试修改
---
Function/LCD/lcd.h | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Function/LCD/lcd.h b/Function/LCD/lcd.h
index baaeed5..4f351c2 100644
--- a/Function/LCD/lcd.h
+++ b/Function/LCD/lcd.h
@@ -21,7 +21,7 @@
#include "lcd_cfg_api.h"
#include "lcd_segmentcode.h"
-#define LCD_BACKLIGHT_SELECT(__ALKA_STATE__) ((__ALKA_STATE__ == RESET) ? LCD_BACKLIGHT_ON : LCD_BACKLIGHT_OFF)
+//#define LCD_BACKLIGHT_SELECT(__ALKA_STATE__) ((__ALKA_STATE__ == RESET) ? LCD_BACKLIGHT_ON : LCD_BACKLIGHT_OFF)
//����
#define LCD_ALL_CLEAR Lcd_Write_Reg(0,LCD_SYSTEM_MODE_OFF_OFF,SEGNUM)
@@ -46,10 +46,10 @@
}SYS_DISPLAY_MODE;//ϵͳ��ʾģʽ����
typedef enum{
- SC_INSTANT_TOTAL = 0U, //˲ʱ��� + �������
+ TOTAL_SC_BALANCE = 0U, //����+���
PRICE_BALANCE, //���� + ���
- TEMP_SC_TOTAL, //�¶� + �������
- PRESS_SC_TOTAL, //ѹ�� + �������
+ TOTAL_SC_INSTANT, //˲ʱ�� + �������
+// PRESS_SC_TOTAL, //ѹ�� + �������
// WC_INSTANT_TOTAL,//˲ʱ���� + ��������
}NORMAL_PAGE;
@@ -84,7 +84,7 @@
}NORMAL_DISPLAY_PAGE_T;//��ͨ��ʾҳ�����ͽṹ��
typedef struct{
- TEMP_SYS_MODE_CNV_CMD temp_sys_mode_flag; //��ʱ��ϵͳģʽ��־λ�����ڰ������ͣ�
+// TEMP_SYS_MODE_CNV_CMD temp_sys_mode_flag; //��ʱ��ϵͳģʽ��־λ�����ڰ������ͣ�
SYS_DISPLAY_MODE sys_and_display_mode; //ϵͳ/��ʾģʽ�����յ�ȷ�ϣ�
NORMAL_DISPLAY_PAGE_T display_page_status; //��ʾҳ��״̬
}SYS_DISPLAY_PAPA_T;
@@ -95,7 +95,8 @@
extern SYS_DISPLAY_PAPA_T sys_display_para_g;
-extern uint8_t lcd_wake_up_flag_g;
+extern FlagStatus lcd_wake_up_flag_g;
+extern FlagStatus lcd_first_wake_up_flag_g;
void Lcd_DeInit(void);
--
Gitblit v1.9.3