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

Cleanup after merge

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

49
Core/Inc/ds1307.h
View File

@@ -67,31 +67,34 @@ typedef struct {
* @param[in] delay_: delay between each device scan * @param[in] delay_: delay between each device scan
* *
*/ */
void start_i2c_scan(I2C_HandleTypeDef *I2Chnd, uint32_t delay_); void start_i2c_scan(I2C_HandleTypeDef *I2Chnd, uint32_t delay_);
void ds1307_init(void); void ds1307_init(void);
ds1307_err_t ds1307_set_hour(uint8_t hour); ds1307_err_t ds1307_set_hour(uint8_t hour);
uint8_t ds1307_get_hour(void); uint8_t ds1307_get_hour(void);
ds1307_err_t ds1307_set_hour(uint8_t hour); ds1307_err_t ds1307_set_hour(uint8_t hour);
void ds1307_set_clock_halt(uint8_t halt); void ds1307_set_clock_halt(uint8_t halt);
uint8_t ds1307_get_clock_halt(void); uint8_t ds1307_get_clock_halt(void);
void ds1307_set_second(uint8_t second); void ds1307_set_second(uint8_t second);
uint8_t ds1307_get_second(void); uint8_t ds1307_get_second(void);
void ds1307_set_minutes(uint8_t minutes); void ds1307_set_minutes(uint8_t minutes);
uint8_t ds1307_get_minutes(void); uint8_t ds1307_get_minutes(void);
void ds1307_set_day(uint8_t day); void ds1307_set_day(uint8_t day);
ds1307_days_t ds1307_get_day(void); ds1307_days_t ds1307_get_day(void);
void ds1307_set_date(uint8_t date); void ds1307_set_date(uint8_t date);
uint8_t ds1307_get_date(void); uint8_t ds1307_get_date(void);
void ds1307_set_month(ds1307_months_t month); void ds1307_set_month(ds1307_months_t month);
ds1307_months_t ds1307_get_month(void); ds1307_months_t ds1307_get_month(void);
void ds1307_set_year(uint16_t year); void ds1307_set_year(uint16_t year);
uint16_t ds1307_get_year(void); uint16_t ds1307_get_year(void);
void ds1307_set_time_zone(int8_t hr, uint8_t min); 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_hour(void);
int8_t ds1307_get_time_zone_min(void); int8_t ds1307_get_time_zone_min(void);
void ds1307_update(ds1307_dev_t *ds1307_dev); 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_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); 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_ */ #endif /* DS1307_H_ */

2
Core/Src/ds1307.c
View File

@@ -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){ uint8_t ds1307_write_user_RAM(uint8_t addr, uint8_t * data, uint8_t len){
HAL_StatusTypeDef status = HAL_OK; HAL_StatusTypeDef status = HAL_OK;
uint8_t buff[4] = {0};
buff[0] = addr;
for(uint8_t i = 0; i < len; i++){ for(uint8_t i = 0; i < len; i++){

12
Core/Src/myComms.c
View File

@@ -32,7 +32,7 @@ typedef struct {
} uartMessage_s; } uartMessage_s;
static void cmd_readNV(uint32_t data); 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 nok[] = "NOK\n";
static uint8_t ok[] = "OK\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; HAL_StatusTypeDef status = HAL_ERROR;
@@ -179,7 +179,7 @@ void cmd_setColour_hour(uint32_t colour){
b b
}; };
cmd_writeNV(nv); cmd_writeNV((uint32_t) nv);
CDC_Transmit_FS(ok, sizeof(ok)); CDC_Transmit_FS(ok, sizeof(ok));
@@ -202,7 +202,7 @@ void cmd_setColour_minute(uint32_t colour){
b b
}; };
cmd_writeNV(nv); cmd_writeNV((uint32_t) nv);
CDC_Transmit_FS(ok, sizeof(ok)); CDC_Transmit_FS(ok, sizeof(ok));
@@ -225,7 +225,7 @@ void cmd_setColour_second(uint32_t colour){
b b
}; };
cmd_writeNV(nv); cmd_writeNV((uint32_t) nv);
CDC_Transmit_FS(ok, sizeof(ok)); CDC_Transmit_FS(ok, sizeof(ok));
@@ -248,7 +248,7 @@ void cmd_setColour_background(uint32_t colour){
b b
}; };
cmd_writeNV(nv); cmd_writeNV((uint32_t) nv);
CDC_Transmit_FS(ok, sizeof(ok)); CDC_Transmit_FS(ok, sizeof(ok));
} }