From b4c936dece144dff1dc61d6b3b5e6285087d8669 Mon Sep 17 00:00:00 2001
From: Jarin <info@macrohard.cz>
Date: Tue, 30 Nov 2021 00:39:52 +0100
Subject: [PATCH] ver 2.21.11.3010

Last version firmware, added Pulse configuration
---
 Software/CubeMX/.cproject                |  11 +-
 Software/CubeMX/Application/ButtonBeep.c |   2 +-
 Software/CubeMX/Application/ButtonBeep.h |   2 +-
 Software/CubeMX/Application/display.c    |  45 ++++--
 Software/CubeMX/Application/display.h    |   4 +-
 Software/CubeMX/Application/loop.c       | 173 ++++++++++++++---------
 Software/CubeMX/Application/utility.c    |  44 ++----
 Software/CubeMX/Application/utility.h    |   2 +-
 Software/CubeMX/Inc/main.h               |   2 +-
 Software/CubeMX/SPD_DC_Motor.ioc         |   2 +-
 Software/CubeMX/Src/main.c               |  17 +--
 11 files changed, 174 insertions(+), 130 deletions(-)

diff --git a/Software/CubeMX/.cproject b/Software/CubeMX/.cproject
index 4b9c0a7..57dde02 100644
--- a/Software/CubeMX/.cproject
+++ b/Software/CubeMX/.cproject
@@ -144,6 +144,7 @@
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
 								</option>
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.verbose.1715505664" name="Verbose (-v)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.verbose" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.199921521" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="true" valueType="stringList"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.811083826" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1359136415" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
@@ -154,6 +155,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1391397879" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" useByScannerDiscovery="false" value="${workspace_loc:/${ProjName}/STM32F103C8TX_FLASH.ld}" valueType="string"/>
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.verbose.1240650343" name="Verbose (-Wl,--verbose)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.verbose" useByScannerDiscovery="false" value="false" valueType="boolean"/>
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.cref.1070556615" name="Add symbol cross reference table to map file (-Wl,--cref)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.cref" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags.1608800563" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.955430234" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -196,7 +198,14 @@
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
-	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/SPD_DC_Motor"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/SPD_DC_Motor"/>
+		</configuration>
+	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 </cproject>
\ No newline at end of file
diff --git a/Software/CubeMX/Application/ButtonBeep.c b/Software/CubeMX/Application/ButtonBeep.c
index 7f76970..a1f0935 100644
--- a/Software/CubeMX/Application/ButtonBeep.c
+++ b/Software/CubeMX/Application/ButtonBeep.c
@@ -18,7 +18,7 @@
 static BtnState BtnPUSH = {false,But_None,BPUSH_GPIO_Port, BPUSH_Pin};
 static BtnState BtnPULL = {false,But_None,BPULL_GPIO_Port, BPULL_Pin};
 static BtnState BtnCFG = {false,But_None,BCFG_GPIO_Port, BCFG_Pin};
-BtnState* ButList[] = {&BtnPUSH, &BtnPULL, &BtnCFG};
+volatile BtnState* ButList[] = {&BtnPUSH, &BtnPULL, &BtnCFG};
 
 static uint8_t BuzzerActive = 0;
 
diff --git a/Software/CubeMX/Application/ButtonBeep.h b/Software/CubeMX/Application/ButtonBeep.h
index 162ee23..4888ae5 100644
--- a/Software/CubeMX/Application/ButtonBeep.h
+++ b/Software/CubeMX/Application/ButtonBeep.h
@@ -44,7 +44,7 @@ typedef enum{
 	bbb_ToneTd_VeryHigh = 4
 }bbb_ToneTd;
 
-extern BtnState* ButList[CountButtons];
+extern volatile BtnState* ButList[CountButtons];
 
 extern void bbb_Beep(uint8_t tone, uint8_t time);
 extern void bbb_Melody2(uint8_t tone1, uint8_t tone2, uint16_t time);
diff --git a/Software/CubeMX/Application/display.c b/Software/CubeMX/Application/display.c
index 1852e45..a69a2c3 100644
--- a/Software/CubeMX/Application/display.c
+++ b/Software/CubeMX/Application/display.c
@@ -16,20 +16,33 @@
 //INIT SCREEN INFO --- 18 char per line max
 #define DEVSTRING  "DCMotor dispenser"
 #define NAMESTRING " By Jarin (c)2021"
-#define REVSTR     "       v2.0"
+#define REVSTR     "  v2.21.11.3010"
 
 #define TMPSIZE	21	//18 is the length of line
 char Tmp[TMPSIZE];
 char Line[TMPSIZE];
 char floatBuf[10]; //temp buffer for float conversion
+char PulseText[6];
 char DurationText[6];
 char SpeedText[6];
 
+char* disp_PulseDesc(int16_t pulse)
+{
+	if(pulse>0)
+	{
+		floatToString(floatBuf, (float)((pulse*100)/1000.0), 1, 2, 1);
+		strcpy(PulseText,floatBuf);
+		strcat(PulseText,"s");
+	}
+	else strcpy(PulseText,"Dis ");
+
+	return PulseText;
+}
 char* disp_RetractDurationDesc(int16_t Duration)
 {
 	if(Duration>0)
 	{
-		floatToString(floatBuf, (float)((Duration*100)/1000.0), 1, 3 );
+		floatToString(floatBuf, (float)((Duration*100)/1000.0), 1, 3, 0);
 		strcpy(DurationText,floatBuf);
 		strcat(DurationText,"s");
 	}
@@ -37,7 +50,6 @@ char* disp_RetractDurationDesc(int16_t Duration)
 
 	return DurationText;
 }
-
 char* disp_SpeedDesc(int16_t Speed)
 {
 	itoa(Speed*5,SpeedText,10);
@@ -45,7 +57,6 @@ char* disp_SpeedDesc(int16_t Speed)
 	return SpeedText;
 }
 
-
 /*
  * Draws frame around specified area (optionally filled with black color)
  */
@@ -63,7 +74,6 @@ void disp_DrawFrame(uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2, uint8_t isFi
 	}
 }
 
-
 /*
  * Draws "saved" pop-up window in the center of the screen
  */
@@ -77,7 +87,6 @@ void disp_DrawSavedPopup(void){
 	SSD1306_UpdateScreen();
 }
 
-
 /*
  * Draws loading screen with battery voltage and core temperature
  */
@@ -101,33 +110,37 @@ void disp_DrawInitScreen(void){
 
  * Draws normal screen, cfg mode specifies which configuration is highlighted, pushspeed, pullduration is string representation of selected parameters
  */
-void disp_DrawScreen(disp_CfgModeTd cfgMode, char* pushSpeed, char* pullDur, float vBat, float iMeas, float tCore){
+void disp_DrawScreen(disp_CfgModeTd cfgMode, char* pushSpeed, char* pullDur, char* pushPulse, float vBat, float iMeas, float tCore){
 
 	SSD1306_Fill(SSD1306_COLOR_BLACK);
 	//disp_DrawFrame(0, 0, 127, Start_Y+31, 0);
 
 	//FIRST LINE
-	strcpy(Line,"  Speed:   ");
+	strcpy(Line," Speed ");
 	strcat(Line,pushSpeed);
 	SSD1306_GotoXY(1, Start_Y+0);
 	SSD1306_Puts(Line, &Font_7x10, SSD1306_COLOR_WHITE);
 
 	//SECOND LINE
-	strcpy(Line,"  Retract: ");
+	strcpy(Line," Retr ");
 	strcat(Line,pullDur);
+	strcat(Line," Puls");
+	strcat(Line,pushPulse);
 	SSD1306_GotoXY(1, Start_Y+10);
 	SSD1306_Puts(Line, &Font_7x10, SSD1306_COLOR_WHITE);
 
 	//THIRD LINE - button functions
 	if(cfgMode>0){
-		strcpy(Line,"   OK   Less  More");
+		strcpy(Line," Pulse ");
+		strcat(Line,pushPulse);
+		//strcpy(Line,"   OK   Less  More");
 	}
 	else{
-		strcpy(Line,"Bat: ");
-		floatToString(floatBuf, vBat, 1, 3 );
+		strcpy(Line,"Bat ");
+		floatToString(floatBuf, vBat, 1, 3, 0 );
 		strcat(Line,floatBuf);
-		strcat(Line,"V t:");
-		floatToString(floatBuf, tCore, 1, 3 );
+		strcat(Line,"V CPU");
+		floatToString(floatBuf, tCore, 1, 3, 0 );
 		strcat(Line,floatBuf);
 		strcat(Line,"^C"); // file font.c is upgrade to Degrees symbol on the 94(0x5E '^') char position
 	}
@@ -144,6 +157,10 @@ void disp_DrawScreen(disp_CfgModeTd cfgMode, char* pushSpeed, char* pullDur, flo
 		SSD1306_GotoXY(0, Start_Y+10);
 		SSD1306_Putc('o', &Font_7x10, SSD1306_COLOR_WHITE);
 	}
+	else if(cfgMode == disp_CfgModeTd_Pulse){
+		SSD1306_GotoXY(0, Start_Y+21);
+		SSD1306_Putc('o', &Font_7x10, SSD1306_COLOR_WHITE);
+	}
 
 	SSD1306_UpdateScreen();
 }
diff --git a/Software/CubeMX/Application/display.h b/Software/CubeMX/Application/display.h
index 89f9651..3b88573 100644
--- a/Software/CubeMX/Application/display.h
+++ b/Software/CubeMX/Application/display.h
@@ -13,13 +13,15 @@ typedef enum{
 	disp_CfgModeTd_None = 0,
 	disp_CfgModeTd_Speed = 1,
 	disp_CfgModeTd_Ret = 2,
+	disp_CfgModeTd_Pulse = 3,
 }disp_CfgModeTd;
 
+extern char* disp_PulseDesc(int16_t pulse);
 extern char* disp_RetractDurationDesc(int16_t Duration);
 extern char* disp_SpeedDesc(int16_t Speed);
 extern void disp_DrawSavedPopup(void);
 extern void disp_DrawInitScreen(void);
-extern void disp_DrawScreen(disp_CfgModeTd cfgMode, char* pushSpeed, char* pullDur, float vBat, float iMeas, float tCore);
+extern void disp_DrawScreen(disp_CfgModeTd cfgMode, char* pushSpeed, char* pullDur, char* pushPulse, float vBat, float iMeas, float tCore);
 //extern void disp_DrawScreenDate(disp_CfgModeTd cfgMode, char* pushSpeed, char* pullDur, RTC_DateTypeDef *rtcDate);
 
 
diff --git a/Software/CubeMX/Application/loop.c b/Software/CubeMX/Application/loop.c
index 9c5a2f1..e6f4716 100644
--- a/Software/CubeMX/Application/loop.c
+++ b/Software/CubeMX/Application/loop.c
@@ -3,6 +3,7 @@
  *
  *  Created on: 21. 11. 2021
  *      Author: Jarek
+ *      version 2.21.11.3010
  */
 
 #pragma GCC diagnostic ignored "-Wunused-variable"
@@ -11,6 +12,7 @@
 #include "tim.h"
 
 #include "main.h"
+#include "gpio.h"
 #include <stdio.h>
 #include <stdbool.h>
 #include "stm32f1xx_hal_def.h"
@@ -48,16 +50,16 @@ uint8_t CompareDate;
 // last Element = count active elements
 // ENUM need to start from 0 and must continue sequentially 0,1,2,.....,lastElement
 enum eTimers {
-	OneSec = 0,
-	Button10,
+	Button10 = 0,
 	FunctionDelay,
+	Measurement,
 	CountTimers // is not in the set of active elements, only for element count in ENUM
 };
 
 volatile TIMER Timers[CountTimers]; //number of Timers is correct for this code implementation C
-BtnState *pBtnPUSH;
-BtnState *pBtnPULL;
-BtnState *pBtnCFG;
+//BtnState *pBtnPUSH;
+//BtnState *pBtnPULL;
+//BtnState *pBtnCFG;
 
 static int16_t SpeedMode = 5;
 static const uint16_t AdrSpeedMode = 0x1111; //virtual address to EPROM
@@ -67,6 +69,10 @@ static int16_t RetractDuration = 5;
 static const uint16_t AdrRetractDuration = 0x2222; //virtual address to EPROM
 bool RetractDurationChange = false;
 
+static int16_t Pulse = 5;
+static const uint16_t AdrPulse = 0x3333; //virtual address to EPROM
+bool PulseChange = false;
+
 static disp_CfgModeTd CfgMode = disp_CfgModeTd_None;
 
 uint8_t RedrawRequested = 1;
@@ -75,7 +81,7 @@ volatile uint8_t I2C_DMA_Completed = 1;
 extern const float		VMRESH;	//Rezistor R1 from Voltage divider									//Ohms
 extern const float		VMRESL;	//Rezistor R2 from Voltage divider								//Ohms
 
-extern const float		IMSENSR; //Measure rezistor ohm									//Ohms
+extern const float		IMSENSR; //Measurement rezistor ohm									//Ohms
 
 extern const float		VREF;			//VDDA 3.3V									//Volts
 extern const float		AVG_SLOPE;      // slope (gradient) of temperature line function  [V/°C]
@@ -93,7 +99,8 @@ F_RUN RunFunction; // Variable for the indirect call function
 
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
-/* USER CODE BEGIN PFP */
+void DebugPinsDissable(void);
+void StartFunctionTimer(uint16_t val);
 void GetDateLoop(void);
 void SetRTC(void);
 void BackupDateToBR(void);
@@ -123,16 +130,16 @@ uint16_t _write(uint16_t file, char *ptr, uint16_t len)
 
   return len;
 }
-#endif
 int __io_putchar(int ch) {
     ITM_SendChar(ch);
     return ch;
 }
+#endif
 
 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 {
 	for(uint8_t i=0;i<UT_SIZEOFARRAY(ButList); i++) {
-		if (GPIO_Pin == ButList[i]->Pin && !ButList[i]->IntStart)  {
+		if (GPIO_Pin == ButList[i]->Pin && !ButList[i]->IntStart && Timers[Button10].Control.Run == 0)  {
 			ButList[i]->IntStart = true;
 			Timers[Button10].Control.Run = 1; //Start Timer to 10ms
 			return;
@@ -164,23 +171,24 @@ void SaveToEprom()
 {
 	EE_Write(AdrSpeedMode, SpeedMode);
 	EE_Write(AdrRetractDuration, RetractDuration);
+	EE_Write(AdrPulse, Pulse);
 }
 
 void ReadFromEprom()
 {
 	EE_Read(AdrSpeedMode, &SpeedMode);
 	EE_Read(AdrRetractDuration, &RetractDuration);
+	EE_Read(AdrPulse, &Pulse);
 }
 //Restore variables from EPROM after start if exist, otherwise save default values to EPROM
 void RestoreFromEprom()
 {
-	  /* EEPROM Init */
-	  EE_Init();
-	  ReadFromEprom();
-	  if(SpeedMode == EEPROM_DEFAULT_DATA)
-		  { SpeedMode=5; EE_Write(AdrSpeedMode, SpeedMode);}
-	  if(RetractDuration == EEPROM_DEFAULT_DATA)
-		  {RetractDuration=5; EE_Write(AdrRetractDuration, RetractDuration);}
+	/* EEPROM Init */
+	EE_Init();
+	ReadFromEprom();
+	if(SpeedMode == EEPROM_DEFAULT_DATA) { SpeedMode=5; EE_Write(AdrSpeedMode, SpeedMode);}
+	if(RetractDuration == EEPROM_DEFAULT_DATA) {RetractDuration=5; EE_Write(AdrRetractDuration, RetractDuration);}
+	if(Pulse == EEPROM_DEFAULT_DATA) {Pulse=5; EE_Write(AdrPulse, Pulse);}
 }
 
 /* The number of user timers is limited by the parent interrupt period.
@@ -188,12 +196,7 @@ void RestoreFromEprom()
    the number of timers. */
 void InitTimers()
 {
-	Timers[OneSec].Value = 1000; //Uses the named Timer in the timers field this is OneSec Timer
-	Timers[OneSec].Tick = 0;
-	Timers[OneSec].Control.Reload = 1;
-	Timers[OneSec].Control.Run = 1;	//Init timer to Start mode
-
-	Timers[Button10].Value = 10; // 10ms value
+	Timers[Button10].Value = 8; // 10ms value
 	Timers[Button10].Tick = 0;
 	Timers[Button10].Control.Reload = 0; // OneShot Timer No Reload
 	Timers[Button10].Control.Run = 0;	//Init Timer to Stop
@@ -204,8 +207,30 @@ void InitTimers()
 	Timers[FunctionDelay].Control.Reload = 0; // OneShot Timer No Reload
 	Timers[FunctionDelay].Control.Run = 0;	//Stop timer
 
+	Timers[Measurement].Value = 100; //100ms
+	Timers[Measurement].Tick = 0;
+	Timers[Measurement].Control.Reload = 1;
+	Timers[Measurement].Control.Run = 1;	//Init timer to Start mode
+	Timers[Measurement].Control.Over = 1; // For first shot after Setup
+
 }
+void DebugPinsDissable()
+{
+	  GPIO_InitTypeDef GPIO_InitStruct = {0};
+
+	  /*Configure GPIO pins : SWDIO_Pin SWCLK_Pin */
+	  GPIO_InitStruct.Pin = SWDIO_Pin|SWCLK_Pin;
+	  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+	  GPIO_InitStruct.Pull = GPIO_PULLDOWN;
+	  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+	  /*Configure GPIO pin : SWO_Pin */
+	  GPIO_InitStruct.Pin = SWO_Pin;
+	  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+	  GPIO_InitStruct.Pull = GPIO_PULLDOWN;
+	  HAL_GPIO_Init(SWO_GPIO_Port, &GPIO_InitStruct);
 
+}
 /* Is called ideally in SysTick_Handler interrupt set to 1ms,
    but it can also be called by another periodic routine with a different period.
    Then it is necessary to set the correct value "Value" in "InitTimers()" */
@@ -215,18 +240,25 @@ void TimerAction(void)
 	{
 	   if(Timers[i].Control.Run==0) continue;  //Run = 0 -> Timer is OFF
 	   if(Timers[i].Value==0) continue;  //Value = 0 -> Timer is OFF
+	   if(Timers[i].Control.Over==1) continue;  //Value = 1 -> Timer is Over and no overflow handling is performed
 
 	   if(Timers[i].Tick==0) Timers[i].Tick = Timers[i].Value; //Fill timer count value after start
-	   if(--Timers[i].Tick>0) continue;
+	   if(--Timers[i].Tick!=0) continue;
 
+	   // if Timers[i].Tick=0 Timer id ended
 	   if(Timers[i].Control.Reload) Timers[i].Tick = Timers[i].Value; //reload timer with refresh value
 	   else Timers[i].Control.Run=0; // No reload Timer OFF
 
 	   Timers[i].Control.Over = 1; //Set Over
-	   Timers[i].Control.OverCount++; //INC OverCount
+	   Timers[i].Control.OverCount++; //INC OverCount max 31(5bits) overflows is counted
 	}
 }
-
+void StartFunctionTimer(uint16_t val)
+{
+	  Timers[FunctionDelay].Control.Over=0; //Clear Over;
+	  Timers[FunctionDelay].Value = val; //Wait for retraction duration val time
+	  Timers[FunctionDelay].Control.Run=1; //Start Timer;
+}
 void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c)
 {
   /* Prevent unused argument(s) compilation warning */
@@ -237,7 +269,6 @@ void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c)
             the HAL_I2C_SlaveTxCpltCallback could be implemented in the user file
    */
 }
-
 void Buttons(void)
 {// Debouncing Time for key over
 	if(Timers[Button10].Control.Over==0) return;
@@ -247,7 +278,8 @@ void Buttons(void)
 		if(ButList[i]->IntStart){
 			ButList[i]->IntStart = false; // Clear state for next action with key
 			if ((ButList[i]->Port->IDR & ButList[i]->Pin)==0) ButList[i]->LastState = But_Pressed;//Rising so pressed
-			else ButList[i]->LastState = But_Released;//Falling so released
+			else if(ButList[i]->LastState == But_Pressed) ButList[i]->LastState = But_Released;//Falling so released
+			//else ButList[i]->LastState = But_Released;//Falling so released
 		}
 	}
 }
@@ -256,13 +288,16 @@ void Display(void)
 	if(RedrawRequested && I2C_DMA_Completed){
 		I2C_DMA_Completed = 0;
 		HAL_GPIO_WritePin(GPIOA,TEST1_Pin,GPIO_PIN_SET);// for oscilloscope measure rising edge ___|¯¯¯
-		disp_DrawScreen(CfgMode, disp_SpeedDesc(SpeedMode), disp_RetractDurationDesc(RetractDuration), VBat, 0, Temp);
+		disp_DrawScreen(CfgMode, disp_SpeedDesc(SpeedMode), disp_RetractDurationDesc(RetractDuration), disp_PulseDesc(Pulse), VBat, 0, Temp);
 	   HAL_GPIO_WritePin(GPIOA,TEST1_Pin,GPIO_PIN_RESET);// for oscilloscope measure falling edge ¯¯¯|___
 	   RedrawRequested = 0;
 	}
 }
 void Meassuring(void)
 {
+	if(Timers[Measurement].Control.Over==0) return; //only if Measurement Timer is over...
+
+	Timers[Measurement].Control.Over=0;
 	//Motor off, TIM3 is trigger for ADC and is stopped, measure IM not need, but VBat+CPUTemp is need start manually
 	if(Speed==0 && I2C_DMA_Completed) HAL_ADC_Start_DMA(&hadc1, (uint32_t*)&ADCBuffer[0], (uint32_t)ADCCHANNELS);
 
@@ -283,9 +318,8 @@ void Motor(void)
 void MotorPUSH1(void)
 {
 	mo_SetSpeed(PWMPulse(SpeedMode*5));
+	StartFunctionTimer(Pulse*100);//Wait for Pulse after piston return
 	RunFunction = &WaitUntilPUSHKeyPressed; //Next function is waiting to released PUSH button after 130ms
-	Timers[FunctionDelay].Value = 130; //Wait for retraction duration half time
-	Timers[FunctionDelay].Control.Run=1; //Start Timer;
 }
 void MotorPUSH2(void)
 {
@@ -297,74 +331,66 @@ void MotorUnPUSH1(void)
 {
 	mo_SetSpeed(PWMPulse(-99.9));													//Retract
 	HAL_GPIO_WritePin(LED_GPIO_Port,LED_Pin,GPIO_PIN_RESET); // LED ON
+	StartFunctionTimer(RetractDuration*100);//Wait for retraction duration time
 	RunFunction = &MotorUnPUSH2; //Next function is MotorUnPUSH2 after RetractDuration*100ms
-	Timers[FunctionDelay].Value = RetractDuration*100; //Wait for retraction duration half time
-	Timers[FunctionDelay].Control.Run=1; //Start Timer;
 }
-
-
-
-
-
-
-
 void MotorUnPUSH2(void)
 {
 	mo_SetSpeed(PWMPulse(0));
 	HAL_GPIO_WritePin(LED_GPIO_Port,LED_Pin,GPIO_PIN_SET); // LED OFF
-	pBtnPUSH->LastState = But_None;
+	ButList[PUSH]->LastState = But_None;
 	RunFunction = &SelOperation; //Return to Select Operation in next Call
 }
 void WaitUntilPUSHKeyPressed(void) //wait until the PUSH key is pressed, but no blocking LOOP
 {
 	//Next function is MotorPUSH2 after released PUSH button
-	if(pBtnPUSH->LastState != But_Pressed) RunFunction = &MotorPUSH2;
+	if(ButList[PUSH]->LastState != But_Pressed) RunFunction = &MotorPUSH2;
 }
 void WaitUntilPULLKeyPressed(void) //wait until the PULL key is pressed, but no blocking LOOP
 {
 	//Next function is MotorPUSH2 after released PUSH button
-	if(pBtnPULL->LastState != But_Pressed) RunFunction = &SelOperation;
+	if(ButList[PULL]->LastState != But_Pressed) RunFunction = &SelOperation;
 }
 
 void SelOperation(void)
 {
 	if(CfgMode == disp_CfgModeTd_None)//MOTOR PUSH/PULL OPERATION
 	{
-		if(pBtnPUSH->LastState == But_Pressed)
+		if(ButList[PUSH]->LastState == But_Pressed)
 		{
 		  mo_SetSpeed(PWMPulse(99.9));		//Start push with max speed to null the retraction effect
 		  HAL_GPIO_WritePin(LED_GPIO_Port,LED_Pin,GPIO_PIN_RESET); // LED ON
+		  StartFunctionTimer(RetractDuration*100);//Wait for retraction duration time
 		  RunFunction = &MotorPUSH1; //Next function is MotorPUSH1 after RetractDuration*100ms
-		  Timers[FunctionDelay].Value = RetractDuration*100; //Wait for retraction duration half time
-		  Timers[FunctionDelay].Control.Run=1; //Start Timer;
 		  return;
 		}
-		else if(pBtnPUSH->LastState == But_Released)
+		else if(ButList[PUSH]->LastState == But_Released)
 		{
+
+
 		  mo_SetSpeed(PWMPulse(0));														//Stop
 		  HAL_GPIO_WritePin(LED_GPIO_Port,LED_Pin,GPIO_PIN_SET); // LED OFF
+		  StartFunctionTimer(10);//Wait for stop
 		  RunFunction = &MotorUnPUSH1; //Next function is MotorUnPUSH1 after 10ms
-		  Timers[FunctionDelay].Value = 10; //Wait for stop
-		  Timers[FunctionDelay].Control.Run=1; //Start Timer;
 		  return;
 		}
 
-		if(pBtnPULL->LastState == But_Pressed)
+		if(ButList[PULL]->LastState == But_Pressed)
 		{								//When pull button is pressed start motor in reverse max speed
 		  mo_SetSpeed(PWMPulse(-99.9));
 		  HAL_GPIO_WritePin(LED_GPIO_Port,LED_Pin,GPIO_PIN_RESET); // LED ON
 		  RunFunction = &WaitUntilPULLKeyPressed;//Next function is waiting to released PULL button
 		}
-		else if(pBtnPULL->LastState == But_Released)
+		else if(ButList[PULL]->LastState == But_Released)
 		{						//When the button is released
 		  mo_SetSpeed(PWMPulse(0));
 		  HAL_GPIO_WritePin(LED_GPIO_Port,LED_Pin,GPIO_PIN_SET); // LED OFF
-		  pBtnPULL->LastState = But_None;
+		  ButList[PULL]->LastState = But_None;
 		}
 	}
 	else
 	{//CONFIGURATION MODE
-		if(pBtnPUSH->LastState == But_Released)
+		if(ButList[PUSH]->LastState == But_Released)
 		{
 		  bbb_Beep(bbb_ToneTd_Low, 2*BEEPDUR);
 		  if(CfgMode == disp_CfgModeTd_Ret)
@@ -377,14 +403,17 @@ void SelOperation(void)
 			  if(++SpeedMode>20) SpeedMode=20;
 			  SpeedModeChange = true;
 		  }
+		  else if(CfgMode == disp_CfgModeTd_Pulse)
+		  {
+			  if(++Pulse>15) Pulse=15;
+			  PulseChange = true;
+		  }
 		  ConfigWindowTimestamp = HAL_GetTick() + CONFIGWINDOWDURATION_MS;
 		  RedrawRequested = 1;
-		  //mo_SetSpeed(PWMPulse(0));														//Stop
-		  //HAL_GPIO_WritePin(LED_GPIO_Port,LED_Pin,GPIO_PIN_SET); // LED OFF
-		  pBtnPUSH->LastState = But_None;
+		  ButList[PUSH]->LastState = But_None;
 		}
 
-		if(pBtnPULL->LastState == But_Released)
+		if(ButList[PULL]->LastState == But_Released)
 		{//When the button is released
 		  bbb_Beep(bbb_ToneTd_Low, 2*BEEPDUR);
 		  if(CfgMode == disp_CfgModeTd_Ret)
@@ -397,21 +426,25 @@ void SelOperation(void)
 			  if(--SpeedMode < 1) SpeedMode=1;
 			  SpeedModeChange = true;
 		  }
+		  else if(CfgMode == disp_CfgModeTd_Pulse)
+		  {
+			  if(--Pulse < 0) Pulse=0;
+			  PulseChange = true;
+		  }
 		  ConfigWindowTimestamp = HAL_GetTick() + CONFIGWINDOWDURATION_MS;
 		  RedrawRequested = 1;
-		  //mo_SetSpeed(PWMPulse(0));														//Stop
-		  //HAL_GPIO_WritePin(LED_GPIO_Port,LED_Pin,GPIO_PIN_SET); // LED OFF
-		  pBtnPULL->LastState = But_None;
+		  ButList[PULL]->LastState = But_None;
 		}
 
 		if(SpeedModeChange) {SpeedModeChange = false; EE_Write(AdrSpeedMode, SpeedMode);}
 		if(RetractDurationChange) {RetractDurationChange = false; EE_Write(AdrRetractDuration, RetractDuration);}
+		if(PulseChange) {PulseChange = false; EE_Write(AdrPulse, Pulse);}
 	}
 }
 
 void Config(void)
 {
-	if(pBtnCFG->LastState == But_Pressed){									//Config button always stops all movements and changes cfg mode
+	if(ButList[CFG]->LastState == But_Pressed){									//Config button always stops all movements and changes cfg mode
 	  Timers[FunctionDelay].Control.Run=0; //Stop Timer;
 	  mo_SetSpeed(PWMPulse(0));												//Stop
 	  HAL_GPIO_WritePin(LED_GPIO_Port,LED_Pin,GPIO_PIN_SET); // LED OFF
@@ -419,10 +452,10 @@ void Config(void)
 	  bbb_Beep(bbb_ToneTd_Low, 2*BEEPDUR);
 
 	  CfgMode += 1;
-	  if(CfgMode > disp_CfgModeTd_Ret) CfgMode = disp_CfgModeTd_None;
+	  if(CfgMode > disp_CfgModeTd_Pulse) CfgMode = disp_CfgModeTd_None;
 	  ConfigWindowTimestamp = HAL_GetTick() + CONFIGWINDOWDURATION_MS;
 	  RedrawRequested = 1;
-	  pBtnCFG->LastState = But_None;
+	  ButList[CFG]->LastState = But_None;
 	}
 
 	if(ConfigWindowTimestamp && HAL_GetTick() > ConfigWindowTimestamp){
@@ -435,12 +468,15 @@ void Config(void)
 void Setup(void)
 {
 	HAL_GPIO_WritePin(LED_GPIO_Port,LED_Pin,GPIO_PIN_RESET);
+#ifndef DEBUG
+	DebugPinsDissable();
+#endif
 	m_MX_TIM3_Init();
 	InitTimers();
 	meas_Init();
 
 	// ??? it must be remodeled
-	pBtnPUSH = ButList[PUSH]; pBtnPULL = ButList[PULL]; pBtnCFG = ButList[CFG];
+	//pBtnPUSH = ButList[PUSH]; pBtnPULL = ButList[PULL]; pBtnCFG = ButList[CFG];
 
 	SSD1306_Init();  // initialise
 
@@ -453,6 +489,17 @@ void Setup(void)
 	RunFunction = &SelOperation;
 	HAL_GPIO_WritePin(LED_GPIO_Port,LED_Pin,GPIO_PIN_SET);//LED OFF
 }
+void Loop(void)
+{
+	HAL_GPIO_TogglePin(GPIOA, TEST_Pin);
+	//;GetDateLoop();	//GEt date from RTC and backup to Vbat registers
+	Buttons(); // manage buttons state after interrupt
+	Meassuring(); // calculate all thermo
+	Display(); // if needed redraw display
+	Motor(); // complete motor control
+	Config(); // if need config menu
+}
+
 /*
 void GetDateLoop(void)
 {
diff --git a/Software/CubeMX/Application/utility.c b/Software/CubeMX/Application/utility.c
index df76d58..d53c0c8 100644
--- a/Software/CubeMX/Application/utility.c
+++ b/Software/CubeMX/Application/utility.c
@@ -155,7 +155,7 @@ uint16_t ut_ConvFloatToEngStr(float val, char *dest, char *temp, uint8_t maxLen,
 }
 
 //sprintf () is too slow, this function is many times (hundred times) faster
-uint8_t floatToString(char * outstr, float value, uint8_t places, uint8_t minwidth)
+uint8_t floatToString(char * outstr, float value, uint8_t places, uint8_t minwidth, uint8_t noleadzero)
 {
     // this is used to write a float value to string, outstr.  outstr is also the return value.
 	uint8_t digit;
@@ -171,50 +171,31 @@ uint8_t floatToString(char * outstr, float value, uint8_t places, uint8_t minwid
 
     // calculate rounding term d:   0.5/pow(10,places)
     float d = 0.5;
-    if (value < 0)
-        d *= -1.0;
+    if (value < 0) d *= -1.0;
     // divide by ten for each decimal place
-    for (i = 0; i < places; i++)
-        d/= 10.0;
+    for (i = 0; i < places; i++) d/= 10.0;
     // this small addition, combined with truncation will round our values properly
     tempfloat +=  d;
-
     // first get value tens to be the large power of ten less than value
-    if (value < 0)
-        tempfloat *= -1.0;
+    if (value < 0) tempfloat *= -1.0;
     while ((tens * 10.0) <= tempfloat) {
         tens *= 10.0;
         tenscount += 1;
     }
 
-    if (tenscount > 0)
-        charcount += tenscount;
-    else
-        charcount += 1;
+    if (tenscount > 0) charcount += tenscount;
+    else charcount += 1;
 
-    if (value < 0)
-        charcount += 1;
+    if (value < 0) charcount += 1;
     charcount += 1 + places;
-
     minwidth += 1; // both count the null final character
     if (minwidth > charcount){
         extra = minwidth - charcount;
         charcount = minwidth;
     }
-
-//    if (extra > 0 and rightjustify) {
-//        for (int i = 0; i< extra; i++) {
-//            outstr[c++] = ' ';
-//        }
-//    }
-
     // write out the negative if needed
-    if (value < 0)
-        outstr[c++] = '-';
-
-    if (tenscount == 0)
-        outstr[c++] = '0';
-
+    if (value < 0) outstr[c++] = '-';
+    if (tenscount == 0 && noleadzero==0) outstr[c++] = '0';
     for (i=0; i< tenscount; i++) {
         digit = (int) (tempfloat/tens);
         itoa(digit, &outstr[c++], 10);
@@ -223,11 +204,8 @@ uint8_t floatToString(char * outstr, float value, uint8_t places, uint8_t minwid
     }
 
     // if no places after decimal, stop now and return
-
     // otherwise, write the point and continue on
-    if (places > 0)
-    outstr[c++] = '.';
-
+    if (places > 0) outstr[c++] = '.';
 
     // now write out each decimal place by shifting digits one by one into the ones place and writing the truncated value
     for (i = 0; i < places; i++) {
@@ -242,8 +220,6 @@ uint8_t floatToString(char * outstr, float value, uint8_t places, uint8_t minwid
             outstr[c++] = ' ';
         }
     }
-
-
     outstr[c++] = '\0';
     return charcount;
 }
diff --git a/Software/CubeMX/Application/utility.h b/Software/CubeMX/Application/utility.h
index b223cd0..27ec9d3 100644
--- a/Software/CubeMX/Application/utility.h
+++ b/Software/CubeMX/Application/utility.h
@@ -41,7 +41,7 @@ extern float ut_RadToDeg(float rad);
 
 extern uint16_t ut_ConvFloatToEngStr(float val, char *dest, char *temp, uint8_t maxLen, uint8_t decCnt);
 
-extern uint8_t floatToString(char * outstr, float value, uint8_t places, uint8_t minwidth);
+extern uint8_t floatToString(char * outstr, float value, uint8_t places, uint8_t minwidth, uint8_t noleadzero);
 
 
 #endif /* UTILITY_H_ */
diff --git a/Software/CubeMX/Inc/main.h b/Software/CubeMX/Inc/main.h
index bf9e24a..728bc15 100644
--- a/Software/CubeMX/Inc/main.h
+++ b/Software/CubeMX/Inc/main.h
@@ -70,7 +70,7 @@ void ReadFromEprom(void);
 void SaveToEprom(void);
 void RestoreFromEprom(void);
 
-#define TRACE_SWO
+//#define TRACE_SWO
 
 #ifdef TRACE_SWO
 uint16_t _write(uint16_t file, char *ptr, uint16_t len);
diff --git a/Software/CubeMX/SPD_DC_Motor.ioc b/Software/CubeMX/SPD_DC_Motor.ioc
index 5c89f80..ce89020 100644
--- a/Software/CubeMX/SPD_DC_Motor.ioc
+++ b/Software/CubeMX/SPD_DC_Motor.ioc
@@ -36,7 +36,7 @@ Dma.Request0=ADC1
 Dma.Request1=I2C1_TX
 Dma.RequestsNb=2
 File.Version=6
-GPIO.groupedBy=Show All
+GPIO.groupedBy=Group By Peripherals
 I2C1.I2C_Mode=I2C_Fast
 I2C1.IPParameters=I2C_Mode
 KeepUserPlacement=false
diff --git a/Software/CubeMX/Src/main.c b/Software/CubeMX/Src/main.c
index d2b07dc..25eaa42 100644
--- a/Software/CubeMX/Src/main.c
+++ b/Software/CubeMX/Src/main.c
@@ -51,16 +51,7 @@
 void SystemClock_Config(void);
 /* USER CODE BEGIN PFP */
 extern void Setup(void);
-extern void Loop(void)
-{
-	HAL_GPIO_TogglePin(GPIOA, TEST_Pin);
-	//;GetDateLoop();	//GEt date from RTC and backup to Vbat registers
-	Buttons(); // manage buttons state after interrupt
-	Meassuring(); // calculate all thermo
-	Display(); // if needed redraw display
-	Motor(); // complete motor control
-	Config(); // if need config menu
-}
+extern void Loop(void);
 /* USER CODE END PFP */
 
 /* Private user code ---------------------------------------------------------*/
@@ -99,12 +90,14 @@ int main(void)
   /* USER CODE BEGIN 2 */
   Setup();
   /* USER CODE END 2 */
+
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
 	{Loop();}//end while
-  /* USER CODE END WHILE */
-  /* USER CODE BEGIN 3 */
+    /* USER CODE END WHILE */
+
+    /* USER CODE BEGIN 3 */
   /* USER CODE END 3 */
 }