From 23aaa890d5d30d5dba5f642a17ed7ef5bf22d7d9 Mon Sep 17 00:00:00 2001
From: Alexander Klein <alex@kleiax.de>
Date: Thu, 3 Feb 2022 10:43:01 +0100
Subject: [PATCH] begin a refactor

---
 doc/Diagrams/classdiagramm.uxf | 96 ++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 17 deletions(-)

diff --git a/doc/Diagrams/classdiagramm.uxf b/doc/Diagrams/classdiagramm.uxf
index aa34dcf..19ccf23 100644
--- a/doc/Diagrams/classdiagramm.uxf
+++ b/doc/Diagrams/classdiagramm.uxf
@@ -1,25 +1,36 @@
-<diagram program="umletino" version="14.4.0-SNAPSHOT"><zoom_level>10</zoom_level><element><id>UMLClass</id><coordinates><x>350</x><y>0</y><w>220</w><h>510</h></coordinates><panel_attributes>&lt;&lt;hardware&gt;&gt;
+<diagram program="umletino" version="14.4.0-SNAPSHOT"><zoom_level>10</zoom_level><element><id>UMLClass</id><coordinates><x>750</x><y>10</y><w>220</w><h>650</h></coordinates><panel_attributes>&lt;&lt;hardware&gt;&gt;
 MotorControl
 --
-- name: String
-- debug: DebugMqtt*
-- target_power: int8_t = 0
-- power: int8_t = 0
-- direction: uint8_t = 0
-- last_millis: uint64_t = 0;
+- target_power: int8_t
+- power: int8_t
+- direction: uint8_t
+
+
 - pwm_pin: uint8_t
 - pwm_channel: uint8_t
-- direction_pin_1: uint8_t
-- direction_pin_2: uint8_t
+- pwm_res: uint8_t
+- dutycycle_min: uint8_t
+- dutycycle_max: uint8_t
+- direction_1: uint8_t
+- direction_2: uint8_t
+- delay: uint8_t
+- powersteps: uint8_t
+
+- last_millis: uint32_t
 --
 + MotorControl()
 + init(pwm_pin: uint8_t,
-	   pwm_channel: uint8_t,
-	  	 direction_1: uint8_t, 
-  		 direction_2: uint8_t, 
-	  	 name: String)
+	  pwm_channel: uint8_t,
+	  dir_1: uint8_t, dir_2: uint8_t)
++ loop(): uint16_t
 + runMotorControl()
-+ setTargetPower(power: int8_t)
+
++ setMinPwm(uint8_t)
++ setMaxPwm(uint8_t)
++ setPowerSteps(uint8_t): uint16_t
++ setTargetPower(uint8_t)
++ setDelay(uint8_t): uint16_t
+
 + stop()
 + emergencyStop()
 + toString()
@@ -28,8 +39,11 @@ MotorControl
 + isTargetPowerReached(): bool
 + isAccelerationPositive(): bool
 + isAccelerationNegative(): bool
+
 - setRealPower(power: int8_t)
-- increasePower(power: int8_t)</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>80</x><y>380</y><w>220</w><h>330</h></coordinates><panel_attributes>&lt;&lt;hardware&gt;&gt;
+- increasePower(power: int8_t)
+
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>80</x><y>380</y><w>220</w><h>330</h></coordinates><panel_attributes>&lt;&lt;hardware&gt;&gt;
 Speedometer
 --
 - encoder: ESP32Encoder
@@ -72,7 +86,7 @@ Speedometer
 + setSpeed(speed: double)
 + setRotationspeed(speed: double)
 - calcWheelSpeed()
-- regulateMotors()</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>580</x><y>0</y><w>220</w><h>330</h></coordinates><panel_attributes>&lt;&lt;driveModi&gt;&gt;
+- regulateMotors()</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>370</x><y>10</y><w>220</w><h>330</h></coordinates><panel_attributes>&lt;&lt;driveModi&gt;&gt;
 ManualControl
 --
 - encoder: ESP32Encoder
@@ -92,4 +106,52 @@ ManualControl
 + getSpeed(): double
 + getDirection(): uint8_t
 - addValToBuf(val: int16_t)
-- getAverage(): int16_t</panel_attributes><additional_attributes></additional_attributes></element></diagram>
\ No newline at end of file
+- getAverage(): int16_t</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1270</x><y>10</y><w>210</w><h>240</h></coordinates><panel_attributes>MenuControl
+--
+# parentMenu: MenuControl*
+# lcd: LiquidCrystal_I2C*
+--
+/+down()/
+/+up()/
+/+right()/
+/+left()/
+/+yes()/
+/+no()/
+
+/+update()/
+/+printMenu()/
+
++ setParentMenu(MenuControl*)
++ setLcd(LiquidCrystal_I2C*)</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>980</x><y>10</y><w>280</w><h>270</h></coordinates><panel_attributes>MenuAction
+--
+- name: char*
+
+- *function: void
+- *callback: void
+
+- isMenu: bool
+- menu: MenuControl
+--
++ MenuAction(const char*, (*function), (*callback))
++ MenuAction(const char*, (*function))
++ MenuAction(const char*, MenuControl* menu)
+
++ runAction()
+
++ getName(): const char*
++ getIsMenu(): bool 
++ getMenu(): MenuControl*
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>UMLClass</id><coordinates><x>1220</x><y>360</y><w>280</w><h>160</h></coordinates><panel_attributes>Menu
+--
+- inSubmenu: bool
+
+- entrys: list&lt;MenuAction*&gt;
+- selectedEntry: list&lt;MenuAction*&gt;::iterator
+
+- isMenu: bool
+- menu: MenuControl
+--
++ addEntry(MenuAction* entry)
+</panel_attributes><additional_attributes></additional_attributes></element><element><id>Relation</id><coordinates><x>1350</x><y>240</y><w>30</w><h>140</h></coordinates><panel_attributes>lt=&lt;&lt;-</panel_attributes><additional_attributes>10;10;10;120</additional_attributes></element><element><id>Relation</id><coordinates><x>1080</x><y>270</y><w>160</w><h>190</h></coordinates><panel_attributes>lt=-
+m1=*
+m2=0..1</panel_attributes><additional_attributes>10;10;10;160;140;160</additional_attributes></element></diagram>
\ No newline at end of file