co2meter: comparison main/co2meter.c

-:d969e0fe05dc
+:4fb9ed228a23
 u8g2_DrawStr(&u8g2, (128 - w) / 2,12, buf);
 }
+/**
+* @brief The splash screen shown during cold boot or user wakeup.
+*/
 void screen_splash()
 {
 screen_top("CO2 meter %s", app_desc->version);
 u8g2_SetFont(&u8g2, u8g2_font_t0_22b_tf);
 u8g2_SetPowerSave(&u8g2, 0); // wake up display
 }
+/**
+* @brief The main overview screen.
+*/
 void screen_main()
 {
 char	buf[65];
 int		i;
 u8g2_SetPowerSave(&u8g2, 0); // wake up display
 }
+/**
+* @brief The unit display screen.
+* @param no The unit index number.
+*/
 void screen_unit(int no)
 {
 char        buf[65];
 if (xSemaphoreTake(xSemaphoreUnits, 25) == pdTRUE) {
 u8g2_SetPowerSave(&u8g2, 0); // wake up display
 }
+/**
+* @brief The unit zero setup screen.
+* @param no The unit index number.
+* @param sub The submenu index number.
+*/
 void screen_unit_zero(int no, int sub)
 {
 screen_top("Unit %d zero mV", no + 1);
 menu_line(       0, 2, 25, "Current   %d", units[no].pressure_zero);
 menu_line(sub == 0, 2, 37, "New value %d", units[no].pressure_voltage / (adc_state->Batt_voltage / 1000));
 menu_line(sub == 1, 2, 49, "Return");
+printf("current %d  p_voltage %d  batt %d\n", units[no].pressure_zero, units[no].pressure_voltage, adc_state->Batt_voltage);
 u8g2_SendBuffer(&u8g2);
 u8g2_SetPowerSave(&u8g2, 0);
 }
+/**
+* @brief The unit setup screen.
+* @param no The unit index number.
+* @param sub The submenu index number.
+*/
 void screen_unit_setup(int no, int sub)
 {
 screen_top("Unit %d setup", no + 1);
 menu_line(sub == 0, 2, 25, "Mode    %s", units[no].mode ? "ON":"OFF");
 menu_line(sub == 1, 2, 37, "Zero mV %d", units[no].pressure_zero);
 menu_line(sub == 2, 2, 49, "DS18B20 %s", units[no].temperature_rom_code);
 menu_line(sub == 3, 2, 61, "Return");
 u8g2_SendBuffer(&u8g2);
 u8g2_SetPowerSave(&u8g2, 0);
 }
+/**
+* @brief Fatal messages on the screen.
+* @param e1 The first line.
+* @param e2 The second line.
+*/
 void screen_fatal(char *e1, char *e2)
 {
 u8g2_SetFont(&u8g2, u8g2_font_t0_15_tr);
 u8g2_DrawStr(&u8g2,2,12,e1);
 u8g2_DrawStr(&u8g2,2,24,e2);
 u8g2_SetPowerSave(&u8g2, 0);
 }
-/*
+/**
-* Interrupt service routine for the rotary pushbutton.
+* @brief Interrupt service routine for the rotary pushbutton.
 */
 static void IRAM_ATTR gpio_isr_handler(void* arg)
 {
 uint32_t gpio_num = (uint32_t) arg;
 xQueueSendFromISR(gpio_evt_queue, &gpio_num, NULL);
 }
-/*
+/**
-* GPIO queue task. See if there is a rotary pushbutton event in the queue.
+* @brief GPIO queue task. See if there is a rotary pushbutton event on the queue.
 */
 static void gpio_task(void* arg)
 {
 uint32_t		io_num;
 static int64_t	pushed = 0;
 }
 }
-/*
+/**
-* Select new menu number on a postitive or negative rotary position.
+* @brief Select new menu number on a postitive or negative rotary position.
-* Then reset the rotary position.
+* @param pos The new position, positive, negative or zero.
+* @param next_menu The selected menu if rotated clockwise.
+* @param prev_menu The selected menu if rotated counter-clockwise.
 */
 static void rotate_to_menu(rotary_encoder_position_t pos, int next_menu, int prev_menu)
 {
 if (pos > 0)
 	New_Loop2 = next_menu;
 ESP_ERROR_CHECK(rotary_encoder_reset(&rinfo));
 }
-int rotate_to_sub(rotary_encoder_position_t pos, int min, int max, int cursub)
+/**
-{
+* @brief Rotate subscreens numbers.
-int	sub = cursub;
+* @param pos The new position, positive, negative or zero.
+* @param min The lowest number. If already at the lowest, select the highest.
+* @param max The highest number. If already at the highest, select the lowest.
+* @param cursub The subscreen number by reference. This is updated with the new number.
+* @return Returns true if a new number is selected, false if nothing changed.
+*/
+bool rotate_to_sub(rotary_encoder_position_t pos, int min, int max, int *cursub)
+{
+int	sub = *cursub;
+bool	rc = false;
 if (pos > 0) {
 	if (sub < max)
 	    sub++;
 	else
 	    sub = min;
 	ESP_ERROR_CHECK(rotary_encoder_reset(&rinfo));
+	rc = true;
 } else if (pos < 0) {
 	if (sub > min)
 	    sub--;
 	else
 	    sub = max;
 	ESP_ERROR_CHECK(rotary_encoder_reset(&rinfo));
-}
+	rc = true;
-return sub;
+}
-}
+*cursub = sub;
+return rc;
+}
 void app_main()
 {
 struct timeval	now;
 			break;
 		}
 	    }
 	    /*
-	     * Main user processing. Handle the rotary encoder and pushbutton.
+	     * Handle rotationg the rotary encoder.
 	     */
 	    if (Main_Loop2 < ML2_INACTIVE) {
 		// If not configured, start configure
 		// If configured select first unit
 		// Handle screen (first is show measured values)
 		    	case ML2_SET_NETWORK:	rotate_to_menu(event.state.position, ML2_SET_MQTT, ML2_SET_WIFI); break;
 		    	case ML2_SET_MQTT:	rotate_to_menu(event.state.position, ML2_UPDATE, ML2_SET_NETWORK); break;
 		    	case ML2_UPDATE:	rotate_to_menu(event.state.position, ML2_UPDATE, ML2_SET_MQTT); break;
 			case ML2_SETUP_UNIT1:
 			case ML2_SETUP_UNIT2:
-			case ML2_SETUP_UNIT3:	sub = rotate_to_sub(event.state.position, 0, 3, sub);
+			case ML2_SETUP_UNIT3:	if (rotate_to_sub(event.state.position, 0, 3, &sub))
-						screen_unit_setup(Main_Loop2 - ML2_SETUP_UNIT1, sub);
+						    screen_unit_setup(Main_Loop2 - ML2_SETUP_UNIT1, sub);
 						break;
 			case ML2_ZERO_UNIT1:
 			case ML2_ZERO_UNIT2:
-			case ML2_ZERO_UNIT3:	sub = rotate_to_sub(event.state.position, 0, 1, sub);
+			case ML2_ZERO_UNIT3:	if (rotate_to_sub(event.state.position, 0, 1, &sub))
-						screen_unit_zero(Main_Loop2 - ML2_ZERO_UNIT1, sub);
+						    screen_unit_zero(Main_Loop2 - ML2_ZERO_UNIT1, sub);
 						break;
 			default:
 		    				ESP_LOGI(TAG, "Event: position %d, direction %s", event.state.position,
 		event.state.direction ? (event.state.direction == ROTARY_ENCODER_DIRECTION_CLOCKWISE ? "CW":"CCW"):"NOT_SET");
 		    }

Mercurial > co2meter / file comparison

comparison: main/co2meter.c

main/co2meter.c