FaSTTUBe/steering-wheel
56
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop-gfx, compilation works

Browse Source
This commit is contained in:
Julian 2024-07-21 15:19:53 +02:00
commit 7c44186d0a
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/Inc/ui.h
View File

@ -9,8 +9,8 @@ extern "C" {
#define NUM_BUTTONS 6 #define NUM_BUTTONS 6
#define NUM_ENCS 2 #define NUM_ENCS 2
#define BUTTON_MIN_INTERVAL 50 // ms #define BUTTON_MIN_INTERVAL 50 // ms
#define ENC_MAX_PHASE 50 // ms #define ENC_MAX_PHASE 50 // ms
typedef enum { UMK_BTN_PRESSED, UMK_ENC_CW, UMK_ENC_CCW } ButtonMessageKind; typedef enum { UMK_BTN_PRESSED, UMK_ENC_CW, UMK_ENC_CCW } ButtonMessageKind;
@ -25,4 +25,4 @@ void ui_thread_entry(ULONG _);
} }
#endif #endif
#endif // __INC_ui_H #endif // __INC_ui_H

1
Core/Src/stm32h7xx_hal_msp.c
View File

@ -20,6 +20,7 @@
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "main.h" #include "main.h"
/* USER CODE BEGIN Includes */ /* USER CODE BEGIN Includes */
/* USER CODE END Includes */ /* USER CODE END Includes */

10
Core/Src/ui.c
View File

@ -1,14 +1,14 @@
#include "ui.h" #include "ui.h"
#include <stdint.h>
#include "hx8357d.h"
#include "main.h"
#include "stm32h7a3xx.h" #include "stm32h7a3xx.h"
#include "stm32h7xx_hal.h" #include "stm32h7xx_hal.h"
#include "stm32h7xx_hal_gpio.h" #include "stm32h7xx_hal_gpio.h"
#include "tx_api.h" #include "tx_api.h"
#include "hx8357d.h"
#include "main.h"
#include "vehicle.h" #include "vehicle.h"
#include <stdint.h>
void ui_thread_entry(ULONG _) { void ui_thread_entry(ULONG _) {
GPIO_TypeDef *button_ports[NUM_BUTTONS] = {BTN1_GPIO_Port, BTN2_GPIO_Port, 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]) { if (press_event == 1 && button_states[1]) {
tx_event_flags_set(&gui_update_events, GUI_UPDATE_NEXT_SCREEN, TX_OR); tx_event_flags_set(&gui_update_events, GUI_UPDATE_NEXT_SCREEN, TX_OR);
} }
vehicle_broadcast_buttons(button_states); vehicle_broadcast_buttons(button_states);
// Release so other threads can get scheduled // Release so other threads can get scheduled
tx_thread_sleep(1); tx_thread_sleep(1);
} }