Rev 9 | Rev 11 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 9 | Rev 10 | ||
|---|---|---|---|
| Line 17... | Line 17... | ||
| 17 | */ |
17 | */ |
| 18 | /* USER CODE END Header */ |
18 | /* USER CODE END Header */ |
| 19 | /* Includes ------------------------------------------------------------------*/ |
19 | /* Includes ------------------------------------------------------------------*/ |
| 20 | #include "main.h" |
20 | #include "main.h" |
| 21 | 21 | ||
| - | 22 | ||
| - | 23 | ||
| 22 | /* Private includes ----------------------------------------------------------*/ |
24 | /* Private includes ----------------------------------------------------------*/ |
| 23 | /* USER CODE BEGIN Includes */ |
25 | /* USER CODE BEGIN Includes */ |
| 24 | #include "display.h" |
26 | #include "display.h" |
| 25 | #include "bmp280driver.h" |
27 | #include "bmp280driver.h" |
| 26 | #include "libMisc/fixI2C.h" |
28 | #include "libMisc/fixI2C.h" |
| 27 | #include "libPlx/plx.h" |
29 | #include "libPlx/plx.h" |
| 28 | #include "libSerial/serial.h" |
30 | #include "libSerial/serial.h" |
| 29 | #include "libIgnTiming/timing.h" |
31 | #include "libIgnTiming/timing.h" |
| 30 | #include "libIgnTiming/edis.h" |
32 | #include "libIgnTiming/edis.h" |
| - | 33 | #include "saveTiming.h" |
|
| 31 | /* USER CODE END Includes */ |
34 | /* USER CODE END Includes */ |
| 32 | 35 | ||
| 33 | /* Private typedef -----------------------------------------------------------*/ |
36 | /* Private typedef -----------------------------------------------------------*/ |
| 34 | /* USER CODE BEGIN PTD */ |
37 | /* USER CODE BEGIN PTD */ |
| 35 | 38 | ||
| Line 192... | Line 195... | ||
| 192 | 195 | ||
| 193 | // used to store data |
196 | // used to store data |
| 194 | PLX_SensorInfo info; |
197 | PLX_SensorInfo info; |
| 195 | int infoCount = -1; |
198 | int infoCount = -1; |
| 196 | 199 | ||
| - | 200 | loadTimingInfoFromNvram(); |
|
| - | 201 | ||
| 197 | // HAL_IWDG_Init(&hiwdg); |
202 | // HAL_IWDG_Init(&hiwdg); |
| 198 | /* USER CODE END 2 */ |
203 | /* USER CODE END 2 */ |
| 199 | 204 | ||
| 200 | /* Infinite loop */ |
205 | /* Infinite loop */ |
| 201 | /* USER CODE BEGIN WHILE */ |
206 | /* USER CODE BEGIN WHILE */ |
| Line 317... | Line 322... | ||
| 317 | 322 | ||
| 318 | /* USER CODE END WHILE */ |
323 | /* USER CODE END WHILE */ |
| 319 | 324 | ||
| 320 | /* USER CODE BEGIN 3 */ |
325 | /* USER CODE BEGIN 3 */ |
| 321 | HAL_IWDG_Refresh(&hiwdg); |
326 | HAL_IWDG_Refresh(&hiwdg); |
| - | 327 | ||
| - | 328 | ||
| - | 329 | ||
| - | 330 | // todo occasionally saveTimingInfoToNvram(); |
|
| - | 331 | ||
| - | 332 | ||
| - | 333 | ||
| 322 | } |
334 | } |
| 323 | /* USER CODE END 3 */ |
335 | /* USER CODE END 3 */ |
| 324 | } |
336 | } |
| 325 | 337 | ||
| 326 | /** |
338 | /** |