Mercurial > public > ostc4

comparison Discovery/Src/tMenuEditHardware.c @ 1005:85f7e19c6688 GasConsumption

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch menu position of Buzzer and flipdisplay option: The Buzzer is an HW option while the flipdisplay is a SW function => exchange the position in order to clean up categories.
author Ideenmodellierer
date Sat, 03 May 2025 17:47:53 +0200
parents 21142f4fa968
children
comparison
equal deleted inserted replaced
1004:efb7d18cc564 1005:85f7e19c6688
41 #include "tInfoSensor.h" 41 #include "tInfoSensor.h"
42 #include "tComm.h" 42 #include "tComm.h"
43 #include "data_exchange_main.h" 43 #include "data_exchange_main.h"
44 44
45 45
46 extern void tM_build_pages(void); 46 //extern void tM_build_pages(void);
47 47
48 /* Private function prototypes -----------------------------------------------*/ 48 /* Private function prototypes -----------------------------------------------*/
49 void openEdit_Bluetooth(void); 49 void openEdit_Bluetooth(void);
50 void openEdit_Compass(void);
51 void openEdit_O2Sensors(void); 50 void openEdit_O2Sensors(void);
52 void openEdit_Brightness(void); 51 void openEdit_Brightness(void);
53 //void openEdit_Luftintegration(void); 52 //void openEdit_Luftintegration(void);
54 void openEdit_ButtonSens(void); 53 void openEdit_ButtonSens(void);
55 void openEdit_FlipDisplay(void); 54 void openEdit_WarningBuz(void);
55
56 56
57 /* Announced function prototypes -----------------------------------------------*/ 57 /* Announced function prototypes -----------------------------------------------*/
58 uint8_t OnAction_Sensor1 (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); 58 uint8_t OnAction_Sensor1 (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
59 uint8_t OnAction_Sensor2 (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); 59 uint8_t OnAction_Sensor2 (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
60 uint8_t OnAction_Sensor3 (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); 60 uint8_t OnAction_Sensor3 (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
78 set_globalState_Menu_Line(line); 78 set_globalState_Menu_Line(line);
79 79
80 switch(line) 80 switch(line)
81 { 81 {
82 case 1: 82 case 1:
83 default: 83 default: openEdit_Bluetooth();
84 openEdit_Bluetooth(); 84 break;
85 break; 85 case 2: openEdit_O2Sensors();
86 case 2: 86 break;
87 openEdit_O2Sensors(); 87 case 3: openEdit_Brightness();
88 break; 88 break;
89 case 3: 89 case 4: resetMenuEdit(CLUT_MenuPageHardware);
90 openEdit_Brightness(); 90 openEdit_ButtonSens();
91 break; 91 break;
92 case 4: 92 case 5: if(isNewDisplay())
93 resetMenuEdit(CLUT_MenuPageHardware); 93 {
94 openEdit_ButtonSens(); 94 openEdit_WarningBuz();
95 break; 95 }
96 case 5: 96 break;
97 openEdit_FlipDisplay();
98 break;
99 } 97 }
100 } 98 }
101 99
102 /* Private functions ---------------------------------------------------------*/ 100 /* Private functions ---------------------------------------------------------*/
103 void openEdit_Bluetooth(void) 101 void openEdit_Bluetooth(void)
118 MX_Bluetooth_PowerOff(); 116 MX_Bluetooth_PowerOff();
119 } 117 }
120 exitMenuEdit_to_Menu_with_Menu_Update_do_not_write_settings_for_this_only(); 118 exitMenuEdit_to_Menu_with_Menu_Update_do_not_write_settings_for_this_only();
121 } 119 }
122 120
123 void openEdit_FlipDisplay(void) 121 void openEdit_WarningBuz(void)
124 { 122 {
125 /* does not work like this resetEnterPressedToStateBeforeButtonAction(); */ 123 SSettings *pSettings = settingsGetPointer();
126 124
127 bool oldValue = settingsGetPointer()->FlipDisplay; 125 if(pSettings->warningBuzzer == 0)
128 126 {
129 setFlipDisplay(!oldValue); 127 pSettings->warningBuzzer = 1;
130 128 requestBuzzerActivation(REQUEST_BUZZER_ONCE);
131 exitEditWithUpdate(); 129 }
132 exitMenuEdit_to_Home(); 130 else
133 } 131 {
132 pSettings->warningBuzzer = 0;
133 deactivateBuzzer();
134 }
135 exitMenuEdit_to_Menu_with_Menu_Update_do_not_write_settings_for_this_only();
136 }
137
134 138
135 void refresh_O2Sensors(void) 139 void refresh_O2Sensors(void)
136 { 140 {
137 char strSensorId[20]; 141 char strSensorId[20];
138 char strSensorValue[20]; 142 char strSensorValue[20];