From ff3bc0ca716c19b67254167dd018cd79a5210ad6 Mon Sep 17 00:00:00 2001 From: StefansE Date: Fri, 3 Apr 2026 19:13:28 +0200 Subject: [PATCH] Cleanup after merge --- Core/Inc/ds1307.h | 49 ++++++++++++++++++++++++---------------------- Core/Src/ds1307.c | 2 -- Core/Src/myComms.c | 12 ++++++------ 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Core/Inc/ds1307.h b/Core/Inc/ds1307.h index d47caa1..1227d75 100644 --- a/Core/Inc/ds1307.h +++ b/Core/Inc/ds1307.h @@ -67,31 +67,34 @@ typedef struct { * @param[in] delay_: delay between each device scan * */ -void start_i2c_scan(I2C_HandleTypeDef *I2Chnd, uint32_t delay_); -void ds1307_init(void); -ds1307_err_t ds1307_set_hour(uint8_t hour); -uint8_t ds1307_get_hour(void); -ds1307_err_t ds1307_set_hour(uint8_t hour); -void ds1307_set_clock_halt(uint8_t halt); -uint8_t ds1307_get_clock_halt(void); -void ds1307_set_second(uint8_t second); -uint8_t ds1307_get_second(void); -void ds1307_set_minutes(uint8_t minutes); -uint8_t ds1307_get_minutes(void); -void ds1307_set_day(uint8_t day); -ds1307_days_t ds1307_get_day(void); -void ds1307_set_date(uint8_t date); -uint8_t ds1307_get_date(void); -void ds1307_set_month(ds1307_months_t month); +void start_i2c_scan(I2C_HandleTypeDef *I2Chnd, uint32_t delay_); +void ds1307_init(void); +ds1307_err_t ds1307_set_hour(uint8_t hour); +uint8_t ds1307_get_hour(void); +ds1307_err_t ds1307_set_hour(uint8_t hour); +void ds1307_set_clock_halt(uint8_t halt); +uint8_t ds1307_get_clock_halt(void); +void ds1307_set_second(uint8_t second); +uint8_t ds1307_get_second(void); +void ds1307_set_minutes(uint8_t minutes); +uint8_t ds1307_get_minutes(void); +void ds1307_set_day(uint8_t day); +ds1307_days_t ds1307_get_day(void); +void ds1307_set_date(uint8_t date); +uint8_t ds1307_get_date(void); +void ds1307_set_month(ds1307_months_t month); ds1307_months_t ds1307_get_month(void); -void ds1307_set_year(uint16_t year); -uint16_t ds1307_get_year(void); -void ds1307_set_time_zone(int8_t hr, uint8_t min); -int8_t ds1307_get_time_zone_hour(void); -int8_t ds1307_get_time_zone_min(void); -void ds1307_update(ds1307_dev_t *ds1307_dev); -void ds1307_config(uint8_t seconds, uint8_t minutes, uint8_t hours,ds1307_days_t day, uint8_t date, +void ds1307_set_year(uint16_t year); +uint16_t ds1307_get_year(void); +void ds1307_set_time_zone(int8_t hr, uint8_t min); +int8_t ds1307_get_time_zone_hour(void); +int8_t ds1307_get_time_zone_min(void); +void ds1307_update(ds1307_dev_t *ds1307_dev); +void ds1307_config(uint8_t seconds, uint8_t minutes, uint8_t hours,ds1307_days_t day, uint8_t date, ds1307_months_t month, uint16_t year, int8_t t_zone_hour, int8_t t_zone_min); +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); + #endif /* DS1307_H_ */ diff --git a/Core/Src/ds1307.c b/Core/Src/ds1307.c index 6e84651..207c6ef 100644 --- a/Core/Src/ds1307.c +++ b/Core/Src/ds1307.c @@ -80,8 +80,6 @@ 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++){ diff --git a/Core/Src/myComms.c b/Core/Src/myComms.c index 5143267..65a6e61 100644 --- a/Core/Src/myComms.c +++ b/Core/Src/myComms.c @@ -32,7 +32,7 @@ typedef struct { } uartMessage_s; static void cmd_readNV(uint32_t data); -static void cmd_writeNV(uint8_t data); +static void cmd_writeNV(uint32_t data); static uint8_t nok[] = "NOK\n"; static uint8_t ok[] = "OK\n"; @@ -70,7 +70,7 @@ static void cmd_readNV(uint32_t data){ } } -static void cmd_writeNV(uint8_t data){ +static void cmd_writeNV(uint32_t data){ HAL_StatusTypeDef status = HAL_ERROR; @@ -179,7 +179,7 @@ void cmd_setColour_hour(uint32_t colour){ b }; - cmd_writeNV(nv); + cmd_writeNV((uint32_t) nv); CDC_Transmit_FS(ok, sizeof(ok)); @@ -202,7 +202,7 @@ void cmd_setColour_minute(uint32_t colour){ b }; - cmd_writeNV(nv); + cmd_writeNV((uint32_t) nv); CDC_Transmit_FS(ok, sizeof(ok)); @@ -225,7 +225,7 @@ void cmd_setColour_second(uint32_t colour){ b }; - cmd_writeNV(nv); + cmd_writeNV((uint32_t) nv); CDC_Transmit_FS(ok, sizeof(ok)); @@ -248,7 +248,7 @@ void cmd_setColour_background(uint32_t colour){ b }; - cmd_writeNV(nv); + cmd_writeNV((uint32_t) nv); CDC_Transmit_FS(ok, sizeof(ok)); }