Ewaryst/RingClock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initilizing with NV values not working - mixed colours

Browse Source
This commit is contained in:
StefansE
2026-04-03 19:31:04 +02:00
parent ff3bc0ca71
commit ae5cafbd67
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Core/Src/main.c
View File

@@ -123,14 +123,15 @@ int main(void)
MX_USB_DEVICE_Init();
/* USER CODE BEGIN 2 */
HAL_TIM_Base_Start(&htim2);
ws_Effect_InitModule();
// RTC config
clock_InitModule();
// ds1307_config(0, 10, 19, THURSDAY, 26, MARCH, 2026, +1, 33);
ws_Effect_InitModule();
HAL_TIM_Base_Start(&htim2);
/* USER CODE END 2 */

18
Core/Src/myComms.c
View File

@@ -76,6 +76,24 @@ static void cmd_writeNV(uint32_t data){
status = ds1307_write_user_RAM(UART_RxBuf[1], &UART_RxBuf[2], 3);
switch(UART_RxBuf[1]){
case NV_COLOUR_HOURS_ADDR:
clock_setColourHours(UART_RxBuf[2], UART_RxBuf[3], UART_RxBuf[4]);
break;
case NV_COLOUR_MINUTES_ADDR:
clock_setColourMinutes(UART_RxBuf[2], UART_RxBuf[3], UART_RxBuf[4]);
break;
case NV_COLOUR_SECONDS_ADDR:
clock_setColourSeconds(UART_RxBuf[2], UART_RxBuf[3], UART_RxBuf[4]);
break;
case NV_COLOUR_BACKGND_ADDR:
clock_setColourBackground(UART_RxBuf[2], UART_RxBuf[3], UART_RxBuf[4]);
break;
default:
break;
}
if(HAL_OK == status){
CDC_Transmit_FS(ok, sizeof(ok));
}

10
Core/Src/ws2812_effect.c
View File

@@ -37,21 +37,29 @@ void ws_effect_setDisplayColoursNV(void){
colour_hours.g = rxBuf[1];
colour_hours.b = rxBuf[2];
HAL_Delay(5);
ds1307_read_user_RAM(NV_COLOUR_MINUTES_ADDR, rxBuf, 3);
colour_minutes.r = rxBuf[0];
colour_minutes.g = rxBuf[1];
colour_minutes.b = rxBuf[2];
HAL_Delay(5);
ds1307_read_user_RAM(NV_COLOUR_SECONDS_ADDR, rxBuf, 3);
colour_seconds.r = rxBuf[0];
colour_seconds.g = rxBuf[1];
colour_seconds.b = rxBuf[2];
HAL_Delay(5);
ds1307_read_user_RAM(NV_COLOUR_BACKGND_ADDR, rxBuf, 3);
colour_background.r = rxBuf[0];
colour_background.g = rxBuf[1];
colour_background.b = rxBuf[2];
HAL_Delay(5);
}
void clock_setColourHours(uint8_t r, uint8_t g, uint8_t b){
@@ -74,7 +82,7 @@ void clock_setColourSeconds(uint8_t r, uint8_t g, uint8_t b){
void ws_Effect_InitModule(void){
//ws_effect_setDisplayColoursNV();
ws2812_Init();
}