From 72def895431ad7a08e635b11f3da738e2b2c4618 Mon Sep 17 00:00:00 2001
From: wujiazhi <1147861305@qq.com>
Date: Thu, 13 Jun 2024 11:31:04 +0800
Subject: [PATCH] add lower model test
---
Function/LCD/lcd.h | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Function/LCD/lcd.h b/Function/LCD/lcd.h
index 8543847..12149e3 100644
--- a/Function/LCD/lcd.h
+++ b/Function/LCD/lcd.h
@@ -17,16 +17,15 @@
#include "define_all.h"
#include "key.h"
+#include "administrator.h"
#include "lcd_io_api.h"
-#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)
+#define LCD_ALL_CLEAR Lcd_Write_Reg(0,LCD_SYSTEM_MODE_OFF_OFF,Segnum)
//��ʾ��������
-#define LCD_ALL_DISPLAY Lcd_Write_Reg(0,LCD_Buffer,SEGNUM)
+#define LCD_ALL_DISPLAY Lcd_Write_Reg(0,LCD_buffer,Segnum)
typedef enum{
CNV_NONE = 0U,
@@ -46,10 +45,10 @@
}SYS_DISPLAY_MODE;//ϵͳ��ʾģʽ����
typedef enum{
- TOTAL_SC_BALANCE = 0U, //����+���
+ SC_INSTANT_TOTAL = 0U, //˲ʱ��� + �������
PRICE_BALANCE, //���� + ���
- TOTAL_SC_INSTANT, //˲ʱ�� + �������
-// PRESS_SC_TOTAL, //ѹ�� + �������
+ TEMP_SC_TOTAL, //�¶� + �������
+ PRESS_SC_TOTAL, //ѹ�� + �������
// WC_INSTANT_TOTAL,//˲ʱ���� + ��������
}NORMAL_PAGE;
@@ -84,7 +83,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;
@@ -94,20 +93,21 @@
extern SYS_DISPLAY_PAPA_T sys_display_para_g;
-
+extern SYS_ALARM_VALVE_T sys_show_state_bytes_id_g;
+extern SYS_ALARM_VALVE_T sys_clear_state_bytes_id_g;
extern uint8_t lcd_wake_up_flag_g;
void Lcd_DeInit(void);
void Lcd_Sys_Init(void);
+
void Lcd_Display_AllTest(void);
void Lcd_Clear_AllTest(void);
void Lcd_Show_Loop(void);
-void Lcd_Show_MenuProcess(void);
+void Lcd_Show_MenuProcess(SYS_DISPLAY_PAPA_T * sys_display_para_p,ErrorStatus_STM32 * pCnv_result_flag);
-void lcdDisplayPro(void);
#endif
--
Gitblit v1.9.3