Mercurial > public > ostc4
comparison Common/Inc/settings.h @ 115:3834b6272ee5 FlipDisplay
Merge with 68181cd61f2069d061621c2cd2a6afddb7486f5e
author | Ideenmodellierer |
---|---|
date | Thu, 03 Jan 2019 19:59:36 +0100 |
parents | fdf0272e9213 be35821a4974 |
children | cc9c18075e00 |
comparison
equal
deleted
inserted
replaced
114:79b19d56ab08 | 115:3834b6272ee5 |
---|---|
30 // From Common/Inc: | 30 // From Common/Inc: |
31 #include "FirmwareData.h" | 31 #include "FirmwareData.h" |
32 | 32 |
33 //#include "data_central.h" | 33 //#include "data_central.h" |
34 | 34 |
35 #include "global_constants.h" | |
35 // From Common/Drivers/ | 36 // From Common/Drivers/ |
36 #include "stm32f4xx_hal.h" | 37 #include "stm32f4xx_hal.h" |
37 | 38 |
38 #include <stdint.h> | 39 #include <stdint.h> |
40 | |
39 | 41 |
40 #define NUM_GASES 5 | 42 #define NUM_GASES 5 |
41 #define NUM_OFFSET_DILUENT 5 | 43 #define NUM_OFFSET_DILUENT 5 |
42 #define SPECIAL_GAS_ID 0 | 44 #define SPECIAL_GAS_ID 0 |
43 | 45 |