Mercurial > public > ostc4

changeset 763:aa6006975e76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
increase HAL_Delay to 10ms for cold-start-button reset + typos and comment changes
author heinrichsweikamp
date Sun, 26 Mar 2023 18:34:30 +0200
parents 32529dfea3b0
children c47fe41b2378
files Common/Inc/data_exchange.h Discovery/Inc/timer.h Discovery/Src/data_exchange_main.c Discovery/Src/gfx_engine.c Discovery/Src/show_logbook.c Discovery/Src/test_vpm.c Discovery/Src/timer.c Small_CPU/Inc/scheduler.h Small_CPU/Src/baseCPU2.c Small_CPU/Src/scheduler.c
diffstat 10 files changed, 17 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/Common/Inc/data_exchange.h	Sun Mar 26 11:27:29 2023 +0200
+++ b/Common/Inc/data_exchange.h	Sun Mar 26 18:34:30 2023 +0200
@@ -197,7 +197,7 @@
 		uint8_t sensor_map[EXT_INTERFACE_SENSOR_CNT];
 		uint8_t SPARE_OldWireless[5]; 							/* 64 - 12 for extADC - 6 for CO2 - 34 for sensor (+dummmy) - sensor map*/
 		// PIC data
-		uint8_t button_setting[4]; /* see dependency to SLiveData->buttonPICdata */
+		uint8_t button_setting[4]; /* see dependency to SlaveData->buttonPICdata */
 		uint8_t SPARE1;
 		//debug
 		uint32_t pressure_uTick;
--- a/Discovery/Inc/timer.h	Sun Mar 26 11:27:29 2023 +0200
+++ b/Discovery/Inc/timer.h	Sun Mar 26 18:34:30 2023 +0200
@@ -3,7 +3,7 @@
 ///
 /// \file   Discovery/Inc/timer.h
 /// \brief  Contains timer related functionality like stopwatch and security stop
-/// \author Peter Ryser
+/// \author heinrichs weikamp gmbh
 /// \date
 ///
 /// $Id$
--- a/Discovery/Src/data_exchange_main.c	Sun Mar 26 11:27:29 2023 +0200
+++ b/Discovery/Src/data_exchange_main.c	Sun Mar 26 18:34:30 2023 +0200
@@ -283,7 +283,7 @@
 	}
 	else
 	{
-		if(data_old__lost_connection_to_slave_counter_temp >= 2) /* error reaction is triggered whenever communication could not be reestablishen within two cycles */
+		if(data_old__lost_connection_to_slave_counter_temp >= 2) /* error reaction is triggered whenever communication could not be reestablished within two cycles */
 		{
 			data_old__lost_connection_to_slave_counter_temp = 0;
 			if(DataEX_check_header_and_footer_shifted())
@@ -299,7 +299,7 @@
 				{
 					HAL_SPI_Abort_IT(&cpu2DmaSpi);
 				}
-				/* reset of own DMA does not work ==> request reset of slave dma by indicating shifted receiption */
+				/* reset of own DMA does not work ==> request reset of slave dma by indicating shifted reception */
 				if (data_old__lost_connection_to_slave_counter_retry == 1)
 				{
 					dataOut.header.checkCode[SPI_HEADER_INDEX_RX_STATE] = SPI_RX_STATE_SHIFTED;
--- a/Discovery/Src/gfx_engine.c	Sun Mar 26 11:27:29 2023 +0200
+++ b/Discovery/Src/gfx_engine.c	Sun Mar 26 18:34:30 2023 +0200
@@ -1763,8 +1763,7 @@
 
 /**
   ******************************************************************************
-  * @brief   GFX writeGfx_write_label_varstring. /  Write string with all parameters and font color options
-  * @author  Peter Ryser
+  * @brief   GFX writeGfx_write_label_varstring. /  Write string with all parameters and font color options
	heinrichs weikamp gmbh
   * @version V0.0.1
   * @date    22-April-2014
   ******************************************************************************
--- a/Discovery/Src/show_logbook.c	Sun Mar 26 11:27:29 2023 +0200
+++ b/Discovery/Src/show_logbook.c	Sun Mar 26 18:34:30 2023 +0200
@@ -72,7 +72,7 @@
 /**
   ******************************************************************************
   * @brief   GFX write label. /  print coordinate system & depth graph
-  * @author  Peter Ryser
+  * @author  heinrichs weikamp gmbh
   * @version V0.0.1
   * @date    07-July-2014
   ******************************************************************************
@@ -417,7 +417,7 @@
 /**
   ******************************************************************************
   * @brief  show_logbook_logbook_show_log_page1 /
-  * @author  Peter Ryser
+  * @author  heinrichs weikamp gmbh
   * @version V0.0.1
   * @date    07-July-2014
   ******************************************************************************
--- a/Discovery/Src/test_vpm.c	Sun Mar 26 11:27:29 2023 +0200
+++ b/Discovery/Src/test_vpm.c	Sun Mar 26 18:34:30 2023 +0200
@@ -352,7 +352,7 @@
   ******************************************************************************
   * @brief		test 3
   *						Trimix 10/70
-    *						everything else identical to test1 by Peter Ryser
+    *						everything else identical to test1 by heinrichs weikamp gmbh
   * @version 	V0.0.1
   * @date   	19-April-2014
   * @retval 	1 for result is similar to DRx code, 0 otherwise
--- a/Discovery/Src/timer.c	Sun Mar 26 11:27:29 2023 +0200
+++ b/Discovery/Src/timer.c	Sun Mar 26 18:34:30 2023 +0200
@@ -3,7 +3,7 @@
 ///
 /// \file   Discovery/Src/timer.c
 /// \brief  Contains timer related functionality like stopwatch and security stop
-/// \author Peter Ryser & heinrichs weikamp gmbh
+/// \author heinrichs weikamp gmbh & heinrichs weikamp gmbh
 /// \date   5. Feb.2015 (maybe)
 ///
 /// \details
--- a/Small_CPU/Inc/scheduler.h	Sun Mar 26 11:27:29 2023 +0200
+++ b/Small_CPU/Inc/scheduler.h	Sun Mar 26 18:34:30 2023 +0200
@@ -40,7 +40,7 @@
 #define SCHEDULER_TICK_EXE1SEC	(980u) 	/* tick count based on cycle start which is used to trigger functions which */
 										/* shall be executed once in a second (20ms before cycle restarts) */
 
-#define SPI_COM_TIMEOUT_START		(5)		/* *100 ms timeout to avoid tiemout e.g. after Main wakeup */
+#define SPI_COM_TIMEOUT_START		(5)		/* *100 ms timeout to avoid timeout e.g. after Main wakeup */
 #define SPI_COM_TIMEOUT_COMMON		(3)		/* *100ms shorter timeout during normal operation to have a faster error reaction */
 
 typedef struct
--- a/Small_CPU/Src/baseCPU2.c	Sun Mar 26 11:27:29 2023 +0200
+++ b/Small_CPU/Src/baseCPU2.c	Sun Mar 26 18:34:30 2023 +0200
@@ -375,12 +375,12 @@
 
 		if (!scheduleSetButtonResponsiveness())
 		{
-			HAL_Delay(1);
+			HAL_Delay(10);
 			if (!scheduleSetButtonResponsiveness()) // send again, if problem it's not my problem here.
 			{
-				HAL_Delay(1);
+				HAL_Delay(10);
 				scheduleSetButtonResponsiveness(); // init
-				HAL_Delay(1);
+				HAL_Delay(10);
 			}
 		}
 	}
--- a/Small_CPU/Src/scheduler.c	Sun Mar 26 11:27:29 2023 +0200
+++ b/Small_CPU/Src/scheduler.c	Sun Mar 26 18:34:30 2023 +0200
@@ -476,7 +476,7 @@
 /**
   ******************************************************************************
 * @brief   scheduleDiveMode. /  Dive Mode: Main Loop
-  * @author  Peter Ryser
+  * @author  heinrichs weikamp gmbh
   * @version V0.0.1
   * @date    22-April-2014
   ******************************************************************************
@@ -726,7 +726,7 @@
 /**
   ******************************************************************************
 * @brief   scheduleSurfaceMode / surface mode: Main Loop
-  * @author  Peter Ryser
+  * @author  heinrichs weikamp gmbh
   * @version V0.0.1
   * @date    22-April-2014
   ******************************************************************************
@@ -1216,7 +1216,7 @@
 /**
   ******************************************************************************
 	* @brief   scheduleUpdateLifeData / calculates tissues
-  * @author  Peter Ryser
+  * @author  heinrichs weikamp gmbh
   * @version V0.0.1
   * @date    22-April-2014
   ******************************************************************************
@@ -1474,7 +1474,7 @@
 /**
   ******************************************************************************
 * @brief   vpm_crush / calls vpm calc_crushing_pressure every four seconds during descend
-  * @author  Peter Ryser
+  * @author  heinrichs weikamp gmbh
   * @version V0.0.1
   * @date    22-April-2014
   ******************************************************************************