diff --git a/Core/Src/clock.c b/Core/Src/clock.c index b4d96d4..664f136 100644 --- a/Core/Src/clock.c +++ b/Core/Src/clock.c @@ -10,7 +10,7 @@ // define LED marking 12:00 or 00:00 -#define LED_OFFSET 11 +#define LED_OFFSET 12 diff --git a/Core/Src/ds1307.c b/Core/Src/ds1307.c index 2bc472e..3dd6f98 100644 --- a/Core/Src/ds1307.c +++ b/Core/Src/ds1307.c @@ -80,13 +80,18 @@ uint8_t ds1307_read_user_RAM(uint8_t addr, uint8_t * data, uint8_t len){ uint8_t ds1307_write_user_RAM(uint8_t addr, uint8_t * data, uint8_t len){ HAL_StatusTypeDef status = HAL_OK; + uint8_t buff[4] = {0}; + buff[0] = addr; for(uint8_t i = 0; i < len; i++){ - ds1307_write_byte(addr + i, *(data + i)); + buff[1+i] = *(data+i); } + // ds1307_write_byte(addr + i, *(data + i)); + HAL_I2C_Master_Transmit(&DS1307_HANDLER, DS1307_ADDRES << 1, buff, len + 1, DS1307_TIMEOUT); + return status; } diff --git a/Core/Src/myComms.c b/Core/Src/myComms.c index cb3130a..e89a257 100644 --- a/Core/Src/myComms.c +++ b/Core/Src/myComms.c @@ -17,9 +17,9 @@ #define NV_COLOUR_HOURS_ADDR 0x08 -#define NV_COLOUR_MINUTES_ADDR 0x09 -#define NV_COLOUR_SECONDS_ADDR 0x0A -#define NV_COLOUR_BACKGND_ADDR 0x0B +#define NV_COLOUR_MINUTES_ADDR 0x0B +#define NV_COLOUR_SECONDS_ADDR 0x0E +#define NV_COLOUR_BACKGND_ADDR 0x11 typedef struct { uint8_t cmdId; diff --git a/Core/Src/ws2812_effect.c b/Core/Src/ws2812_effect.c index 982a73f..64939f8 100644 --- a/Core/Src/ws2812_effect.c +++ b/Core/Src/ws2812_effect.c @@ -12,9 +12,9 @@ #include "ds1307.h" #define NV_COLOUR_HOURS_ADDR 0x08 -#define NV_COLOUR_MINUTES_ADDR 0x09 -#define NV_COLOUR_SECONDS_ADDR 0x0A -#define NV_COLOUR_BACKGND_ADDR 0x0B +#define NV_COLOUR_MINUTES_ADDR 0x0B +#define NV_COLOUR_SECONDS_ADDR 0x0E +#define NV_COLOUR_BACKGND_ADDR 0x11 typedef struct {