Fix chairAdjust, Add different status screens (Speed)

- config, chairAdjust:
    - disable reset-pin of display (not connected, random pin was assigned)
      same pin was used for chair adjust resulting in on state after startup
    - fix chairAdjust not stopping in OFF state

- display
    - add functionality to show different status screens (content when not in MENU)
    - add status screen 'Speed' (to show speed and debug speedsensors)

- menu
    - fix item joystick define center not working
    - add item to select status screen

board_single/main/config.cpp

@@ -197,7 +197,7 @@ speedSensor_config_t speedRight_config{
 display_config_t display_config {
     .gpio_scl = GPIO_NUM_22,
     .gpio_sda = GPIO_NUM_23,
-    .gpio_reset = GPIO_NUM_15,
+    .gpio_reset = -1, //negative number disables reset feature
     .width = 128,
     .height = 64,
     .offsetX = 2,

board_single/main/display.cpp

@@ -39,6 +39,8 @@ float getVoltage1(adc1_channel_t adc, uint32_t samples){
 SSD1306_t dev;
 //tag for logging
 static const char * TAG = "display";
+//define currently shown status page (continously displayed content when not in MENU mode)
+static displayStatusPage_t selectedStatusPage = STATUS_SCREEN_OVERVIEW;
 
 
 
@@ -48,8 +50,7 @@ static const char * TAG = "display";
 //note CONFIG_OFFSETX is used (from menuconfig)
 void display_init(display_config_t config){
 	adc1_config_channel_atten(ADC1_CHANNEL_6, ADC_ATTEN_DB_11); //max voltage
-	ESP_LOGW(TAG, "Initializing Display...");
+	ESP_LOGI(TAG, "Initializing Display with config: sda=%d, sdl=%d, reset=%d,  offset=%d, flip=%d, size: %dx%d", 
-	ESP_LOGI(TAG, "config: sda=%d, sdl=%d, reset=%d,  offset=%d, flip=%d, size: %dx%d", 
 	config.gpio_sda, config.gpio_scl, config.gpio_reset, config.offsetX, config.flip, config.width, config.height);
 
 	i2c_master_init(&dev, config.gpio_sda, config.gpio_scl, config.gpio_reset);
@@ -189,16 +190,17 @@ float getBatteryPercent(){
 
 
 
-//-----------------------
+//-----------------------------
-//----- showScreen1 -----
+//---- showScreen Overview ----
-//-----------------------
+//-----------------------------
 //shows overview on entire display:
-//percentage, voltage, current, mode, rpm, speed
+//Battery percentage, voltage, current, mode, rpm, speed
-void showScreen1(display_task_parameters_t * objects)
+#define STATUS_SCREEN_OVERVIEW_UPDATE_INTERVAL 500
+void showStatusScreenOverview(display_task_parameters_t * objects)
 {
 	//-- battery percentage --
 	// TODO update when no load (currentsensors = ~0A) only
-	//large
+	//-- large batt percent --
 	displayTextLine(&dev, 0, true, false, "B:%02.0f%%", getBatteryPercent());
 
 	//-- voltage and current --
@@ -222,9 +224,29 @@ void showScreen1(display_task_parameters_t * objects)
 				   fabs((objects->speedLeft->getKmph() + objects->speedRight->getKmph()) / 2),
 				   objects->speedLeft->getRpm(),
 				   objects->speedRight->getRpm());
+	vTaskDelay(STATUS_SCREEN_OVERVIEW_UPDATE_INTERVAL / portTICK_PERIOD_MS);
 }
 
 
+//----------------------------
+//----- showScreen Speed -----
+//----------------------------
+// shows speed of each motor in km/h large in two lines and RPM in last line
+#define STATUS_SCREEN_SPEED_UPDATE_INTERVAL 300
+void showStatusScreenSpeed(display_task_parameters_t * objects)
+{
+	// title
+	displayTextLine(&dev, 0, false, false, "Speed L,R - km/h");
+	// show km/h large in two lines
+	displayTextLine(&dev, 1, true, false, "%+.2f", objects->speedLeft->getKmph());
+	displayTextLine(&dev, 4, true, false, "%+.2f", objects->speedRight->getKmph());
+	// show both rotational speeds in one line
+	displayTextLineCentered(&dev, 7, false, false, "%+04.0f:%+04.0f RPM",
+				   objects->speedLeft->getRpm(),
+				   objects->speedRight->getRpm());
+	vTaskDelay(STATUS_SCREEN_SPEED_UPDATE_INTERVAL / portTICK_PERIOD_MS);
+}
+
 
 //------------------------
 //---- showStartupMsg ----
@@ -245,13 +267,19 @@ void showStartupMsg(){
 
 
 
+//============================
+//===== selectStatusPage =====
+//============================
+void display_selectStatusPage(displayStatusPage_t newStatusPage){
+	ESP_LOGW(TAG, "switching statusPage from %d to %d", (int)selectedStatusPage, (int)newStatusPage);
+	selectedStatusPage = newStatusPage;
+}
+
 
 //============================
 //======= display task =======
 //============================
-#define STATUS_SCREEN_UPDATE_INTERVAL 500
 // TODO: separate task for each loop?
-
 void display_task(void *pvParameters)
 {
 	ESP_LOGW(TAG, "Initializing display and starting handle loop");
@@ -275,10 +303,18 @@ void display_task(void *pvParameters)
 			//uses encoder events to control menu and updates display
 			handleMenu(objects, &dev);
 		}
-		else //show status screen in any other mode
+		else //show selected status screen in any other mode
 		{
-			showScreen1(objects);
+			switch (selectedStatusPage)
-			vTaskDelay(STATUS_SCREEN_UPDATE_INTERVAL / portTICK_PERIOD_MS);
+			{
+			default:
+			case STATUS_SCREEN_OVERVIEW:
+				showStatusScreenOverview(objects);
+				break;
+			case STATUS_SCREEN_SPEED:
+				showStatusScreenSpeed(objects);
+				break;
+			}
 		}
 		// TODO add pages and menus
 	}

board_single/main/display.hpp

@@ -24,7 +24,7 @@ extern "C" {
 typedef struct display_config_t {
     gpio_num_t gpio_scl;
     gpio_num_t gpio_sda;
-    gpio_num_t gpio_reset;
+    int gpio_reset; // negative number means reset pin is not connected or not used
     int width;
     int height;
     int offsetX;
@@ -48,6 +48,12 @@ typedef struct display_task_parameters_t {
 } display_task_parameters_t;
 
 
+// enum for selecting the currently shown status page (display content when not in MENU mode)
+typedef enum displayStatusPage_t {STATUS_SCREEN_OVERVIEW=0, STATUS_SCREEN_SPEED, STATUS_SCREEN_JOYSTICK} displayStatusPage_t;
+
+// function to select one of the defined status screens which are shown on display when not in MENU mode
+void display_selectStatusPage(displayStatusPage_t newStatusPage);
+
 //task that inititialized the display, displays welcome message 
 //and releatedly updates the display with certain content
 void display_task( void * pvParameters );

board_single/main/menu.cpp

@@ -34,7 +34,6 @@ static int value = 0;
 //#### center Joystick ####
 //#########################
 void item_centerJoystick_action(display_task_parameters_t * objects, SSD1306_t * display, int value){
-    if (!value) return;
     ESP_LOGW(TAG, "defining joystick center");
     objects->joystick->defineCenter();
     objects->buzzer->beep(3, 60, 40);
@@ -382,6 +381,45 @@ menuItem_t item_reset = {
 };
 
 
+//#####################
+//###### example ######
+//#####################
+void item_statusScreen_action(display_task_parameters_t *objects, SSD1306_t *display, int value)
+{
+    switch (value)
+    {
+    case 1:
+    default:
+        display_selectStatusPage(STATUS_SCREEN_OVERVIEW);
+        break;
+    case 2:
+        display_selectStatusPage(STATUS_SCREEN_SPEED);
+        break;
+    case 3:
+        display_selectStatusPage(STATUS_SCREEN_JOYSTICK);
+        break;
+    }
+}
+int item_statusScreen_value(display_task_parameters_t *objects)
+{
+    return 1; // initial value shown / changed from
+}
+menuItem_t item_statusScreen = {
+    item_statusScreen_action, // function action
+    item_statusScreen_value,  // function get initial value or NULL(show in line 2)
+    NULL,                     // function get default value or NULL(dont set value, show msg)
+    1,                        // valueMin
+    3,                        // valueMax
+    1,                        // valueIncrement
+    "Status Screen   ",       // title
+    "     Select     ",       // line1 (above value)
+    "  Status Screen ",       // line2 (above value)
+    "1: Overview",            // line4 * (below value)
+    "2: Speeds",              // line5 *
+    "3: Joystick",            // line6
+    "                ",       // line7
+};
+
 //#####################
 //###### example ######
 //#####################
@@ -431,8 +469,8 @@ menuItem_t item_last = {
 //####################################################
 //### store all configured menu items in one array ###
 //####################################################
-const menuItem_t menuItems[] = {item_centerJoystick, item_calibrateJoystick, item_debugJoystick, item_maxDuty, item_accelLimit, item_decelLimit, item_reset, item_example, item_last};
+const menuItem_t menuItems[] = {item_centerJoystick, item_calibrateJoystick, item_debugJoystick, item_maxDuty, item_accelLimit, item_decelLimit, item_statusScreen, item_reset, item_example, item_last};
-const int itemCount = 9;
+const int itemCount = 10;
 
 
 

common/chairAdjust.cpp

@@ -79,7 +79,7 @@ void cControlledRest::setState(restState_t targetState)
         gpio_set_level(gpio_up, 0);
         break;
     case REST_OFF:
-        gpio_set_level(gpio_down, 1);
+        gpio_set_level(gpio_down, 0);
         gpio_set_level(gpio_up, 0);
         break;
     }