Index: ctrl/firmware/Main/CubeMX/Core/Inc/main.h =================================================================== --- ctrl/firmware/Main/CubeMX/Core/Inc/main.h (revision 48) +++ ctrl/firmware/Main/CubeMX/Core/Inc/main.h (revision 50) @@ -58,4 +58,6 @@ /* Private defines -----------------------------------------------------------*/ +#define TX1_LED_Pin GPIO_PIN_6 +#define TX1_LED_GPIO_Port GPIOE #define SPI4_NSS_DISPLAY_Pin GPIO_PIN_11 #define SPI4_NSS_DISPLAY_GPIO_Port GPIOE @@ -68,4 +70,16 @@ #define RST_DISPLAY_Pin GPIO_PIN_15 #define RST_DISPLAY_GPIO_Port GPIOE +#define OUTPUT_ON_LED_Pin GPIO_PIN_7 +#define OUTPUT_ON_LED_GPIO_Port GPIOD +#define ERROR_LED_Pin GPIO_PIN_9 +#define ERROR_LED_GPIO_Port GPIOG +#define CHARGE_LED_Pin GPIO_PIN_10 +#define CHARGE_LED_GPIO_Port GPIOG +#define RX2_LED_Pin GPIO_PIN_11 +#define RX2_LED_GPIO_Port GPIOG +#define RX1_LED_Pin GPIO_PIN_12 +#define RX1_LED_GPIO_Port GPIOG +#define TX2_LED_Pin GPIO_PIN_13 +#define TX2_LED_GPIO_Port GPIOG /* USER CODE BEGIN Private defines */ Index: ctrl/firmware/Main/CubeMX/Core/Src/gpio.c =================================================================== --- ctrl/firmware/Main/CubeMX/Core/Src/gpio.c (revision 48) +++ ctrl/firmware/Main/CubeMX/Core/Src/gpio.c (revision 50) @@ -58,14 +58,28 @@ /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOE, PWM_DISPLAY_LIGHT_Pin|RST_DISPLAY_Pin, GPIO_PIN_RESET); + HAL_GPIO_WritePin(GPIOE, TX1_LED_Pin|PWM_DISPLAY_LIGHT_Pin|RST_DISPLAY_Pin, GPIO_PIN_RESET); + + /*Configure GPIO pin Output Level */ + HAL_GPIO_WritePin(OUTPUT_ON_LED_GPIO_Port, OUTPUT_ON_LED_Pin, GPIO_PIN_RESET); + + /*Configure GPIO pin Output Level */ + HAL_GPIO_WritePin(GPIOG, ERROR_LED_Pin|CHARGE_LED_Pin|RX2_LED_Pin|RX1_LED_Pin + |TX2_LED_Pin, GPIO_PIN_RESET); /*Configure GPIO pins : PE2 PE3 PE4 PE5 - PE6 PE7 PE8 PE9 - PE10 PE0 PE1 */ + PE7 PE8 PE9 PE10 + PE0 PE1 */ GPIO_InitStruct.Pin = GPIO_PIN_2|GPIO_PIN_3|GPIO_PIN_4|GPIO_PIN_5 - |GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8|GPIO_PIN_9 - |GPIO_PIN_10|GPIO_PIN_0|GPIO_PIN_1; + |GPIO_PIN_7|GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10 + |GPIO_PIN_0|GPIO_PIN_1; GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; GPIO_InitStruct.Pull = GPIO_NOPULL; + HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); + + /*Configure GPIO pins : TX1_LED_Pin PWM_DISPLAY_LIGHT_Pin RST_DISPLAY_Pin */ + GPIO_InitStruct.Pin = TX1_LED_Pin|PWM_DISPLAY_LIGHT_Pin|RST_DISPLAY_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); @@ -120,32 +134,39 @@ /*Configure GPIO pins : PG0 PG1 PG2 PG3 PG4 PG5 PG6 PG7 - PG8 PG9 PG10 PG11 - PG12 PG13 PG14 PG15 */ + PG8 PG14 PG15 */ GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3 |GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7 - |GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11 - |GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15; + |GPIO_PIN_8|GPIO_PIN_14|GPIO_PIN_15; GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; GPIO_InitStruct.Pull = GPIO_NOPULL; HAL_GPIO_Init(GPIOG, &GPIO_InitStruct); - /*Configure GPIO pins : PWM_DISPLAY_LIGHT_Pin RST_DISPLAY_Pin */ - GPIO_InitStruct.Pin = PWM_DISPLAY_LIGHT_Pin|RST_DISPLAY_Pin; + /*Configure GPIO pins : PD8 PD9 PD10 PD11 + PD12 PD13 PD14 PD15 + PD0 PD1 PD2 PD3 + PD4 PD5 PD6 */ + GPIO_InitStruct.Pin = GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11 + |GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15 + |GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3 + |GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6; + GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; + GPIO_InitStruct.Pull = GPIO_NOPULL; + HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); + + /*Configure GPIO pin : OUTPUT_ON_LED_Pin */ + GPIO_InitStruct.Pin = OUTPUT_ON_LED_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; - HAL_GPIO_Init(GPIOE, &GPIO_InitStruct); + HAL_GPIO_Init(OUTPUT_ON_LED_GPIO_Port, &GPIO_InitStruct); - /*Configure GPIO pins : PD8 PD9 PD10 PD11 - PD12 PD13 PD14 PD15 - PD0 PD1 PD2 PD3 - PD4 PD5 PD6 PD7 */ - GPIO_InitStruct.Pin = GPIO_PIN_8|GPIO_PIN_9|GPIO_PIN_10|GPIO_PIN_11 - |GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14|GPIO_PIN_15 - |GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3 - |GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7; - GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; + /*Configure GPIO pins : ERROR_LED_Pin CHARGE_LED_Pin RX2_LED_Pin RX1_LED_Pin + TX2_LED_Pin */ + GPIO_InitStruct.Pin = ERROR_LED_Pin|CHARGE_LED_Pin|RX2_LED_Pin|RX1_LED_Pin + |TX2_LED_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; - HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + HAL_GPIO_Init(GPIOG, &GPIO_InitStruct); } Index: ctrl/firmware/Main/CubeMX/Core/Src/main.c =================================================================== --- ctrl/firmware/Main/CubeMX/Core/Src/main.c (revision 48) +++ ctrl/firmware/Main/CubeMX/Core/Src/main.c (revision 50) @@ -116,237 +116,8 @@ /* USER CODE BEGIN 2 */ - 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); - - SPI_WriteComm(0x11); - HAL_Delay(120); - - SPI_WriteComm(0xFF); - SPI_WriteData(0x77); - SPI_WriteData(0x01); - SPI_WriteData(0x00); - SPI_WriteData(0x00); - SPI_WriteData(0x10); - - - SPI_WriteComm(0xC0); - SPI_WriteData(0x4F); - SPI_WriteData(0x00); - - - SPI_WriteComm(0xC1); - SPI_WriteData(0x07); - SPI_WriteData(0x02); - - - SPI_WriteComm(0xC2); - SPI_WriteData(0x31); - SPI_WriteData(0x05); - - SPI_WriteComm(0xC3); - SPI_WriteData(0x80); - SPI_WriteData(0x02); - SPI_WriteData(0x07); - - SPI_WriteComm(0xCC); - SPI_WriteData(0x10); - - SPI_WriteComm(0xB0); - SPI_WriteData(0x00); - SPI_WriteData(0x0A); - SPI_WriteData(0x11); - SPI_WriteData(0x0C); - SPI_WriteData(0x10); - SPI_WriteData(0x05); - SPI_WriteData(0x00); - SPI_WriteData(0x08); - SPI_WriteData(0x08); - SPI_WriteData(0x1F); - SPI_WriteData(0x07); - SPI_WriteData(0x13); - SPI_WriteData(0x10); - SPI_WriteData(0xA9); - SPI_WriteData(0x30); - SPI_WriteData(0x18); - SPI_WriteComm(0xB1); - SPI_WriteData(0x00); - SPI_WriteData(0x0B); - SPI_WriteData(0x11); - SPI_WriteData(0x0D); - SPI_WriteData(0x0F); - SPI_WriteData(0x05); - SPI_WriteData(0x02); - SPI_WriteData(0x07); - SPI_WriteData(0x06); - SPI_WriteData(0x20); - SPI_WriteData(0x05); - SPI_WriteData(0x15); - SPI_WriteData(0x13); - SPI_WriteData(0xA9); - SPI_WriteData(0x30); - SPI_WriteData(0x18); - SPI_WriteComm(0xFF); - SPI_WriteData(0x77); - SPI_WriteData(0x01); - SPI_WriteData(0x00); - SPI_WriteData(0x00); - SPI_WriteData(0x11); - - - SPI_WriteComm(0xB0); - SPI_WriteData(0x53); - SPI_WriteComm(0xB1); - SPI_WriteData(0x60); - - SPI_WriteComm(0xB2); - SPI_WriteData(0x07); - - SPI_WriteComm(0xB3); - SPI_WriteData(0x80); - - SPI_WriteComm(0xB5); - SPI_WriteData(0x49); - - SPI_WriteComm(0xB7); - SPI_WriteData(0x85); - - SPI_WriteComm(0xB8); - SPI_WriteData(0x21); - - SPI_WriteComm(0xC1); - SPI_WriteData(0x78); - - SPI_WriteComm(0xC2); - SPI_WriteData(0x78); - HAL_Delay(100); - - SPI_WriteComm(0xE0); - SPI_WriteData(0x00); - SPI_WriteData(0x00); - SPI_WriteData(0x02); - - SPI_WriteComm(0xE1); - SPI_WriteData(0x03); - SPI_WriteData(0xA0); - SPI_WriteData(0x00); - SPI_WriteData(0x00); - SPI_WriteData(0x02); - SPI_WriteData(0xA0); - SPI_WriteData(0x00); - SPI_WriteData(0x00); - SPI_WriteData(0x00); - SPI_WriteData(0x33); - SPI_WriteData(0x33); - SPI_WriteComm(0xE2); - SPI_WriteData(0x22); - SPI_WriteData(0x22); - SPI_WriteData(0x33); - SPI_WriteData(0x33); - SPI_WriteData(0x88); - SPI_WriteData(0xA0); - SPI_WriteData(0x00); - SPI_WriteData(0x00); - SPI_WriteData(0x87); - SPI_WriteData(0xA0); - SPI_WriteData(0x00); - SPI_WriteData(0x00); - - - SPI_WriteComm(0xE3); - SPI_WriteData(0x00); - SPI_WriteData(0x00); - SPI_WriteData(0x22); - SPI_WriteData(0x22); - - SPI_WriteComm(0xE4); - SPI_WriteData(0x44); - SPI_WriteData(0x44); - - SPI_WriteComm(0xE5); - SPI_WriteData(0x04); - SPI_WriteData(0x84); - SPI_WriteData(0xA0); - SPI_WriteData(0xA0); - SPI_WriteData(0x06); - SPI_WriteData(0x86); - SPI_WriteData(0xA0); - SPI_WriteData(0xA0); - SPI_WriteData(0x08); - SPI_WriteData(0x88); - SPI_WriteData(0xA0); - SPI_WriteData(0xA0); - SPI_WriteData(0x0A); - SPI_WriteData(0x8A); - SPI_WriteData(0xA0); - SPI_WriteData(0xA0); - - SPI_WriteComm(0xE6); - SPI_WriteData(0x00); - SPI_WriteData(0x00); - SPI_WriteData(0x22); - SPI_WriteData(0x22); - - SPI_WriteComm(0xE7); - SPI_WriteData(0x44); - SPI_WriteData(0x44); - - SPI_WriteComm(0xE8); - SPI_WriteData(0x03); - SPI_WriteData(0x83); - SPI_WriteData(0xA0); - SPI_WriteData(0xA0); - SPI_WriteData(0x05); - SPI_WriteData(0x85); - SPI_WriteData(0xA0); - SPI_WriteData(0xA0); - SPI_WriteData(0x07); - SPI_WriteData(0x87); - SPI_WriteData(0xA0); - SPI_WriteData(0xA0); - SPI_WriteData(0x09); - SPI_WriteData(0x89); - SPI_WriteData(0xA0); - SPI_WriteData(0xA0); - - SPI_WriteComm(0xEB); - SPI_WriteData(0x00); - SPI_WriteData(0x01); - SPI_WriteData(0xE4); - SPI_WriteData(0xE4); - SPI_WriteData(0x88); - SPI_WriteData(0x00); - SPI_WriteData(0x40); - - SPI_WriteComm(0xEC); - SPI_WriteData(0x3C); - SPI_WriteData(0x01); - - SPI_WriteComm(0xED); - SPI_WriteData(0xAB); - SPI_WriteData(0x89); - SPI_WriteData(0x76); - SPI_WriteData(0x54); - SPI_WriteData(0x02); - SPI_WriteData(0xFF); - SPI_WriteData(0xFF); - SPI_WriteData(0xFF); - SPI_WriteData(0xFF); - SPI_WriteData(0xFF); - SPI_WriteData(0xFF); - SPI_WriteData(0x20); - SPI_WriteData(0x45); - SPI_WriteData(0x67); - SPI_WriteData(0x98); - SPI_WriteData(0xBA); - - - SPI_WriteComm(0x3A); - SPI_WriteData(0x66); - - SPI_WriteComm(0x36); - SPI_WriteData(0x00); - - HAL_Delay(100); - SPI_WriteComm(0x29); + //HAL_GPIO_WritePin(PWM_DISPLAY_LIGHT_GPIO_Port, PWM_DISPLAY_LIGHT_Pin, GPIO_PIN_SET); + //HAL_GPIO_WritePin(TX1_LED_GPIO_Port, TX1_LED_Pin, GPIO_PIN_SET); + //HAL_GPIO_WritePin(RX1_LED_GPIO_Port, RX1_LED_Pin, GPIO_PIN_SET); + //HAL_GPIO_WritePin(OUTPUT_ON_LED_GPIO_Port, OUTPUT_ON_LED_Pin, GPIO_PIN_RESET); @@ -434,5 +205,7 @@ uint16_t data[1]; - data[0] = (uint16_t)cmd_data_toSend | ((uint16_t)isCmd << (sizeof(uint16_t) * 8)); + data[0] = (uint16_t)isCmd << 8U; + data[0] |= (uint16_t)cmd_data_toSend; + HAL_SPI_Transmit(&hspi4, (const uint8_t*)data, 1, 1000); Index: ctrl/firmware/Main/CubeMX/Core/Src/spi.c =================================================================== --- ctrl/firmware/Main/CubeMX/Core/Src/spi.c (revision 48) +++ ctrl/firmware/Main/CubeMX/Core/Src/spi.c (revision 50) @@ -41,10 +41,10 @@ hspi4.Instance = SPI4; hspi4.Init.Mode = SPI_MODE_MASTER; - hspi4.Init.Direction = SPI_DIRECTION_2LINES_TXONLY; + hspi4.Init.Direction = SPI_DIRECTION_1LINE; hspi4.Init.DataSize = SPI_DATASIZE_9BIT; hspi4.Init.CLKPolarity = SPI_POLARITY_LOW; hspi4.Init.CLKPhase = SPI_PHASE_1EDGE; hspi4.Init.NSS = SPI_NSS_HARD_OUTPUT; - hspi4.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2; + hspi4.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_4; hspi4.Init.FirstBit = SPI_FIRSTBIT_MSB; hspi4.Init.TIMode = SPI_TIMODE_DISABLE; Index: ctrl/firmware/Main/CubeMX/charger.ioc =================================================================== --- ctrl/firmware/Main/CubeMX/charger.ioc (revision 48) +++ ctrl/firmware/Main/CubeMX/charger.ioc (revision 50) @@ -46,19 +46,26 @@ Mcu.Name=STM32H723ZETx Mcu.Package=LQFP144 -Mcu.Pin0=PC14-OSC32_IN -Mcu.Pin1=PC15-OSC32_OUT -Mcu.Pin10=PA14(JTCK/SWCLK) -Mcu.Pin11=VP_RTC_VS_RTC_Activate -Mcu.Pin12=VP_SYS_VS_Systick -Mcu.Pin13=VP_MEMORYMAP_VS_MEMORYMAP -Mcu.Pin2=PH0-OSC_IN -Mcu.Pin3=PH1-OSC_OUT -Mcu.Pin4=PE11 -Mcu.Pin5=PE12 -Mcu.Pin6=PE13 -Mcu.Pin7=PE14 -Mcu.Pin8=PE15 -Mcu.Pin9=PA13(JTMS/SWDIO) -Mcu.PinsNb=14 +Mcu.Pin0=PE6 +Mcu.Pin1=PC14-OSC32_IN +Mcu.Pin10=PA13(JTMS/SWDIO) +Mcu.Pin11=PA14(JTCK/SWCLK) +Mcu.Pin12=PD7 +Mcu.Pin13=PG9 +Mcu.Pin14=PG10 +Mcu.Pin15=PG11 +Mcu.Pin16=PG12 +Mcu.Pin17=PG13 +Mcu.Pin18=VP_RTC_VS_RTC_Activate +Mcu.Pin19=VP_SYS_VS_Systick +Mcu.Pin2=PC15-OSC32_OUT +Mcu.Pin20=VP_MEMORYMAP_VS_MEMORYMAP +Mcu.Pin3=PH0-OSC_IN +Mcu.Pin4=PH1-OSC_OUT +Mcu.Pin5=PE11 +Mcu.Pin6=PE12 +Mcu.Pin7=PE13 +Mcu.Pin8=PE14 +Mcu.Pin9=PE15 +Mcu.PinsNb=21 Mcu.ThirdPartyNb=0 Mcu.UserConstants= @@ -87,4 +94,8 @@ PC15-OSC32_OUT.Mode=LSE-External-Oscillator PC15-OSC32_OUT.Signal=RCC_OSC32_OUT +PD7.GPIOParameters=GPIO_Label +PD7.GPIO_Label=OUTPUT_ON_LED +PD7.Locked=true +PD7.Signal=GPIO_Output PE11.GPIOParameters=GPIO_Label PE11.GPIO_Label=SPI4_NSS_DISPLAY @@ -95,5 +106,5 @@ PE12.GPIO_Label=SPI4_SCK_DISPLAY PE12.Locked=true -PE12.Mode=TX_Only_Simplex_Unidirect_Master +PE12.Mode=Simplex_Bidirectional_Master PE12.Signal=SPI4_SCK PE13.GPIOParameters=GPIO_Label @@ -104,5 +115,5 @@ PE14.GPIO_Label=SPI4_MOSI_DISPLAY PE14.Locked=true -PE14.Mode=TX_Only_Simplex_Unidirect_Master +PE14.Mode=Simplex_Bidirectional_Master PE14.Signal=SPI4_MOSI PE15.GPIOParameters=PinState,GPIO_Label @@ -111,4 +122,28 @@ PE15.PinState=GPIO_PIN_RESET PE15.Signal=GPIO_Output +PE6.GPIOParameters=GPIO_Label +PE6.GPIO_Label=TX1_LED +PE6.Locked=true +PE6.Signal=GPIO_Output +PG10.GPIOParameters=GPIO_Label +PG10.GPIO_Label=CHARGE_LED +PG10.Locked=true +PG10.Signal=GPIO_Output +PG11.GPIOParameters=GPIO_Label +PG11.GPIO_Label=RX2_LED +PG11.Locked=true +PG11.Signal=GPIO_Output +PG12.GPIOParameters=GPIO_Label +PG12.GPIO_Label=RX1_LED +PG12.Locked=true +PG12.Signal=GPIO_Output +PG13.GPIOParameters=GPIO_Label +PG13.GPIO_Label=TX2_LED +PG13.Locked=true +PG13.Signal=GPIO_Output +PG9.GPIOParameters=GPIO_Label +PG9.GPIO_Label=ERROR_LED +PG9.Locked=true +PG9.Signal=GPIO_Output PH0-OSC_IN.Mode=HSE-External-Oscillator PH0-OSC_IN.Signal=RCC_OSC_IN @@ -224,8 +259,8 @@ RCC.VCOInput2Freq_Value=8333333.333333333 RCC.VCOInput3Freq_Value=1000000 -SPI4.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_2 -SPI4.CalculateBaudRate=15.151515 MBits/s +SPI4.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_4 +SPI4.CalculateBaudRate=7.575757 MBits/s SPI4.DataSize=SPI_DATASIZE_9BIT -SPI4.Direction=SPI_DIRECTION_2LINES_TXONLY +SPI4.Direction=SPI_DIRECTION_1LINE SPI4.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,VirtualNSS,DataSize,BaudRatePrescaler SPI4.Mode=SPI_MODE_MASTER