Cleanup after merge
This commit is contained in:
@@ -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++){
|
||||
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user