Rev 67 | Rev 74 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 67 | Rev 70 | ||
|---|---|---|---|
| Line 62... | Line 62... | ||
| 62 | int Min; |
62 | int Min; |
| 63 | enum PLX_Observations observation; |
63 | enum PLX_Observations observation; |
| 64 | uint8_t instance; |
64 | uint8_t instance; |
| 65 | uint16_t data; |
65 | uint16_t data; |
| 66 | uint32_t sum; //< Sum of readings since last logged |
66 | uint32_t sum; //< Sum of readings since last logged |
| 67 | uint32_t lastUpdated; ///< Time of last update |
67 | uint32_t lastUpdated; ///< Time of last update |
| 68 | uint16_t count; //< Count of readings since last logged . |
68 | uint16_t count; //< Count of readings since last logged . |
| 69 | uint8_t updated; ///< Set when updated |
69 | uint8_t updated; ///< Set when updated |
| 70 | } info_t; |
70 | } info_t; |
| 71 | 71 | ||
| 72 | typedef struct |
72 | typedef struct |
| 73 | { |
73 | { |
| 74 | int8_t knobPos; ///< User interface knob position |
74 | int8_t knobPos; ///< User interface knob position |
| Line 82... | Line 82... | ||
| 82 | 82 | ||
| 83 | extern info_t Info[MAXRDG]; |
83 | extern info_t Info[MAXRDG]; |
| 84 | 84 | ||
| 85 | extern context_t contexts[MAX_DISPLAYS]; |
85 | extern context_t contexts[MAX_DISPLAYS]; |
| 86 | 86 | ||
| 87 | extern int PLXItems; |
- | |
| 88 | - | ||
| 89 | // declarations need to be visible elsewhere |
87 | // declarations need to be visible elsewhere |
| 90 | extern SPI_HandleTypeDef hspi1; |
88 | extern SPI_HandleTypeDef hspi1; |
| 91 | 89 | ||
| 92 | extern UART_HandleTypeDef huart1; |
90 | extern UART_HandleTypeDef huart1; |
| 93 | extern UART_HandleTypeDef huart2; |
91 | extern UART_HandleTypeDef huart2; |
| Line 113... | Line 111... | ||
| 113 | 111 | ||
| 114 | /* USER CODE BEGIN EFP */ |
112 | /* USER CODE BEGIN EFP */ |
| 115 | extern context_t context[MAX_DISPLAYS]; |
113 | extern context_t context[MAX_DISPLAYS]; |
| 116 | 114 | ||
| 117 | extern uint8_t btConnected(); |
115 | extern uint8_t btConnected(); |
| - | 116 | ||
| - | 117 | extern uint8_t isValid(int i); |
|
| 118 | /* USER CODE END EFP */ |
118 | /* USER CODE END EFP */ |
| 119 | 119 | ||
| 120 | /* Private defines -----------------------------------------------------------*/ |
120 | /* Private defines -----------------------------------------------------------*/ |
| 121 | #define SPI_NSS1_Pin GPIO_PIN_4 |
121 | #define SPI_NSS1_Pin GPIO_PIN_4 |
| 122 | #define SPI_NSS1_GPIO_Port GPIOA |
122 | #define SPI_NSS1_GPIO_Port GPIOA |
| Line 152... | Line 152... | ||
| 152 | #define BT_BUTTON_GPIO_Port GPIOA |
152 | #define BT_BUTTON_GPIO_Port GPIOA |
| 153 | #define PLX_TX_Pin GPIO_PIN_9 |
153 | #define PLX_TX_Pin GPIO_PIN_9 |
| 154 | #define PLX_TX_GPIO_Port GPIOA |
154 | #define PLX_TX_GPIO_Port GPIOA |
| 155 | #define PLX_RX_Pin GPIO_PIN_10 |
155 | #define PLX_RX_Pin GPIO_PIN_10 |
| 156 | #define PLX_RX_GPIO_Port GPIOA |
156 | #define PLX_RX_GPIO_Port GPIOA |
| - | 157 | #define BT_RESET_Pin GPIO_PIN_11 |
|
| - | 158 | #define BT_RESET_GPIO_Port GPIOA |
|
| 157 | #define USB_PWR_Pin GPIO_PIN_12 |
159 | #define USB_PWR_Pin GPIO_PIN_12 |
| 158 | #define USB_PWR_GPIO_Port GPIOC |
160 | #define USB_PWR_GPIO_Port GPIOC |
| 159 | /* USER CODE BEGIN Private defines */ |
161 | /* USER CODE BEGIN Private defines */ |
| 160 | 162 | ||
| 161 | /* USER CODE END Private defines */ |
163 | /* USER CODE END Private defines */ |