feat: display

squadracorsepolito · Sep 4, 2024 · 5bd7929 · 5bd7929
1 parent 2c7f72d
commit 5bd7929
Show file tree

Hide file tree

Showing 11 changed files with 547 additions and 9 deletions.
diff --git a/Core/Inc/bsp.h b/Core/Inc/bsp.h
@@ -161,8 +161,8 @@ enum BTN_Device {
 /* ---------- Exported macros ------------------------------------------------*/
 
 /* ---------- Exported functions ---------------------------------------------*/
-uint8_t BTN_Device_sampleStatus(enum BTN_Device device);
-uint8_t BTN_Device_getStatus(enum BTN_Device device);
+uint8_t BTN_sampleStatus(enum BTN_Device device);
+uint8_t BTN_getStatus(enum BTN_Device device);
 void BTN_Routine(void);
 
 /* ---------- Private types --------------------------------------------------*/

diff --git a/Core/Inc/conf.h b/Core/Inc/conf.h
@@ -24,7 +24,7 @@
 /* ---------- Exported constants --------------------------------------------*/
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 0
-#define VERSION_PATCH 5
+#define VERSION_PATCH 6
 
 #define DEBUG_SERIAL
 #define DEBUG_AIN

diff --git a/Core/Inc/wdg.h b/Core/Inc/wdg.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include <inttypes.h>
+#include "mcb.h"
 
 /**
  * @brief Watchdog board indexes
@@ -15,6 +16,7 @@ typedef enum
 {
     WDG_BOARD_DSPACE = 0,
     WDG_BOARD_TLB,
+    WDG_BOARD_BMS_LV,
     WDG_NUM_BOARDS
 } wdg_boards;
 
@@ -23,7 +25,9 @@ typedef enum
  */
 static uint32_t wdg_timeouts_100us[WDG_NUM_BOARDS] = {
     [WDG_BOARD_DSPACE] = 100000, // Wait for dSpace to boot
-    [WDG_BOARD_TLB] = 4800};
+    [WDG_BOARD_TLB] = 4800,
+    [WDG_BOARD_BMS_LV] = ((uint32_t)((MCB_BMS_LV_LV_BAT_GENERAL_CYCLE_TIME_MS * 5)/0.1)) //wait to loose 5 messages, 0.1ms -> 100us
+};
 
 /**
  * @brief Resets the timer of a board to the given timestamp

diff --git a/Core/Src/can.c b/Core/Src/can.c
@@ -147,6 +147,34 @@ void MX_CAN1_Init(void)
         Error_Handler();
     }
 
+    sFilterConfig.FilterBank           = 6;
+    sFilterConfig.FilterMode           = CAN_FILTERMODE_IDLIST;
+    sFilterConfig.FilterScale          = CAN_FILTERSCALE_16BIT;
+    sFilterConfig.FilterIdHigh         = (MCB_DSPACE_SIGNALS_FRAME_ID << 5);
+    sFilterConfig.FilterIdLow          = (MCB_DSPACE_SIGNALS_FRAME_ID << 5);
+    sFilterConfig.FilterFIFOAssignment = CAN_RX_FIFO0;
+    sFilterConfig.FilterActivation     = ENABLE;
+    sFilterConfig.SlaveStartFilterBank = 14;
+
+    if (HAL_CAN_ConfigFilter(&hcan1, &sFilterConfig) != HAL_OK) {
+        /* Filter configuration Error */
+        Error_Handler();
+    }
+
+    sFilterConfig.FilterBank           = 7;
+    sFilterConfig.FilterMode           = CAN_FILTERMODE_IDLIST;
+    sFilterConfig.FilterScale          = CAN_FILTERSCALE_16BIT;
+    sFilterConfig.FilterIdHigh         = (MCB_BMS_LV_LV_BAT_GENERAL_FRAME_ID << 5);
+    sFilterConfig.FilterIdLow          = (MCB_BMS_LV_LV_BAT_GENERAL_FRAME_ID << 5);
+    sFilterConfig.FilterFIFOAssignment = CAN_RX_FIFO0;
+    sFilterConfig.FilterActivation     = ENABLE;
+    sFilterConfig.SlaveStartFilterBank = 14;
+
+    if (HAL_CAN_ConfigFilter(&hcan1, &sFilterConfig) != HAL_OK) {
+        /* Filter configuration Error */
+        Error_Handler();
+    }
+
     if (HAL_CAN_ActivateNotification(&hcan1,
                                      CAN_IT_BUSOFF | CAN_IT_ERROR | CAN_IT_ERROR_PASSIVE | CAN_IT_ERROR_WARNING |
                                          CAN_IT_RX_FIFO0_MSG_PENDING) != HAL_OK) {

diff --git a/Core/Src/dashboard.c b/Core/Src/dashboard.c
@@ -14,6 +14,7 @@
 #include "utils.h"
 #include "wdg.h"
 #include "bsp.h"
+#include "STM32_ST7032.h"
 
 #include <stdio.h>
 
@@ -50,6 +51,9 @@ volatile GPIO_PinState BMS_ERR;
 volatile GPIO_PinState TSOFF;
 volatile GPIO_PinState IMD_ERR;
 
+volatile uint8_t HVBAT_SOC = 0;
+volatile double LVBAT_V = 0.0;
+
 volatile uint8_t ams_err_tlb;
 
 volatile uint8_t hvb_diag_bat_vlt_sna;
@@ -70,6 +74,9 @@ volatile struct RGB_Led_t LED2;
 volatile struct RGB_Led_t LED3;
 volatile struct RGB_Led_t LED4;
 
+
+ST7032_InitTypeDef LCD_DisplayHandle = {0};
+
 /* dSpace ACK flags */
 volatile int8_t dspace_rtd_state;
 
@@ -95,10 +102,12 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan) {
     union {
         struct mcb_dspace_fsm_states_t rtd_ack;
         struct mcb_dspace_peripherals_ctrl_t per_ctrl;
+        struct mcb_dspace_signals_t dspace_signals;
         struct mcb_tlb_bat_signals_status_t tsal_status;
         struct mcb_tlb_bat_sd_csensing_status_t shut_status;
         struct mcb_dspace_dash_leds_color_rgb_t rgb_status;
-    } msgs;
+        struct mcb_bms_lv_lv_bat_general_t lv_bat_general;
+    } msgs = {};
 
     if (HAL_CAN_GetRxMessage(hcan, CAN_RX_FIFO0, &RxHeader, RxData) != HAL_OK) {
         /* Transmission request Error */
@@ -111,6 +120,7 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan) {
     switch (RxHeader.StdId) {
         case MCB_DSPACE_FSM_STATES_FRAME_ID:
         case MCB_DSPACE_PERIPHERALS_CTRL_FRAME_ID:
+        case MCB_DSPACE_SIGNALS_FRAME_ID:
             // Reset dSpace timeout after boot
             wdg_timeouts_100us[WDG_BOARD_DSPACE] = 4800;  //480ms
             wdg_reset(WDG_BOARD_DSPACE, now);
@@ -119,6 +129,9 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan) {
         case MCB_TLB_BAT_SIGNALS_STATUS_FRAME_ID:
             wdg_reset(WDG_BOARD_TLB, now);
             break;
+        case MCB_BMS_LV_LV_BAT_GENERAL_FRAME_ID:
+            wdg_reset(WDG_BOARD_BMS_LV, now);
+            break;
     }
 
     /*Reboot Board - Received command byte from CAN*/
@@ -186,6 +199,14 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan) {
         LED4.R = mcb_dspace_dash_leds_color_rgb_led_4_red_decode(msgs.rgb_status.led_4_red);
         LED4.G = mcb_dspace_dash_leds_color_rgb_led_4_green_decode(msgs.rgb_status.led_4_green);
         LED4.B = mcb_dspace_dash_leds_color_rgb_led_4_blue_decode(msgs.rgb_status.led_4_blue);
+    } else if ((RxHeader.StdId == MCB_DSPACE_SIGNALS_FRAME_ID) &&
+               (RxHeader.DLC == MCB_DSPACE_SIGNALS_LENGTH)) {
+        mcb_dspace_signals_unpack(&msgs.dspace_signals, RxData, MCB_DSPACE_SIGNALS_LENGTH);
+        HVBAT_SOC = msgs.dspace_signals.hvbat_soc;
+    } else if ((RxHeader.StdId == MCB_BMS_LV_LV_BAT_GENERAL_FRAME_ID) &&
+               (RxHeader.DLC == MCB_BMS_LV_LV_BAT_GENERAL_LENGTH)) {
+        mcb_bms_lv_lv_bat_general_unpack(&msgs.lv_bat_general, RxData, MCB_BMS_LV_LV_BAT_GENERAL_LENGTH);
+        LVBAT_V = mcb_bms_lv_lv_bat_general_lv_bat_summed_voltage_decode(msgs.lv_bat_general.lv_bat_summed_voltage);
     }
 }
 
@@ -253,6 +274,15 @@ void InitDashBoard() {
     //     error = ERROR_INIT_BTN;
     //     rtd_fsm = STATE_ERROR;
     // }
+
+    char buffer [20] ={};
+    sprintf(buffer, "SQUADRA CORSE POLITO");
+    LCD_write(buffer);
+    HAL_Delay(800);
+    LCD_setCursor(1, 0);
+    sprintf(buffer, "     ANDROMEDA");
+    LCD_write(buffer);
+    HAL_Delay(800);
 }
 
 void cock_callback() {
@@ -396,6 +426,21 @@ void SetupDashBoard(void) {
     PCA9555_digitalWrite(&pca9555Handle, 14, PCA9555_BIT_RESET);
     PCA9555_digitalWrite(&pca9555Handle, 15, PCA9555_BIT_RESET);
 
+    HAL_GPIO_WritePin(NHD_C0220BIZx_nRST_GPIO_OUT_GPIO_Port,NHD_C0220BIZx_nRST_GPIO_OUT_Pin,GPIO_PIN_SET);
+
+    LCD_DisplayHandle.LCD_hi2c              = &hi2c1;
+    LCD_DisplayHandle.LCD_htim_backlight    = NULL;
+    LCD_DisplayHandle.TIM_channel_backlight = 0;
+    LCD_DisplayHandle.i2cAddr               = 0x78;
+    LCD_DisplayHandle.num_col               = 20;
+    LCD_DisplayHandle.num_lines             = 2;
+
+
+    LCD_ST7032_Init(&LCD_DisplayHandle);  // Init LCD
+    LCD_clear();                          // clear LCD
+    LCD_home();                           // Home The display
+    LCD_contrast(15);                     // set contrast to level 15 - MAXIMUM (15 level available)
+
     char msg[54] = {0};
     sprintf(msg, "Dashboard 2022 Boot - build %s @ %s\r\n", __DATE__, __TIME__);
     HAL_UART_Transmit(&huart1, (uint8_t *)msg, strlen(msg), 20);
@@ -496,6 +541,45 @@ uint8_t AMS_detection(uint8_t ams_err_tlb,
     return ams_err_prev;
 }
 
+void LCD_DisplayUpdateRoutine(void) {
+    static uint8_t cnt100ms = 0;
+    char hv_bat_soc_str [10] = {};
+    char lv_bat_v_str [10] = {};
+
+    if(HAL_GetTick() < cnt100ms)
+        return;
+    cnt100ms = HAL_GetTick() + 100U;
+
+    char buffer[20] = {};
+    //LCD_clear();
+    LCD_home();
+
+    if(boards_timeouts & (1<< WDG_BOARD_DSPACE)){
+        sprintf(hv_bat_soc_str,"Na");
+    }else{
+        sprintf(hv_bat_soc_str,"%3u",HVBAT_SOC);
+    }
+
+    if(boards_timeouts & (1<< WDG_BOARD_BMS_LV)){
+        sprintf(lv_bat_v_str,"Na");
+    }else{
+        sprintf(lv_bat_v_str,"%04.1f",LVBAT_V/1000);
+    }
+    sprintf(buffer, " HV %3s%%   LV %4sV", hv_bat_soc_str,lv_bat_v_str);
+    LCD_write(buffer);
+    LCD_setCursor(1, 0);
+    sprintf(buffer, "     ANDROMEDA");
+    LCD_write(buffer);
+    //sprintf(buffer, "INV %2u", (uint8_t)INV_TEMP_VAL);
+    //LCD_write(buffer);
+    //LCD_write_byte(0b11011111);
+    //LCD_shift(ST7032_CR, 5);
+    //sprintf(buffer, "TSAC %2u", (uint8_t)TSAC_TEMP_VAL);
+    //LCD_write(buffer);
+    //LCD_write_byte(0b11011111);
+    //LCD_home();
+}
+
 /**
     * @brief Dash main loop
  */
@@ -541,6 +625,8 @@ void CoreDashBoard(void) {
     // RUN the ready to drive FSM
     RTD_fsm(500);
 
+    LCD_DisplayUpdateRoutine();
+
     // Run the AS FSM
     // mission_run();
     // as_run();

diff --git a/Doc/NHD-C0220BiZ-FSW-FBW-3V3M.pdf b/Doc/NHD-C0220BiZ-FSW-FBW-3V3M.pdf
diff --git a/Lib/STM32_HAL_ST7032_LCD_LIBRARY/README.md b/Lib/STM32_HAL_ST7032_LCD_LIBRARY/README.md
@@ -0,0 +1,22 @@
+# STM32_HAL_ST7032_LCD_LIBRARY
+
+	Created on: Mar. 27, 2020
+	Author: AARONEE - khoahuynh
+	Email: [email protected]
+	Github: https://github.com/aaronee
+
+
+## Introduction:
+* Example is written using Eclipse + ARM GCC for Blue Pill STM32f103c8t6 and LCD MIDAS MCCOG21605B6W-BNMLWI
+* This library is based on STM32 HAL library. You must implement STM32 HAL library to use this library
+* Some codes are based on ST7306LCD_Library from author **@F. Malpartida**, and can be found at [his repo](https://github.com/pkourany/ST7306LCD_Library)
+
+
+## MainFunction:
+1. Initializing ST7032 based LCD in 2 line display 5x8, inst table 1 as default
+1. Controlling LCD cursor/blink, screen shift right/left, turn on/off, move cursor to home
+1. Send command, write to RAM function
+1. Loading custom character (8 characters)
+1. Adjust contrast, backlight levels (require 1 pin for PWM to control backlight)
+
+