Mercurial > public > ostc4
annotate Small_CPU/Src/uart.c @ 901:e4e9acfde839 Evo_2_23
Bugfix simulator/planer:
For deco calculation two structures are used. The calculation structure and the input structure. During simulation fast forward (+5min) the input structure is manipulated. Especially for vpm calculation it could happen that the input structure was manipulated and then overwritten by the calculation structure => deco and tts may have wrong values. To avoid this thedeco calculation status is now checked before doing the FF manupulation. Based an calculation state deco or input structures are manipulated.
Surface time stamp in planer view:
The planer used its own (buggy) implementation for calculation of tts. The timestamp for the surface arrival did not match the bottom time + TTS. The new implementation uses the tts calculated by the deco loop for generation of surface time stamp.
| author | Ideenmodellierer |
|---|---|
| date | Wed, 02 Oct 2024 22:07:13 +0200 |
| parents | 9e2f9b91e827 |
| children | 4832981f9af8 |
| rev | line source |
|---|---|
| 38 | 1 /** |
| 2 ****************************************************************************** | |
| 3 * @file uart.c | |
| 4 * @author heinrichs weikamp gmbh | |
| 5 * @version V0.0.1 | |
| 6 * @date 27-March-2014 | |
| 7 * @brief button control | |
| 8 * | |
| 9 @verbatim | |
| 10 ============================================================================== | |
| 11 ##### How to use ##### | |
| 12 ============================================================================== | |
| 13 @endverbatim | |
| 14 ****************************************************************************** | |
| 15 * @attention | |
| 16 * | |
| 17 * <h2><center>© COPYRIGHT(c) 2015 heinrichs weikamp</center></h2> | |
| 18 * | |
| 19 ****************************************************************************** | |
| 20 */ | |
| 21 /* Includes ------------------------------------------------------------------*/ | |
| 22 #include "uart.h" | |
| 794 | 23 #include "uartProtocol_O2.h" |
|
798
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
24 #include "uartProtocol_Co2.h" |
|
842
c3dd461ca3f9
Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents:
809
diff
changeset
|
25 #include "uartProtocol_Sentinel.h" |
| 662 | 26 #include "externalInterface.h" |
| 27 #include "data_exchange.h" | |
|
704
f1b40364b0af
Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents:
690
diff
changeset
|
28 #include <string.h> /* memset */ |
| 38 | 29 |
| 889 | 30 |
| 38 | 31 /* Private variables ---------------------------------------------------------*/ |
| 32 | |
| 794 | 33 |
|
787
aeb72882f30a
Dev Bugfx Empty buffer indication and stability improvments:
Ideenmodellierer
parents:
785
diff
changeset
|
34 |
| 781 | 35 #define CHUNK_SIZE (25u) /* the DMA will handle chunk size transfers */ |
| 36 #define CHUNKS_PER_BUFFER (5u) | |
| 794 | 37 |
| 889 | 38 |
| 662 | 39 |
| 889 | 40 DMA_HandleTypeDef hdma_usart1_rx, hdma_usart6_rx, hdma_usart6_tx; |
| 38 | 41 |
|
890
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
42 uint8_t rxBuffer[CHUNK_SIZE * CHUNKS_PER_BUFFER]; /* The complete buffer has a X * chunk size to allow variations in buffer read time */ |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
43 uint8_t rxBufferUart6[CHUNK_SIZE * CHUNKS_PER_BUFFER]; /* The complete buffer has a X * chunk size to allow variations in buffer read time */ |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
44 uint8_t txBufferUart6[CHUNK_SIZE * CHUNKS_PER_BUFFER]; /* The complete buffer has a X * chunk size to allow variations in buffer read time */ |
| 889 | 45 |
|
729
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
46 static uint8_t rxWriteIndex; /* Index of the data item which is analysed */ |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
47 static uint8_t rxReadIndex; /* Index at which new data is stared */ |
|
890
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
48 static uint8_t lastCmdIndex; /* Index of last command which has not been completely received */ |
|
729
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
49 static uint8_t dmaActive; /* Indicator if DMA reception needs to be started */ |
| 794 | 50 |
|
798
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
51 |
| 889 | 52 |
| 53 | |
| 38 | 54 /* Exported functions --------------------------------------------------------*/ |
| 55 | |
| 794 | 56 |
| 662 | 57 void MX_USART1_UART_Init(void) |
| 38 | 58 { |
| 662 | 59 /* regular init */ |
| 60 | |
| 61 huart1.Instance = USART1; | |
|
803
96ffad0a4e57
Cleanup initialisation / deinitialization:
Ideenmodellierer
parents:
798
diff
changeset
|
62 huart1.Init.BaudRate = 19200; |
| 662 | 63 huart1.Init.WordLength = UART_WORDLENGTH_8B; |
| 64 huart1.Init.StopBits = UART_STOPBITS_1; | |
| 65 huart1.Init.Parity = UART_PARITY_NONE; | |
| 66 huart1.Init.Mode = UART_MODE_TX_RX; | |
| 67 huart1.Init.HwFlowCtl = UART_HWCONTROL_NONE; | |
| 68 huart1.Init.OverSampling = UART_OVERSAMPLING_16; | |
| 69 | |
| 70 HAL_UART_Init(&huart1); | |
| 71 | |
|
704
f1b40364b0af
Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents:
690
diff
changeset
|
72 MX_USART1_DMA_Init(); |
|
f1b40364b0af
Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents:
690
diff
changeset
|
73 |
|
787
aeb72882f30a
Dev Bugfx Empty buffer indication and stability improvments:
Ideenmodellierer
parents:
785
diff
changeset
|
74 memset(rxBuffer,BUFFER_NODATA,sizeof(rxBuffer)); |
| 662 | 75 rxReadIndex = 0; |
| 76 lastCmdIndex = 0; | |
| 77 rxWriteIndex = 0; | |
| 78 dmaActive = 0; | |
| 79 } | |
| 38 | 80 |
| 889 | 81 |
| 82 | |
| 662 | 83 void MX_USART1_UART_DeInit(void) |
| 84 { | |
|
704
f1b40364b0af
Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents:
690
diff
changeset
|
85 HAL_DMA_Abort(&hdma_usart1_rx); |
| 662 | 86 HAL_DMA_DeInit(&hdma_usart1_rx); |
| 87 HAL_UART_DeInit(&huart1); | |
|
803
96ffad0a4e57
Cleanup initialisation / deinitialization:
Ideenmodellierer
parents:
798
diff
changeset
|
88 dmaActive = 0; |
| 662 | 89 } |
| 90 | |
| 91 void MX_USART1_DMA_Init() | |
| 92 { | |
| 93 /* DMA controller clock enable */ | |
| 94 __DMA2_CLK_ENABLE(); | |
| 95 | |
| 96 /* Peripheral DMA init*/ | |
| 97 hdma_usart1_rx.Instance = DMA2_Stream5; | |
| 98 hdma_usart1_rx.Init.Channel = DMA_CHANNEL_4; | |
| 99 hdma_usart1_rx.Init.Direction = DMA_PERIPH_TO_MEMORY; //DMA_MEMORY_TO_PERIPH; | |
| 100 hdma_usart1_rx.Init.PeriphInc = DMA_PINC_DISABLE; | |
| 101 hdma_usart1_rx.Init.MemInc = DMA_MINC_ENABLE; | |
| 102 hdma_usart1_rx.Init.PeriphDataAlignment = DMA_MDATAALIGN_BYTE; | |
| 103 hdma_usart1_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; | |
| 104 hdma_usart1_rx.Init.Mode = DMA_NORMAL; | |
| 105 hdma_usart1_rx.Init.Priority = DMA_PRIORITY_LOW; | |
| 106 hdma_usart1_rx.Init.FIFOMode = DMA_FIFOMODE_DISABLE; | |
| 107 HAL_DMA_Init(&hdma_usart1_rx); | |
| 108 | |
| 109 __HAL_LINKDMA(&huart1,hdmarx,hdma_usart1_rx); | |
| 110 | |
| 111 /* DMA interrupt init */ | |
| 112 HAL_NVIC_SetPriority(DMA2_Stream5_IRQn, 0, 0); | |
| 113 HAL_NVIC_EnableIRQ(DMA2_Stream5_IRQn); | |
| 38 | 114 } |
| 115 | |
|
890
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
116 |
| 889 | 117 void GNSS_IO_init() { |
| 118 | |
| 119 GPIO_InitTypeDef GPIO_InitStruct = { 0 }; | |
| 120 /* Peripheral clock enable */ | |
|
890
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
121 __HAL_RCC_USART6_CLK_ENABLE() |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
122 ; |
| 889 | 123 |
|
890
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
124 __HAL_RCC_GPIOA_CLK_ENABLE() |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
125 ; |
| 889 | 126 /**USART6 GPIO Configuration |
| 127 PA11 ------> USART6_TX | |
| 128 PA12 ------> USART6_RX | |
| 129 */ | |
| 130 GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12; | |
| 131 GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; | |
| 132 GPIO_InitStruct.Pull = GPIO_NOPULL; | |
| 894 | 133 GPIO_InitStruct.Speed = GPIO_SPEED_FAST; |
| 889 | 134 GPIO_InitStruct.Alternate = GPIO_AF8_USART6; |
| 135 HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); | |
| 136 | |
| 137 /* USART6 DMA Init */ | |
| 138 /* USART6_RX Init */ | |
| 139 hdma_usart6_rx.Instance = DMA2_Stream2; | |
| 140 hdma_usart6_rx.Init.Channel = DMA_CHANNEL_5; | |
| 141 hdma_usart6_rx.Init.Direction = DMA_PERIPH_TO_MEMORY; | |
| 142 hdma_usart6_rx.Init.PeriphInc = DMA_PINC_DISABLE; | |
| 143 hdma_usart6_rx.Init.MemInc = DMA_MINC_ENABLE; | |
| 894 | 144 hdma_usart6_rx.Init.PeriphDataAlignment = DMA_MDATAALIGN_BYTE; |
| 889 | 145 hdma_usart6_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; |
| 146 hdma_usart6_rx.Init.Mode = DMA_NORMAL; | |
| 147 hdma_usart6_rx.Init.Priority = DMA_PRIORITY_LOW; | |
| 148 hdma_usart6_rx.Init.FIFOMode = DMA_FIFOMODE_DISABLE; | |
| 149 HAL_DMA_Init(&hdma_usart6_rx); | |
| 150 | |
| 151 __HAL_LINKDMA(&huart6, hdmarx, hdma_usart6_rx); | |
| 152 | |
| 153 /* USART6_TX Init */ | |
| 154 hdma_usart6_tx.Instance = DMA2_Stream6; | |
| 155 hdma_usart6_tx.Init.Channel = DMA_CHANNEL_5; | |
| 156 hdma_usart6_tx.Init.Direction = DMA_MEMORY_TO_PERIPH; | |
| 157 hdma_usart6_tx.Init.PeriphInc = DMA_PINC_DISABLE; | |
| 158 hdma_usart6_tx.Init.MemInc = DMA_MINC_ENABLE; | |
| 894 | 159 hdma_usart6_tx.Init.PeriphDataAlignment = DMA_MDATAALIGN_BYTE; |
| 889 | 160 hdma_usart6_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; |
| 161 hdma_usart6_tx.Init.Mode = DMA_NORMAL; | |
| 162 hdma_usart6_tx.Init.Priority = DMA_PRIORITY_LOW; | |
| 163 hdma_usart6_tx.Init.FIFOMode = DMA_FIFOMODE_DISABLE; | |
| 164 HAL_DMA_Init(&hdma_usart6_tx); | |
| 165 | |
| 166 __HAL_LINKDMA(&huart6, hdmatx, hdma_usart6_tx); | |
| 167 | |
| 168 /* USART6 interrupt Init */ | |
| 169 HAL_NVIC_SetPriority(USART6_IRQn, 0, 0); | |
| 170 HAL_NVIC_EnableIRQ(USART6_IRQn); | |
| 171 | |
| 172 MX_USART6_DMA_Init(); | |
| 173 | |
| 174 } | |
| 175 | |
| 176 void MX_USART6_DMA_Init() { | |
| 177 /* DMA controller clock enable */ | |
| 178 __HAL_RCC_DMA2_CLK_ENABLE(); | |
| 179 | |
| 180 /* DMA interrupt init */ | |
| 181 /* DMA2_Stream2_IRQn interrupt configuration */ | |
| 182 HAL_NVIC_SetPriority(DMA2_Stream2_IRQn, 0, 0); | |
| 183 HAL_NVIC_EnableIRQ(DMA2_Stream2_IRQn); | |
| 184 /* DMA2_Stream6_IRQn interrupt configuration */ | |
| 185 HAL_NVIC_SetPriority(DMA2_Stream6_IRQn, 0, 0); | |
| 186 HAL_NVIC_EnableIRQ(DMA2_Stream6_IRQn); | |
| 187 } | |
| 188 | |
|
890
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
189 |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
190 void MX_USART6_UART_DeInit(void) |
| 889 | 191 { |
|
890
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
192 HAL_DMA_Abort(&hdma_usart6_rx); |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
193 HAL_DMA_DeInit(&hdma_usart6_rx); |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
194 HAL_DMA_Abort(&hdma_usart6_tx); |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
195 HAL_DMA_DeInit(&hdma_usart6_tx); |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
196 HAL_UART_DeInit(&huart6); |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
197 HAL_UART_DeInit(&huart6); |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
198 } |
| 889 | 199 |
|
890
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
200 void MX_USART6_UART_Init(void) { |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
201 huart6.Instance = USART6; |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
202 huart6.Init.BaudRate = 9600; |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
203 huart6.Init.WordLength = UART_WORDLENGTH_8B; |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
204 huart6.Init.StopBits = UART_STOPBITS_1; |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
205 huart6.Init.Parity = UART_PARITY_NONE; |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
206 huart6.Init.Mode = UART_MODE_TX_RX; |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
207 huart6.Init.HwFlowCtl = UART_HWCONTROL_NONE; |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
208 huart6.Init.OverSampling = UART_OVERSAMPLING_16; |
|
651d21777b61
cleanup and disable function for GNSS uart and DMA
heinrichsweikamp
parents:
889
diff
changeset
|
209 HAL_UART_Init(&huart6); |
| 889 | 210 } |
| 211 | |
| 794 | 212 void UART_MUX_SelectAddress(uint8_t muxAddress) |
|
779
0b5f45448eb6
Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents:
747
diff
changeset
|
213 { |
|
0b5f45448eb6
Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents:
747
diff
changeset
|
214 uint8_t indexstr[4]; |
|
0b5f45448eb6
Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents:
747
diff
changeset
|
215 |
| 794 | 216 if(muxAddress <= MAX_MUX_CHANNEL) |
|
779
0b5f45448eb6
Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents:
747
diff
changeset
|
217 { |
| 794 | 218 indexstr[0] = '~'; |
| 219 indexstr[1] = muxAddress; | |
| 220 indexstr[2] = 0x0D; | |
| 221 indexstr[3] = 0x0A; | |
| 222 | |
| 223 HAL_UART_Transmit(&huart1,indexstr,4,10); | |
|
779
0b5f45448eb6
Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents:
747
diff
changeset
|
224 } |
|
0b5f45448eb6
Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents:
747
diff
changeset
|
225 } |
|
0b5f45448eb6
Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents:
747
diff
changeset
|
226 |
| 794 | 227 |
| 228 void UART_SendCmdString(uint8_t *cmdString) | |
|
729
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
229 { |
| 794 | 230 uint8_t cmdLength = strlen((char*)cmdString); |
| 231 | |
| 232 if(cmdLength < 20) /* A longer string is an indication for a missing 0 termination */ | |
|
729
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
233 { |
| 794 | 234 if(dmaActive == 0) |
| 235 { | |
| 236 UART_StartDMA_Receiption(); | |
| 237 } | |
| 238 HAL_UART_Transmit(&huart1,cmdString,cmdLength,10); | |
| 239 } | |
| 240 } | |
| 241 | |
|
729
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
242 |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
243 void StringToInt(char *pstr, uint32_t *puInt32) |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
244 { |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
245 uint8_t index = 0; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
246 uint32_t result = 0; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
247 while((pstr[index] >= '0') && (pstr[index] <= '9')) |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
248 { |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
249 result *=10; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
250 result += pstr[index] - '0'; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
251 index++; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
252 } |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
253 *puInt32 = result; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
254 } |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
255 |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
256 void StringToUInt64(char *pstr, uint64_t *puint64) |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
257 { |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
258 uint8_t index = 0; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
259 uint64_t result = 0; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
260 while((pstr[index] >= '0') && (pstr[index] <= '9')) |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
261 { |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
262 result *=10; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
263 result += pstr[index] - '0'; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
264 index++; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
265 } |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
266 *puint64 = result; |
|
d646a0f724a7
Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents:
725
diff
changeset
|
267 } |
| 662 | 268 |
| 742 | 269 void UART_StartDMA_Receiption() |
| 270 { | |
|
798
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
271 if(dmaActive == 0) |
| 742 | 272 { |
|
798
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
273 if(HAL_OK == HAL_UART_Receive_DMA (&huart1, &rxBuffer[rxWriteIndex], CHUNK_SIZE)) |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
274 { |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
275 dmaActive = 1; |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
276 } |
| 742 | 277 } |
| 278 } | |
| 690 | 279 |
|
798
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
280 void UART_ChangeBaudrate(uint32_t newBaudrate) |
| 38 | 281 { |
| 809 | 282 uint8_t dmaWasActive = dmaActive; |
|
798
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
283 // HAL_DMA_Abort(&hdma_usart1_rx); |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
284 MX_USART1_UART_DeInit(); |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
285 //HAL_UART_Abort(&huart1); |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
286 //HAL_DMA_DeInit(&hdma_usart1_rx); |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
287 |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
288 |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
289 // huart1.Instance->BRR = UART_BRR_SAMPLING8(HAL_RCC_GetPCLK2Freq()/2, newBaudrate); |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
290 huart1.Init.BaudRate = newBaudrate; |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
291 HAL_UART_Init(&huart1); |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
292 MX_USART1_DMA_Init(); |
| 809 | 293 if(dmaWasActive) |
| 794 | 294 { |
| 809 | 295 memset(rxBuffer,BUFFER_NODATA,sizeof(rxBuffer)); |
|
798
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
296 rxReadIndex = 0; |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
297 rxWriteIndex = 0; |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
298 dmaActive = 0; |
| 742 | 299 UART_StartDMA_Receiption(); |
| 662 | 300 } |
| 38 | 301 } |
| 690 | 302 |
| 662 | 303 void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) |
| 38 | 304 { |
| 662 | 305 if(huart == &huart1) |
| 306 { | |
| 307 dmaActive = 0; | |
| 308 rxWriteIndex+=CHUNK_SIZE; | |
| 309 if(rxWriteIndex >= CHUNK_SIZE * CHUNKS_PER_BUFFER) | |
| 310 { | |
| 311 rxWriteIndex = 0; | |
| 312 } | |
|
787
aeb72882f30a
Dev Bugfx Empty buffer indication and stability improvments:
Ideenmodellierer
parents:
785
diff
changeset
|
313 if((rxWriteIndex / CHUNK_SIZE) != (rxReadIndex / CHUNK_SIZE) || (rxWriteIndex == rxReadIndex)) /* start next transfer if we did not catch up with read index */ |
| 662 | 314 { |
| 809 | 315 UART_StartDMA_Receiption(); |
| 662 | 316 } |
| 317 } | |
| 38 | 318 } |
| 319 | |
| 794 | 320 void UART_ReadData(uint8_t sensorType) |
| 321 { | |
| 322 uint8_t localRX = rxReadIndex; | |
| 38 | 323 |
| 794 | 324 while((rxBuffer[localRX]!=BUFFER_NODATA)) |
| 325 { | |
| 326 switch (sensorType) | |
| 327 { | |
| 328 case SENSOR_MUX: | |
| 329 case SENSOR_DIGO2: uartO2_ProcessData(rxBuffer[localRX]); | |
| 330 break; | |
|
798
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
331 #ifdef ENABLE_CO2_SUPPORT |
|
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
332 case SENSOR_CO2: uartCo2_ProcessData(rxBuffer[localRX]); |
| 794 | 333 break; |
|
798
e9eba334b942
Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents:
794
diff
changeset
|
334 #endif |
|
842
c3dd461ca3f9
Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents:
809
diff
changeset
|
335 #ifdef ENABLE_SENTINEL_MODE |
|
c3dd461ca3f9
Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents:
809
diff
changeset
|
336 case SENSOR_SENTINEL: uartSentinel_ProcessData(rxBuffer[localRX]); |
|
c3dd461ca3f9
Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents:
809
diff
changeset
|
337 break; |
|
c3dd461ca3f9
Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents:
809
diff
changeset
|
338 #endif |
| 794 | 339 default: |
| 340 break; | |
| 341 } | |
| 342 | |
| 343 rxBuffer[localRX] = BUFFER_NODATA; | |
| 344 localRX++; | |
| 345 rxReadIndex++; | |
| 346 if(rxReadIndex >= CHUNK_SIZE * CHUNKS_PER_BUFFER) | |
| 347 { | |
| 348 localRX = 0; | |
| 349 rxReadIndex = 0; | |
| 350 } | |
| 351 } | |
| 352 } | |
| 353 | |
| 354 void UART_FlushRxBuffer(void) | |
| 355 { | |
| 356 while(rxBuffer[rxReadIndex] != BUFFER_NODATA) | |
| 357 { | |
| 358 rxBuffer[rxReadIndex] = BUFFER_NODATA; | |
| 359 rxReadIndex++; | |
| 360 if(rxReadIndex >= CHUNK_SIZE * CHUNKS_PER_BUFFER) | |
| 361 { | |
| 362 rxReadIndex = 0; | |
| 363 } | |
| 364 } | |
| 365 } | |
| 662 | 366 |
| 861 | 367 uint8_t UART_isComActive(uint8_t sensorId) |
| 368 { | |
| 369 uint8_t active = 1; | |
| 809 | 370 |
| 861 | 371 uint8_t ComState = externalInterface_GetSensorState(sensorId + EXT_INTERFACE_MUX_OFFSET); |
| 372 | |
| 373 if((ComState == UART_COMMON_INIT) || (ComState == UART_COMMON_IDLE) || (ComState == UART_COMMON_ERROR)) | |
| 374 { | |
| 375 active = 0; | |
| 376 } | |
| 377 return active; | |
| 378 } | |
| 809 | 379 |
| 38 | 380 /************************ (C) COPYRIGHT heinrichs weikamp *****END OF FILE****/ |