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

Timestamp:

Feb 28, 2025, 10:19:50 AM (2 months ago)

Author:

Zed

Message:

Fixing project.

Location:

ctrl/firmware/Main/SES/Core

Files:

• Inc (modified) (1 prop)
• Inc/fan_task.h (added)
• Inc/fan_thread.h (deleted)
• Src (modified) (1 prop)
• Src/fan_task.cpp (added)
• Src/fan_thread.cpp (deleted)
• Src/gui_task.cpp (modified) (3 diffs)
• Src/main_task.cpp (modified) (2 diffs)
• Src/st7789.c (modified) (6 diffs)

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

@@ -1 +1 @@
 #include <cstdint>
+#include <cstdio>
 
 #include "main.h"
@@ -5 +6 @@
 #include "task.h"
 #include "st7789.h"
+#include "tim.h"
 
 static const char* const TAG = "GUI";
@@ -18 +20 @@
 
         //HAL_GPIO_WritePin(PWM_DISPLAY_LIGHT_GPIO_Port, PWM_DISPLAY_LIGHT_Pin, GPIO_PIN_SET);
-        HAL_GPIO_WritePin(RST_DISPLAY_GPIO_Port, RST_DISPLAY_Pin, GPIO_PIN_SET);
+        //HAL_GPIO_WritePin(RST_DISPLAY_GPIO_Port, RST_DISPLAY_Pin, GPIO_PIN_SET);
+
+        ST7789_Initial();
+        show_picture();
+
+        if (HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1) != HAL_OK) Error_Handler();
+        if (HAL_TIMEx_PWMN_Start(&htim1, TIM_CHANNEL_1) != HAL_OK) Error_Handler();
+
+        uint32_t min_pulse = __HAL_TIM_GET_COMPARE(&htim1, TIM_CHANNEL_1);
+        constexpr decltype(min_pulse) max_pulse = 522U;
+        constexpr uint32_t d = 100U;
+
+        for (auto i = min_pulse; i <= max_pulse; i++)
+        {
+                //__HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, i);
+                htim1.Instance->CCR1 = i;
+                vTaskDelay(pdMS_TO_TICKS(d));
+        }
 
         while(1)
         {
-                ST7789_Write_Cmd(0xFA);
+                //ST7789_Write_Cmd_Data(0xFA);
                 //HAL_GPIO_TogglePin(PWM_DISPLAY_LIGHT_GPIO_Port, PWM_DISPLAY_LIGHT_Pin);
+
+                /*for (auto i = min_pulse; i <= max_pulse; i++)
+                {
+                        //__HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, i);
+                        htim1.Instance->CCR1 = i;
+                        vTaskDelay(pdMS_TO_TICKS(d));
+                }
+
+                vTaskDelay(delay_ms);
+
+                for (auto i = max_pulse; i >= min_pulse; i--)
+                {
+                        //__HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, i);
+                        htim1.Instance->CCR1 = i;
+                        vTaskDelay(pdMS_TO_TICKS(d));
+                }*/
 
                 vTaskDelay(delay_ms);

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

@@ -12 +12 @@
 #include "adc.h"
 #include "dts.h"
-#include "tim.h"
 
-
+//------------------------------------------------------------------------------
 
 static const char* const TAG = "MAIN";
@@ -57 +56 @@
 
         }
-
-        if (HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1) != HAL_OK) Error_Handler();
-        if (HAL_TIMEx_PWMN_Start(&htim1, TIM_CHANNEL_1) != HAL_OK) Error_Handler();
 
         while(1)

ctrl/firmware/Main/SES/Core/Src/st7789.c

@@ -12 +12 @@
 #define DISPLAY_RST_PIN_DEASSERTED        GPIO_PIN_SET
 
-#define DISPLAY_SPI_CS_PORT                       SPI4_NSS_DISPLAY_GPIO_Port
-#define DISPLAY_SPI_CS_PIN                        SPI4_NSS_DISPLAY_Pin
+#define DISPLAY_SPI_CS_PORT                       DISPLAY_SPI_CS_GPIO_Port
+#define DISPLAY_SPI_CS_PIN                        DISPLAY_SPI_CS_Pin
 #define DISPLAY_SPI_CS_PIN_ENABLE         GPIO_PIN_RESET
 #define DISPLAY_SPI_CS_PIN_DISABLE        GPIO_PIN_SET
 
 #define DISPLAY_SPI_HANDLE                        hspi4
+
+#define ST7789_COLMOD                             0x3A
+#define ST7789_COLOR_MODE_16bit           0x55    //  RGB565 (16bit)
 
 const uint16_t pic[]=
@@ -255 +258 @@
         ST7789_Write_Cmd_Data(0xA1);                                                                                            // Default value 0xA1
 
-        ST7789_Write_Cmd(0x21);                                                                                                         // Display Inversion On
         ST7789_Write_Cmd(0xE0);                                                                                                         // Positive Voltage Gamma Control
         ST7789_Write_Cmd_Data(0xF0);
@@ -288 +290 @@
         ST7789_Write_Cmd_Data(0x32);
 
+        ST7789_Write_Cmd(0x21);                                                                                                         // Display Inversion On
+
         ST7789_Write_Cmd(0x11);                                                                                                         // Wake up
-        HAL_Delay(120);
+        ST7789_Delay(120);
 
         ST7789_Write_Cmd(0x35);                                                                                                         // Tearing Effect Line On
@@ -307 +311 @@
         spi_data[0] = cmd;
         spi_data[1] = 0x00;
-        HAL_SPI_Transmit(&DISPLAY_SPI_HANDLE, spi_data, 2, 500);
+        HAL_SPI_Transmit(&DISPLAY_SPI_HANDLE, spi_data, 1, 500);
 
         //HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_DISABLE);
@@ -316 +320 @@
 void ST7789_Write_Data(uint8_t dh, uint8_t dl)
 {
-        HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_ENABLE);
+        //HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_ENABLE);
         //HAL_GPIO_WritePin(TFT_WR_DC_GPIO_Port, TFT_WR_DC_Pin, GPIO_PIN_SET);
 
-    HAL_SPI_Transmit(&DISPLAY_SPI_HANDLE, &dh, 1, 500);
-    HAL_SPI_Transmit(&DISPLAY_SPI_HANDLE, &dl, 1, 500);
-
-        HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_DISABLE);
-}
-
-//------------------------------------------------------------------------------
-
-void ST7789_Write_Cmd_Data(uint8_t cmdp)
-{
-    HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_ENABLE);
+        uint8_t spi_data[2];
+        spi_data[0] = dh;
+        spi_data[1] = 0x01;
+    HAL_SPI_Transmit(&DISPLAY_SPI_HANDLE, spi_data, 1, 500);
+
+        spi_data[0] = dl;
+        spi_data[1] = 0x01;
+    HAL_SPI_Transmit(&DISPLAY_SPI_HANDLE, spi_data, 1, 500);
+
+        //HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_DISABLE);
+}
+
+//------------------------------------------------------------------------------
+
+void ST7789_Write_Cmd_Data(uint8_t cmd)
+{
+    //HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_ENABLE);
         //HAL_GPIO_WritePin(TFT_WR_DC_GPIO_Port, TFT_WR_DC_Pin, GPIO_PIN_SET);
 
-        HAL_SPI_Transmit(&DISPLAY_SPI_HANDLE, &cmdp, 1, 500);
-
-        HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_DISABLE);
+        uint8_t spi_data[2];
+        spi_data[0] = cmd;
+        spi_data[1] = 0x01;
+
+        HAL_SPI_Transmit(&DISPLAY_SPI_HANDLE, spi_data, 1, 500);
+
+        //HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_DISABLE);
 }
 
@@ -341 +355 @@
 void ST7789_WriteMultiData(uint8_t *pData, int NumItems)
 {
-    HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_ENABLE);
+    //HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_ENABLE);
         //HAL_GPIO_WritePin(TFT_WR_DC_GPIO_Port, TFT_WR_DC_Pin, GPIO_PIN_SET);
 
         HAL_SPI_Transmit(&DISPLAY_SPI_HANDLE, pData, NumItems, 1000);
 
-        HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_DISABLE);
-}
-
-//------------------------------------------------------------------------------
+        //HAL_GPIO_WritePin(DISPLAY_SPI_CS_PORT, DISPLAY_SPI_CS_PIN, DISPLAY_SPI_CS_PIN_DISABLE);
+}
+
+//------------------------------------------------------------------------------