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

Timestamp:

Feb 6, 2025, 8:27:24 AM (3 months ago)

Author:

Zed

Message:

DMA transfer to µSD-card was implemented.

Location:

ctrl/firmware/Main/SES/Core

Files:

• Inc/gps.h (modified) (1 diff)
• Inc/sysdata.h (modified) (6 diffs)
• Src/eth_task.cpp (modified) (1 diff)
• Src/keys_task.cpp (modified) (1 diff)
• Src/main_task.cpp (modified) (2 diffs)
• Src/sysdata.c (moved) (moved from ctrl/firmware/Main/SES/Core/Src/sysdata.cpp)

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

@@ -2 +2 @@
 #define __GPS_H_
 
-#include <cstdint>
+#include <stdint.h>
 
 //! Struktur zur Aufnahme der RTC Zeit/Datum

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

@@ -2 +2 @@
 #define __SYS_DATA_H
 
-#include <cstdint>
+#include <stdint.h>
+#include <stdbool.h>
 
 #include "charge_controller.h"
 #include "street_light.h"
+#include "common.h"
 #include "gps.h"
 
@@ -14 +16 @@
 //---------- Constants ---------------------------------------------------------
 
-inline constexpr unsigned MAX_LIPRO_CELLS = 16U;                                                                // FÜR SPEICHERUNG AUF SD KARTE, damit Anzahl der Felder immer gleich ist und Reservierung Speicher für Lipro Daten, Achtung eine Änderung verschiebt MODBUS Adressen!!!
-inline constexpr unsigned MAX_LOG_MESSAGES = 10U;
-inline constexpr unsigned MAX_TEMP_SENSOR_ID_SIZE = 8U;
+#define MAX_LIPRO_CELLS                           (16U)                                                                         // FÜR SPEICHERUNG AUF SD KARTE, damit Anzahl der Felder immer gleich ist und Reservierung Speicher für Lipro Daten, Achtung eine Änderung verschiebt MODBUS Adressen!!!
+#define MAX_LOG_MESSAGES                          (10U)
+#define MAX_TEMP_SENSOR_ID_SIZE           (8U)
 
 //---------- Enums -------------------------------------------------------------
@@ -45 +47 @@
 } ext_input_mode_t;
 
-typedef enum mb_error_codes_enum
+/*typedef enum mb_error_codes_enum
 {
         MB_ERROR_NOTHING = 0,                   // 0
@@ -54 +56 @@
         MB_ERROR_BYTE_COUNT,                    // 5
         MB_ERROR_START_ADRESS,                  // 6
-} mb_error_codes_t;
+} mb_error_codes_t;*/
 
 typedef enum output_state_enum
@@ -71 +73 @@
 
 //---------- Typedefs ----------------------------------------------------------
-
-typedef union bword
-{
-        uint16_t        w;
-        int16_t         sw;
-        uint8_t         lb;
-        int8_t          slb;
-        uint8_t         b[2];
-        int8_t          sb[2];
-} bword_t;
 
 typedef struct ext_output_config
@@ -191 +183 @@
 
         //LOKALBUS PARAMETER
-        uint8_t                                 lb_slave_adress;                                //38l
+        uint8_t                                 lb_slave_address;                               //38l
         uint8_t                                 lb_mode;                                                //38h
         uint8_t                                 lb_baudrate_mode;                               //39l

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

@@ -42 +42 @@
 void ethTaskStart(void* argument)
 {
-        (void)argument;
+        UNUSED(argument);
 
         wizchip_initialize();

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

@@ -15 +15 @@
 void keysTaskStart(void* argument)
 {
-        (void)argument;
+        UNUSED(argument);
 
         HAL_GPIO_WritePin(POWER_5V_EN_GPIO_Port, POWER_5V_EN_Pin, GPIO_PIN_SET);

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

@@ -20 +20 @@
 //UINT ret;
 
-static FATFS fs;// __attribute__((section(".DTCM_RAM")));     // Filesystem object
+static FATFS fs;// __attribute__((section(".AXI_RAM")));     // Filesystem object
 
 FRESULT scan_files (TCHAR* path);
@@ -29 +29 @@
 [[noreturn]] void mainTaskStart(void *argument)
 {
-        (void)argument;
+        UNUSED(argument);
 
         //DHCP_init(0, dhcp_buffer);