display routines

Display.cpp

 	}
 }
 
+
+void Display::showFrame(Status status) {
+	ssd1306.clearDisplay();
+	ssd1306.drawRoundRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 3, SSD1306_WHITE);
+	ssd1306.drawLine(37, 0, 37, SCREEN_HEIGHT - 1, SSD1306_WHITE);
+	ssd1306.drawLine(0, 15, 37, 15, SSD1306_WHITE);
+
+	switch (status) {
+		case TOOL_CHANGE:
+			drawStatusText(STATUS_TXT_TOOLCHG);
+			break;
+		case CONFIGURATION:
+			ssd1306.drawLine(37, SCREEN_HEIGHT / 2 - 1, SCREEN_WIDTH - 1, SCREEN_HEIGHT / 2 - 1, SSD1306_WHITE);
+			drawStatusText (STATUS_TXT_CFG);
+			drawConfigText("Steigung");
+			drawConfigOption("03.00 mm");
+			break;
+		case IDLE:
+			ssd1306.drawLine(37, 43, SCREEN_WIDTH - 1, 43, SSD1306_WHITE);
+			drawStatusText(STATUS_TXT_IDLE);
+			break;
+		default:
+			break;
+	}
+
+	display();
+}
+
 /********************************
  ** Private methods
  *******************************/
 	w = w1;
 	h = h1;
 }
+
+void Display::drawStatusText(String txt) {
+	uint16_t w = 0, h = 0;
+	ssd1306.setFont(&titillium_web_regular8pt7b);
+	calculateWH(txt, w, h);
+	ssd1306.setCursor((37 - w) / 2, 11);
+	ssd1306.println(txt);
+}
+
+void Display::drawConfigText(String txt) {
+	uint16_t w = 0, h = 0;
+	ssd1306.setFont(&titillium_web_semibold12pt7b);
+	calculateWH(txt, w, h);
+	ssd1306.setCursor((SCREEN_WIDTH + 37 - w) / 2, SCREEN_HEIGHT / 4 + h / 2 - 1);
+	ssd1306.println(txt);
+}
+
+void Display::drawConfigOption(String txt) {
+	uint16_t w = 0, h = 0;
+	ssd1306.setFont(&titillium_web_semibold12pt7b);
+	calculateWH(txt, w, h);
+	ssd1306.setCursor((SCREEN_WIDTH + 37 - w) / 2, SCREEN_HEIGHT / 4 * 3 + h / 2 - 1);
+	ssd1306.println(txt);
+}

Display.h

 #ifndef DISPLAY_H_
 #define DISPLAY_H_
 
-#include<Adafruit_SSD1306.h>
+#include <Adafruit_SSD1306.h>
 #include <stdint.h>
 #include "fonts/titillium_web_6pt7b.h"
 #include "fonts/titillium_web_8pt7b.h"
 #include "fonts/titillium_web_24pt7b.h"
 #include "fonts/titillium_web_30pt7b.h"
 #include "fonts/SFToolsLogo.h"
+#include <Fonts/FreeSans12pt7b.h>
+#include <Fonts/FreeSans9pt7b.h>
+#include "Status.h"
 
 #define SCREEN_WIDTH 128
 #define SCREEN_HEIGHT 64
 #define SCREEN_ADDRESS 0x3C
 
+#define STATUS_TXT_IDLE "OPR"
+#define STATUS_TXT_TOOLCHG "WZW"
+#define STATUS_TXT_CFG "SETUP"
+
 class Display {
 	private:
 		Adafruit_SSD1306 ssd1306;
 		void calculateWH(String units, uint16_t &w, uint16_t &h);
+		void drawStatusText(String txt);
+		void drawConfigText(String txt);
+		void drawConfigOption(String txt);
+
 	public:
 		Display();
 		void init(void);
 		void clearDisplay(void);
 		void showBrand(void);
 		void showInitialization(void);
+		void showFrame(Status status);
 };
 
 #endif /* DISPLAY_H_ */

Fraestisch_SFTools.ino

  */
 
 #include <Arduino.h>
+#include <esp32-hal.h>
+#include <esp32-hal-gpio.h>
+#include <ESP_FlexyStepper.h>
+#include <HardwareSerial.h>
+#include <pins_arduino.h>
 #include <RotaryEncoder.h>
 #include <Wire.h>
-#include <Adafruit_GFX.h>
-#include <ESP_FlexyStepper.h>
+#include <WString.h>
+
 #include "Display.h"
-#include "WLS.h"
 #include "ExEzButton.h"
+#include "RotaryControler.h"
 #include "RouterSetup.h"
 #include "Status.h"
+#include "WLS.h"
 
 #define SDA 22
 #define SCX 23
 ExEzButton RedButton(RedBtn_Pin, false, 2000);
 ExEzButton GreenButton(GreenBtn_Pin, false, 2000);
 ExEzButton BlueButton(BlueBtn_Pin, false, 2000);
-ExEzButton RotarySwitch(RotEnc_Switch_Pin, true, 2000);
+//ExEzButton RotarySwitch(RotEnc_Switch_Pin, true, 2000);
 
 WLS WlsDetect(WLS_DETECT_Pin, true);
 WLS Wls(WLS_Pin);
 
-RotaryEncoder encoder(RotEnc_Dta_Pin, RotEnc_Clk_Pin, RotaryEncoder::LatchMode::FOUR3);
+RotaryControler RotaryControler(RotEnc_Dta_Pin, RotEnc_Clk_Pin, RotEnc_Switch_Pin);
 Display Display;
-ESP_FlexyStepper stepper;
-RouterSetup routerSetup;
+ESP_FlexyStepper Stepper;
+RouterSetup Router_Setup;
 
 Status actualStatus;
 Status originStatus;
 //*** Initialization routine. Reads the eeprom first and sets the (potentially new) configured values.
 //*****************************************************************************************************
 void Initialize() {
-	routerSetup.readFromEEPROM();
-	routerSetup.printValues();
+	Router_Setup.readFromEEPROM();
+	Router_Setup.printValues();
 
 	Display.showInitialization();
 	//attach an interrupt to the IO pin of the limit switch and specify the handler function
 	attachInterrupt(digitalPinToInterrupt(LIMIT_SWITCH), limitSwitchHandler, CHANGE);
-	stepper.connectToPins(STEP, DIR);
+	Stepper.connectToPins(STEP, DIR);
 	// set the speed and acceleration rates for the stepper motor
-	stepper.setSpeedInStepsPerSecond(routerSetup.getSpeed() * routerSetup.getStepsPerRev());
-	stepper.setStepsPerRevolution(routerSetup.getStepsPerRev());
-	stepper.setStepsPerMillimeter(routerSetup.getStepsPerRev() / routerSetup.getPitch());
-	stepper.setAccelerationInStepsPerSecondPerSecond(routerSetup.getAcceleration() * routerSetup.getStepsPerRev());
-	stepper.setDecelerationInStepsPerSecondPerSecond(routerSetup.getAcceleration() * routerSetup.getStepsPerRev());
-	stepper.startAsService(0);
-	if (routerSetup.isToolChangOnPowerOn()) {
+	Stepper.setSpeedInStepsPerSecond(Router_Setup.getSpeed() * Router_Setup.getStepsPerRev());
+	Stepper.setStepsPerRevolution(Router_Setup.getStepsPerRev());
+	Stepper.setStepsPerMillimeter(Router_Setup.getStepsPerRev() / Router_Setup.getPitch());
+	Stepper.setAccelerationInStepsPerSecondPerSecond(Router_Setup.getAcceleration() * Router_Setup.getStepsPerRev());
+	Stepper.setDecelerationInStepsPerSecondPerSecond(Router_Setup.getAcceleration() * Router_Setup.getStepsPerRev());
+	Stepper.startAsService(0);
+	if (Router_Setup.isToolChangOnPowerOn()) {
 		actualStatus = TOOL_CHANGE;
 	} else {
 		actualStatus = IDLE;
 	BlueButton.setDebounceTime(50);
 	WlsDetect.setDebounceTime(50);
 	Wls.setDebounceTime(50);
-	RotarySwitch.setDebounceTime(50);
+	RotaryControler.setDebounceTime(50);
 
 	delay(1500);
 	Display.showBrand();
 	BlueButton.loop();
 	WlsDetect.loop();
 	Wls.loop();
-	RotarySwitch.loop();
+	RotaryControler.loop();
+
+	Display.showFrame(actualStatus);
 
 	switch (actualStatus) {
 
 
 		case TOOL_CHANGE:
 			printStatus("TOOL_CHANGE");
-			if (RotarySwitch.isLongPressed()) {
+			if (RotaryControler.isSwitchLongPressed()) {
 				actualStatus = CONFIGURATION;
 			} else if (BlueButton.isPressed()) {
 				actualStatus = IDLE;
 
 		case CONFIGURATION:
 			printStatus("CONFIGURATION");
-			if (RotarySwitch.isLongPressed()) {
+			if (RotaryControler.isSwitchLongPressed()) {
 				actualStatus = INITIALIZATION;
 			} else if (BlueButton.isPressed()) {
 				actualStatus = IDLE;
 		case NULLING:
 			printStatus("NULLING");
 			if (RedButton.isPressed()) {
-				stepper.setCurrentPositionInMillimeters(0);
-				stepper.setTargetPositionRelativeInMillimeters(0);
+				Stepper.setCurrentPositionInMillimeters(0);
+				Stepper.setTargetPositionRelativeInMillimeters(0);
 				actualStatus = IDLE;
 			}
 			break;
 			if (nullingTLS_intermediateState == 0) {
 				printStatus("NULLING_TLS,0");
 				//Move elevator to lowest point (lower limit switch triggers)
-				stepper.setTargetPositionRelativeInMillimeters(300 * MOVE_DOWNWARD);
+				Stepper.setTargetPositionRelativeInMillimeters(300 * MOVE_DOWNWARD);
 				actualStatus = MOVING_ELEVATOR;
 				nullingTLS_intermediateState = 1;
 			} else if (nullingTLS_intermediateState == 1) {
 				printStatus("NULLING_TLS,1");
 				if (RedButton.isPressed()) {
 					//Move elevator until it touch the TLS (WLS_PIN goes HIGH)
-					stepper.setTargetPositionRelativeInMillimeters(300 * MOVE_UPWARD);
+					Stepper.setTargetPositionRelativeInMillimeters(300 * MOVE_UPWARD);
 					actualStatus = MOVING_ELEVATOR;
 					nullingTLS_intermediateState = 2;
 				}
 			} else if (nullingTLS_intermediateState == 2) {
 				printStatus("NULLING_TLS,2");
 				//Move elevator back about toolLenghtSensorHeight (will be the 0-Position)
-				stepper.clearLimitSwitchActive();
-				stepper.setTargetPositionRelativeInMillimeters(routerSetup.getToolLenghtSensorHeight() * MOVE_DOWNWARD);
-				Serial.println(String(routerSetup.getToolLenghtSensorHeight() * MOVE_DOWNWARD, 2));
+				Stepper.clearLimitSwitchActive();
+				Stepper.setTargetPositionRelativeInMillimeters(Router_Setup.getToolLenghtSensorHeight() * MOVE_DOWNWARD);
+				Serial.println(String(Router_Setup.getToolLenghtSensorHeight() * MOVE_DOWNWARD, 2));
 				actualStatus = MOVING_ELEVATOR;
 				nullingTLS_intermediateState = 3;
 			} else { // nullingTLS_intermediateState is 3
 				printStatus("NULLING_TLS,3");
 				//Set the 0-Position as actual position
-				stepper.setCurrentPositionInMillimeters(0);
-				stepper.setTargetPositionRelativeInMillimeters(0);
+				Stepper.setCurrentPositionInMillimeters(0);
+				Stepper.setTargetPositionRelativeInMillimeters(0);
 				actualStatus = IDLE;
 				nullingTLS_intermediateState = 0;
 			}
 			printStatus("MOVING_ELEVATOR");
 			if (limitSwitchState == LOW) {
 				// this will cause to stop any motion that is currently going on and block further movement in the same direction as long as the switch is active
-				stepper.setLimitSwitchActive(stepper.LIMIT_SWITCH_COMBINED_BEGIN_AND_END);
+				Stepper.setLimitSwitchActive(Stepper.LIMIT_SWITCH_COMBINED_BEGIN_AND_END);
 				delay(200);
 				actualStatus = RELEASE_SWITCH;
 			} else {  // limitSwitchState is HIGH
-				if (stepper.getDistanceToTargetSigned() == 0) {
+				if (Stepper.getDistanceToTargetSigned() == 0) {
 					actualStatus = originStatus;
 					delay(200);
 				} else if (WlsDetect.isConnected()) {
 					if (Wls.isPlugged()) {
 						Serial.println("The Tool is away from WLS");
-						stepper.clearLimitSwitchActive();
+						Stepper.clearLimitSwitchActive();
 					} else if (Wls.isUnplugged()) {
 						Serial.println("The Tool touched the WLS");
-						stepper.setLimitSwitchActive(stepper.LIMIT_SWITCH_COMBINED_BEGIN_AND_END);
+						Stepper.setLimitSwitchActive(Stepper.LIMIT_SWITCH_COMBINED_BEGIN_AND_END);
 						actualStatus = originStatus;
 						delay(200);
 					}
 				}
-				stepper.clearLimitSwitchActive();
-				previousDirection = stepper.getDirectionOfMotion();
+				Stepper.clearLimitSwitchActive();
+				previousDirection = Stepper.getDirectionOfMotion();
 			}
 			break;
 
 		case RELEASE_SWITCH:
 			if (limitSwitchState == LOW) {
-				stepper.moveRelativeInMillimeters(0.05 * previousDirection * -1); // move in opposite direction (away from switch)
+				Stepper.moveRelativeInMillimeters(0.05 * previousDirection * -1); // move in opposite direction (away from switch)
 			} else {
 				actualStatus = originStatus;
 			}
 //	}
 //
 //	static int pos = 0;
-//	encoder.tick();
-//	int newPos = encoder.getPosition();
+	//RotaryControler.tick();
+	//int newPos = RotaryControler.getPosition();
 //	if (pos != newPos) {
 //		Serial.print("pos:");
 //		Serial.print(newPos);
 //		Serial.print(" dir:");
-//		Serial.println((int) (encoder.getDirection()));
+//	Serial.println((int) (RotaryControler.getDirection()));
 //		pos = newPos;
 //	}
 

sloeber.ino.cpp

 //This is a automatic generated file
 //Please do not modify this file
 //If you touch this file your change will be overwritten during the next build
-//This file has been generated on 2022-02-02 13:52:27
+//This file has been generated on 2022-02-04 21:44:36
 
 #include "Arduino.h"
 #include <Arduino.h>
+#include <esp32-hal.h>
+#include <esp32-hal-gpio.h>
+#include <ESP_FlexyStepper.h>
+#include <HardwareSerial.h>
+#include <pins_arduino.h>
 #include <RotaryEncoder.h>
 #include <Wire.h>
-#include <Adafruit_GFX.h>
-#include <ESP_FlexyStepper.h>
+#include <WString.h>
 #include "Display.h"
-#include "WLS.h"
 #include "ExEzButton.h"
+#include "RotaryControler.h"
 #include "RouterSetup.h"
 #include "Status.h"
+#include "WLS.h"
 
 void printStatus(String actualStatus) ;
 void limitSwitchHandler() ;