From e667a2dd3add982ffb4c5ed4c5b072cbfc4381c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Sun, 25 Mar 2018 18:08:28 +0200 Subject: [PATCH] fixed some wrongly named enum constants --- units/1wire/unit_1wire.c | 4 ++-- units/digital_out/unit_dout.c | 4 ++-- units/i2c/unit_i2c.c | 4 ++-- units/sipo/unit_sipo.c | 4 ++-- units/usart/unit_usart.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/units/1wire/unit_1wire.c b/units/1wire/unit_1wire.c index 2d8682c..9314ec9 100644 --- a/units/1wire/unit_1wire.c +++ b/units/1wire/unit_1wire.c @@ -89,7 +89,7 @@ enum PinCmd_ { CMD_SEARCH_CONTINUE = 3, // continue the previously started scan, retrieving more devices CMD_READ_ADDR = 4, // read the ROM code from a single device (for single-device bus) - CMD_QUERY = 10, // write multiple bytes using the SKIP_ROM command + CMD_WRITE = 10, // write multiple bytes using the SKIP_ROM command CMD_READ = 11, // write multiple bytes using a ROM address CMD_POLL_FOR_1 = 20, @@ -194,7 +194,7 @@ static error_t OW_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, Pay * addr:u64, rest:write_data * if addr is 0, use SKIP_ROM */ - case CMD_QUERY: + case CMD_WRITE: addr = pp_u64(pp); tail = pp_tail(pp, &remain); TRY(UU_1WIRE_Write(unit, addr, tail, remain)); diff --git a/units/digital_out/unit_dout.c b/units/digital_out/unit_dout.c index 6db11c0..4839546 100644 --- a/units/digital_out/unit_dout.c +++ b/units/digital_out/unit_dout.c @@ -9,7 +9,7 @@ #include "_dout_internal.h" enum PinCmd_ { - CMD_QUERY = 0, + CMD_WRITE = 0, CMD_SET = 1, CMD_CLEAR = 2, CMD_TOGGLE = 3, @@ -22,7 +22,7 @@ static error_t DOut_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, P uint16_t packed = pp_u16(pp); switch (command) { - case CMD_QUERY: + case CMD_WRITE: return UU_DOut_Write(unit, packed); case CMD_SET: diff --git a/units/i2c/unit_i2c.c b/units/i2c/unit_i2c.c index 9088cf3..d1d0402 100644 --- a/units/i2c/unit_i2c.c +++ b/units/i2c/unit_i2c.c @@ -12,7 +12,7 @@ #include "_i2c_internal.h" enum PinCmd_ { - CMD_QUERY = 0, + CMD_WRITE = 0, CMD_READ = 1, CMD_WRITE_REG = 2, CMD_READ_REG = 3, @@ -30,7 +30,7 @@ static error_t UI2C_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, P switch (command) { /** Write byte(s) - addr:u16, byte(s) */ - case CMD_QUERY: + case CMD_WRITE: addr = pp_u16(pp); const uint8_t *bb = pp_tail(pp, &len); diff --git a/units/sipo/unit_sipo.c b/units/sipo/unit_sipo.c index 5c57b47..d48cb1b 100644 --- a/units/sipo/unit_sipo.c +++ b/units/sipo/unit_sipo.c @@ -12,7 +12,7 @@ // ------------------------------------------------------------------------ enum SipoCmd_ { - CMD_QUERY = 0, + CMD_WRITE = 0, CMD_DIRECT_DATA = 1, CMD_DIRECT_SHIFT = 2, CMD_DIRECT_CLEAR = 3, @@ -23,7 +23,7 @@ enum SipoCmd_ { static error_t USIPO_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, PayloadParser *pp) { switch (command) { - case CMD_QUERY: + case CMD_WRITE: { uint32_t len; uint16_t terminal_packed = pp_u16(pp); diff --git a/units/usart/unit_usart.c b/units/usart/unit_usart.c index f8b8f0f..e8aca86 100644 --- a/units/usart/unit_usart.c +++ b/units/usart/unit_usart.c @@ -92,7 +92,7 @@ void UUSART_Tick(Unit *unit) } enum PinCmd_ { - CMD_QUERY = 0, + CMD_WRITE = 0, CMD_WRITE_SYNC = 1, }; @@ -103,7 +103,7 @@ static error_t UUSART_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, const uint8_t *pld; switch (command) { /** Write bytes to the USART. Payload consists of the data to send. Waits for completion. */ - case CMD_QUERY: + case CMD_WRITE: pld = pp_tail(pp, &len); TRY(UU_USART_Write(unit, pld, len)); return E_SUCCESS;