Merge remote-tracking branch 'origin/develop' into develop-gfx, compilation works
This commit is contained in:
commit
7c44186d0a
|
@ -9,8 +9,8 @@ extern "C" {
|
|||
|
||||
#define NUM_BUTTONS 6
|
||||
#define NUM_ENCS 2
|
||||
#define BUTTON_MIN_INTERVAL 50 // ms
|
||||
#define ENC_MAX_PHASE 50 // ms
|
||||
#define BUTTON_MIN_INTERVAL 50 // ms
|
||||
#define ENC_MAX_PHASE 50 // ms
|
||||
|
||||
typedef enum { UMK_BTN_PRESSED, UMK_ENC_CW, UMK_ENC_CCW } ButtonMessageKind;
|
||||
|
||||
|
@ -25,4 +25,4 @@ void ui_thread_entry(ULONG _);
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif // __INC_ui_H
|
||||
#endif // __INC_ui_H
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
/* Includes ------------------------------------------------------------------*/
|
||||
#include "main.h"
|
||||
|
||||
/* USER CODE BEGIN Includes */
|
||||
|
||||
/* USER CODE END Includes */
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
#include "ui.h"
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "hx8357d.h"
|
||||
#include "main.h"
|
||||
#include "stm32h7a3xx.h"
|
||||
#include "stm32h7xx_hal.h"
|
||||
#include "stm32h7xx_hal_gpio.h"
|
||||
#include "tx_api.h"
|
||||
|
||||
#include "hx8357d.h"
|
||||
#include "main.h"
|
||||
#include "vehicle.h"
|
||||
#include <stdint.h>
|
||||
|
||||
void ui_thread_entry(ULONG _) {
|
||||
GPIO_TypeDef *button_ports[NUM_BUTTONS] = {BTN1_GPIO_Port, BTN2_GPIO_Port,
|
||||
|
@ -43,7 +43,9 @@ void ui_thread_entry(ULONG _) {
|
|||
if (press_event == 1 && button_states[1]) {
|
||||
tx_event_flags_set(&gui_update_events, GUI_UPDATE_NEXT_SCREEN, TX_OR);
|
||||
}
|
||||
|
||||
vehicle_broadcast_buttons(button_states);
|
||||
|
||||
// Release so other threads can get scheduled
|
||||
tx_thread_sleep(1);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue