Mercurial > public > ostc4

changeset 36:7801c5d8a562

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update author name for release
author heinrichsweikamp
date Sat, 28 Apr 2018 11:33:57 +0200
parents 6237372f76a4
children ccc45c0e1ea2
files .hgsub .hgsubstate BootLoader/Inc/tInfoBootloader.h BootLoader/Src/base_bootlader.c BootLoader/Src/settings_bootloader.c BootLoader/Src/tInfoBootloader.c FontPack/base_upperRegion.c OtherSources/data_central_mini.c OtherSources/data_exchange_main_mini.c OtherSources/firmwareEraseProgram.c OtherSources/stm32f4xx_hal_msp.c OtherSources/stm32f4xx_hal_msp_hw1.c
diffstat 12 files changed, 19 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsub	Wed Mar 07 18:56:48 2018 +0100
+++ b/.hgsub	Sat Apr 28 11:33:57 2018 +0200
@@ -1,4 +1,4 @@
-Common = ../ostc4-common
-Discovery = ../ostc4-discovery
-Small_CPU = ../ostc4-small
-wiki = ../ostc4/wiki
+Common = ostc4-common
+Discovery = ostc4-discovery
+Small_CPU = ostc4-small
+wiki = ostc4/wiki
--- a/.hgsubstate	Wed Mar 07 18:56:48 2018 +0100
+++ b/.hgsubstate	Sat Apr 28 11:33:57 2018 +0200
@@ -1,4 +1,4 @@
-d065de711f7e1f1f493d367e35c6f0811b48f0c4 Common
-f96ca4cff9e7ca5b2164aa61bdc25b9366126445 Discovery
-e6486abe8bc808f0ac5a31e58a543be8f354222a Small_CPU
-bfd25bbec1679980289cfe7eb2c6e41345b2c763 wiki
+16dc24915df96d2c37397ebdd91fc4edd53e684b Common
+f2ecfa9c66205b9efa7c922758148975d713b9fb Discovery
+0bc15fc1c47688e93432be15f04fa938e5a54ab0 Small_CPU
+5e29437dd57d40282a9e3605324a57b03a07f2dc wiki
--- a/BootLoader/Inc/tInfoBootloader.h	Wed Mar 07 18:56:48 2018 +0100
+++ b/BootLoader/Inc/tInfoBootloader.h	Sat Apr 28 11:33:57 2018 +0200
@@ -3,7 +3,7 @@
 ///
 /// \file   BootLoader/Inc/tInfoBootloader.h
 /// \brief  Header file communication with PC
-/// \author heinrichs/weikamp, Christian Weikamp
+/// \author heinrichs weikamp gmbh
 /// \date   08-Aug-2014
 ///
 /// $Id$
--- a/BootLoader/Src/base_bootlader.c	Wed Mar 07 18:56:48 2018 +0100
+++ b/BootLoader/Src/base_bootlader.c	Sat Apr 28 11:33:57 2018 +0200
@@ -3,7 +3,7 @@
 ///
 /// \file   BootLoader/Src/base_bootlader.c
 /// \brief  he beginning of it all. main() is part of this.
-/// \author heinrichs/weikamp, Christian Weikamp
+/// \author heinrichs weikamp gmbh
 /// \date   26-February-2014
 ///
 /// $Id$
@@ -38,7 +38,7 @@
 							##### bootloader specific #####
 	==============================================================================
 
-	151130	chsw	sleep on button3
+	151130	hw	sleep on button3
 								(MX_tell_reset_logik_alles_ok() + DataEX_call() in endlos loop)
 
 	==============================================================================
--- a/BootLoader/Src/settings_bootloader.c	Wed Mar 07 18:56:48 2018 +0100
+++ b/BootLoader/Src/settings_bootloader.c	Sat Apr 28 11:33:57 2018 +0200
@@ -3,7 +3,7 @@
 ///
 /// \file   BootLoader/Src/settings_bootloader.c
 /// \brief  mini version for firmwareDataGetPointer() etc.
-/// \author heinrichs/weikamp, Christian Weikamp
+/// \author heinrichs weikamp gmbh
 /// \date   21-March-2016
 ///
 /// $Id$
--- a/BootLoader/Src/tInfoBootloader.c	Wed Mar 07 18:56:48 2018 +0100
+++ b/BootLoader/Src/tInfoBootloader.c	Sat Apr 28 11:33:57 2018 +0200
@@ -3,7 +3,7 @@
 ///
 /// \file   BootLoader/Src/tInfoBootloader.c
 /// \brief  Write something on the screen in between steps
-/// \author heinrichs/weikamp, Christian Weikamp
+/// \author heinrichs weikamp gmbh
 /// \date   08-May-2015
 ///
 /// $Id$
--- a/FontPack/base_upperRegion.c	Wed Mar 07 18:56:48 2018 +0100
+++ b/FontPack/base_upperRegion.c	Sat Apr 28 11:33:57 2018 +0200
@@ -3,7 +3,7 @@
 ///
 /// \file   FontPack/./base_upperRegion.c
 /// \brief  The beginning of it all. main() is part of this.
-/// \author heinrichs/weikamp, Christian Weikamp
+/// \author heinrichs weikamp gmbh
 /// \date   31-August-2015
 ///
 /// $Id$
--- a/OtherSources/data_central_mini.c	Wed Mar 07 18:56:48 2018 +0100
+++ b/OtherSources/data_central_mini.c	Sat Apr 28 11:33:57 2018 +0200
@@ -2,7 +2,7 @@
   ******************************************************************************
 	* @copyright heinrichs weikamp
   * @file   		data_central_mini.c   - bootloader only -
-  * @author 		heinrichs/weikamp, Christian Weikamp
+  * @author 		heinrichs weikamp gmbh
   * @date   		10-November-2014
   * @version		V1.0.3
   * @since			10-Nov-2014
@@ -69,7 +69,7 @@
 of the 13 or 9 instrucions are load byte.
    This is Figure 14-7 in the text. */
 
-/* http://www.hackersdelight.org/ i guess ;-)  *chsw */
+/* http://www.hackersdelight.org/ i guess ;-)  *hw */
 
 uint32_t crc32c_checksum(uint8_t* message, uint16_t length, uint8_t* message2, uint16_t length2) {
 	int i, j;
--- a/OtherSources/data_exchange_main_mini.c	Wed Mar 07 18:56:48 2018 +0100
+++ b/OtherSources/data_exchange_main_mini.c	Sat Apr 28 11:33:57 2018 +0200
@@ -1,7 +1,7 @@
 /**
   ******************************************************************************
   * @file    data_exchange_main.c
-  * @author  heinrichs/weikamp, Christian Weikamp
+  * @author  heinrichs weikamp gmbh
   * @date    13-Oct-2014
   * @version V0.0.2
   * @since   27-May-2015
--- a/OtherSources/firmwareEraseProgram.c	Wed Mar 07 18:56:48 2018 +0100
+++ b/OtherSources/firmwareEraseProgram.c	Sat Apr 28 11:33:57 2018 +0200
@@ -1,7 +1,7 @@
 /**
   ******************************************************************************
   * @file    firmwareEraseProgram.c
-  * @author  heinrichs/weikamp, Christian Weikamp
+  * @author  heinrichs weikamp gmbh
   * @version V0.0.1
   * @date    05-May-2015
   * @version V0.0.1
--- a/OtherSources/stm32f4xx_hal_msp.c	Wed Mar 07 18:56:48 2018 +0100
+++ b/OtherSources/stm32f4xx_hal_msp.c	Sat Apr 28 11:33:57 2018 +0200
@@ -1,7 +1,7 @@
 /**
   ******************************************************************************
   * @file    stm32f4xx_hal_msp.c 
-  * @author  heinrichs/weikamp, Christian Weikamp
+  * @author  heinrichs weikamp gmbh
   * @date    05-Dec-2014
   * @version V0.0.1
   * @since   05-Dec-2014
--- a/OtherSources/stm32f4xx_hal_msp_hw1.c	Wed Mar 07 18:56:48 2018 +0100
+++ b/OtherSources/stm32f4xx_hal_msp_hw1.c	Sat Apr 28 11:33:57 2018 +0200
@@ -57,7 +57,6 @@
 
   /* System interrupt init*/
 	/** SysTick_IRQn interrupt configuration
-		* use 1  by Christian 
 		*/
   HAL_NVIC_SetPriority(SysTick_IRQn, 1, 0);
 
@@ -304,7 +303,6 @@
     hdma_spi1_tx.Init.Mode = DMA_NORMAL;
     hdma_spi1_tx.Init.Priority = DMA_PRIORITY_LOW;
     hdma_spi1_tx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
-/* by christian */		
 hdma_spi1_tx.Init.MemBurst            = DMA_MBURST_INC4;
 hdma_spi1_tx.Init.PeriphBurst         = DMA_PBURST_INC4;
     HAL_DMA_Init(&hdma_spi1_tx);
@@ -321,7 +319,6 @@
     hdma_spi1_rx.Init.Mode = DMA_NORMAL;
     hdma_spi1_rx.Init.Priority = DMA_PRIORITY_HIGH;
     hdma_spi1_rx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
-/* by christian */	
 hdma_spi1_rx.Init.FIFOThreshold       = DMA_FIFO_THRESHOLD_FULL;
 
 hdma_spi1_rx.Init.MemBurst            = DMA_MBURST_INC4;
@@ -691,7 +688,6 @@
   }
   FMC_Initialized = 1;
   /* Peripheral clock enable */
-	/* by christian */
   __GPIOC_CLK_ENABLE();
   __GPIOD_CLK_ENABLE();
   __GPIOE_CLK_ENABLE();