Changeset 73 for ctrl/firmware/Main/SES/Core

Timestamp:

Jan 29, 2025, 10:08:12 AM (3 months ago)

Author:

Zed

Message:

FreeRTOS can be compiled without errors.

Location:

ctrl/firmware/Main/SES/Core

Files:

• Inc/keys_task.h (moved) (moved from ctrl/firmware/Main/SES/Core/Inc/keys_thread.h) (2 diffs)
• Inc/main_task.h (moved) (moved from ctrl/firmware/Main/SES/Core/Inc/main_thread.h) (2 diffs)
• Src/keys_task.cpp (moved) (moved from ctrl/firmware/Main/SES/Core/Src/keys_thread.cpp) (2 diffs)
• Src/main_task.cpp (moved) (moved from ctrl/firmware/Main/SES/Core/Src/main_thread.cpp) (3 diffs)

ctrl/firmware/Main/SES/Core/Inc/keys_task.h

@@ -1 +1 @@
 #ifndef __KEYS_THREAD_H
 #define __KEYS_THREAD_H
-
-#include "tx_api.h"
 
 #ifdef __cplusplus
@@ -9 +7 @@
 #endif
 
-VOID scanKeysThread(ULONG initial_input);
+void keysTaskStart(void* argument) __attribute__((noreturn));
 
 #ifdef __cplusplus

ctrl/firmware/Main/SES/Core/Inc/main_task.h

@@ -1 +1 @@
 #ifndef __MAIN_THREAD_H
 #define __MAIN_THREAD_H
-
-#include "fx_api.h"
 
 #ifdef __cplusplus
@@ -9 +7 @@
 #endif
 
-void startMainThread(FX_MEDIA*);
+[[noreturn]] void mainTaskStart(void *argument);
 
 #ifdef __cplusplus

ctrl/firmware/Main/SES/Core/Src/keys_task.cpp

@@ -1 +1 @@
 #include <cstdio>
 
+#include "FreeRTOS.h"
+#include "task.h"
+
 #include "main.h"
-#include "keys_thread.h"
+#include "keys_task.h"
 #include "utils.h"
 
 static const char* const TAG = "KEYS";
-static uint16_t delay_ms = 2000U;
+static uint16_t delay_ms = 500U;
 
 //------------------------------------------------------------------------------
 
-VOID scanKeysThread(ULONG initial_input)
+void keysTaskStart(void* argument)
 {
-        (void)initial_input;
+        (void)argument;
 
         HAL_GPIO_WritePin(POWER_5V_EN_GPIO_Port, POWER_5V_EN_Pin, GPIO_PIN_SET);
@@ -31 +34 @@
                 //HAL_GPIO_WritePin(RX2_LED_GPIO_Port, RX2_LED_Pin, GPIO_PIN_RESET);
 
-                tx_thread_sleep(delay_ms);
+                vTaskDelay(delay_ms);
 
                 //HAL_GPIO_WritePin(RX1_LED_GPIO_Port, RX1_LED_Pin, GPIO_PIN_SET);

ctrl/firmware/Main/SES/Core/Src/main_task.cpp

@@ -2 +2 @@
 #include <cstdint>
 
-#include "tx_api.h"
-#include "fx_api.h"
-#include "main_thread.h"
+#include "FreeRTOS.h"
+#include "task.h"
+
+#include "main_task.h"
 #include "utils.h"
 
@@ -12 +13 @@
 static constexpr uint16_t delay_ms = 5000;
 static constexpr unsigned MAX_CHARS_IN_VOLUME_NAME = 12U;
-static CHAR volumeName[MAX_CHARS_IN_VOLUME_NAME];
-static CHAR entry[FX_MAX_LONG_NAME_LEN];
-UINT ret;
+static uint8_t volumeName[MAX_CHARS_IN_VOLUME_NAME];
+
+//UINT ret;
 
 //------------------------------------------------------------------------------
 
-void startMainThread(FX_MEDIA* sdio_disk)
+[[noreturn]] void mainTaskStart(void *argument)
 {
 /*      ret = fx_media_volume_get(sdio_disk, volumeName, FX_DIRECTORY_SECTOR);
@@ -68 +69 @@
         while(1)
         {
-                tx_thread_sleep(delay_ms);
+                vTaskDelay(delay_ms);
 
                 //printThreadStackInfo(TAG);