From b40825a75f95518a4f78826b43944690efe06615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Tue, 8 May 2018 14:41:49 +0200 Subject: [PATCH] renumbered neopixel to make more sense in decadic --- units/1wire/unit_1wire.c | 2 -- units/neopixel/unit_neopixel.c | 10 +++++----- units/usart/unit_usart.c | 10 ++++++++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/units/1wire/unit_1wire.c b/units/1wire/unit_1wire.c index 9314ec9..d74ed2c 100644 --- a/units/1wire/unit_1wire.c +++ b/units/1wire/unit_1wire.c @@ -93,8 +93,6 @@ enum PinCmd_ { CMD_READ = 11, // write multiple bytes using a ROM address CMD_POLL_FOR_1 = 20, - - CMD_TEST = 100, }; diff --git a/units/neopixel/unit_neopixel.c b/units/neopixel/unit_neopixel.c index 7d9dace..e8ccef8 100644 --- a/units/neopixel/unit_neopixel.c +++ b/units/neopixel/unit_neopixel.c @@ -11,11 +11,11 @@ enum PinCmd_ { CMD_CLEAR = 0, CMD_LOAD = 1, - CMD_LOAD_ZRGB = 0x08, // 0,0 - trail zero, bgr - CMD_LOAD_ZBGR = 0x09, // 0,1 - CMD_LOAD_RGBZ = 0x0A, // 1,0 - CMD_LOAD_BGRZ = 0x0B, // 1,1 - CMD_GET_LEN = 0x10, + CMD_LOAD_ZRGB = 4, // 0,0 - trail zero, bgr + CMD_LOAD_ZBGR = 5, // 0,1 + CMD_LOAD_RGBZ = 6, // 1,0 + CMD_LOAD_BGRZ = 7, // 1,1 + CMD_GET_LEN = 10, }; /** Handle a request message */ diff --git a/units/usart/unit_usart.c b/units/usart/unit_usart.c index e8aca86..3b3e829 100644 --- a/units/usart/unit_usart.c +++ b/units/usart/unit_usart.c @@ -102,13 +102,19 @@ static error_t UUSART_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, uint32_t len; const uint8_t *pld; switch (command) { - /** Write bytes to the USART. Payload consists of the data to send. Waits for completion. */ + /** + * Write bytes to the USART, without waiting for completion. + * May wait until there is space in the DMA buffer. + */ case CMD_WRITE: pld = pp_tail(pp, &len); TRY(UU_USART_Write(unit, pld, len)); return E_SUCCESS; - /** Write bytes to the USART, without waiting for completion. */ + /** + * Write bytes to the USART. Payload consists of the data to send. + * Waits for completion. + */ case CMD_WRITE_SYNC: pld = pp_tail(pp, &len); TRY(UU_USART_WriteSync(unit, pld, len));