gex/gex-core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rewrite all units and other logic to better use return values and added TRY() helper

Browse Source
This commit is contained in:
MightyPork
2018-01-04 11:50:05 +01:00
parent 465242a0f1
commit ab2dfe3a76
22 changed files with 369 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
units/neopixel/unit_neopixel.c
+75 -39
View File
@@ -43,7 +43,7 @@ static void Npx_writeBinary(Unit *unit, PayloadBuilder *pb)
// ------------------------------------------------------------------------
/** Parse a key-value pair from the INI file */
static bool Npx_loadIni(Unit *unit, const char *key, const char *value)
static error_t Npx_loadIni(Unit *unit, const char *key, const char *value)
{
bool suc = true;
struct priv *priv = unit->data;
@@ -55,10 +55,11 @@ static bool Npx_loadIni(Unit *unit, const char *key, const char *value)
priv->pixels = (uint16_t) avr_atoi(value);
}
else {
return false;
return E_BAD_KEY;
}
return suc;
if (!suc) return E_BAD_VALUE;
return E_SUCCESS;
}
/** Generate INI file section for the unit */
@@ -76,22 +77,22 @@ static void Npx_writeIni(Unit *unit, IniWriter *iw)
// ------------------------------------------------------------------------
/** Allocate data structure and set defaults */
static bool Npx_preInit(Unit *unit)
static error_t Npx_preInit(Unit *unit)
{
bool suc = true;
struct priv *priv = unit->data = calloc_ck(1, sizeof(struct priv), &suc);
CHECK_SUC();
if (!suc) return E_OUT_OF_MEM;
// some defaults
priv->pin_number = 0;
priv->port_name = 'A';
priv->pixels = 1;
return true;
return E_SUCCESS;
}
/** Finalize unit set-up */
static bool Npx_init(Unit *unit)
static error_t Npx_init(Unit *unit)
{
bool suc = true;
struct priv *priv = unit->data;
@@ -100,13 +101,10 @@ static bool Npx_init(Unit *unit)
priv->ll_pin = pin2ll(priv->pin_number, &suc);
priv->port = port2periph(priv->port_name, &suc);
Resource rsc = pin2resource(priv->port_name, priv->pin_number, &suc);
if (!suc) {
unit->status = E_BAD_CONFIG;
return false;
}
if (!suc) return E_BAD_CONFIG;
// --- Claim resources ---
if (!rsc_claim(unit, rsc)) return false;
TRY(rsc_claim(unit, rsc));
// --- Init hardware ---
LL_GPIO_SetPinMode(priv->port, priv->ll_pin, LL_GPIO_MODE_OUTPUT);
@@ -117,7 +115,7 @@ static bool Npx_init(Unit *unit)
ws2812_clear(priv->port, priv->ll_pin, priv->pixels);
return true;
return E_SUCCESS;
}
/** Tear down the unit */
@@ -140,6 +138,51 @@ static void Npx_deInit(Unit *unit)
// ------------------------------------------------------------------------
/* Clear the strip */
error_t UU_NEOPIXEL_Clear(Unit *unit)
{
struct priv *priv = unit->data;
ws2812_clear(priv->port, priv->ll_pin, priv->pixels);
return E_SUCCESS;
}
/* Load packed */
error_t UU_NEOPIXEL_Load(Unit *unit, const uint8_t *packed_rgb, uint32_t nbytes)
{
struct priv *priv = unit->data;
if (nbytes != 3*priv->pixels) return E_BAD_COUNT;
ws2812_load_raw(priv->port, priv->ll_pin, packed_rgb, priv->pixels);
return E_SUCCESS;
}
/* Load U32, LE or BE */
static error_t load_u32(Unit *unit, const uint8_t *bytes, uint32_t nbytes, bool bige)
{
struct priv *priv = unit->data;
if (nbytes != 4*priv->pixels) return E_BAD_COUNT;
ws2812_load_sparse(priv->port, priv->ll_pin, bytes, priv->pixels, bige);
return E_SUCCESS;
}
/* Load U32, LE */
inline error_t UU_NEOPIXEL_LoadU32LE(Unit *unit, const uint8_t *bytes, uint32_t nbytes)
{
return load_u32(unit, bytes, nbytes, false);
}
/* Load U32, BE */
inline error_t UU_NEOPIXEL_LoadU32BE(Unit *unit, const uint8_t *bytes, uint32_t nbytes)
{
return load_u32(unit, bytes, nbytes, true);
}
/* Get the pixel count */
inline uint16_t UU_NEOPIXEL_GetCount(Unit *unit)
{
struct priv *priv = unit->data;
return priv->pixels;
}
enum PinCmd_ {
CMD_CLEAR = 0,
CMD_LOAD = 1,
@@ -149,46 +192,39 @@ enum PinCmd_ {
};
/** Handle a request message */
static bool Npx_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, PayloadParser *pp)
static error_t Npx_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, PayloadParser *pp)
{
(void)pp;
struct priv *priv = unit->data;
uint32_t len;
const uint8_t *bytes;
switch (command) {
/** Clear the entire strip */
case CMD_CLEAR:
ws2812_clear(priv->port, priv->ll_pin, priv->pixels);
break;
return UU_NEOPIXEL_Clear(unit);
case CMD_LOAD:
if (pp_length(pp) != priv->pixels*3) goto bad_count;
ws2812_load_raw(priv->port, priv->ll_pin, pp->current, priv->pixels);
break;
/** Load packed RGB colors (length must match the strip size) */
case CMD_LOAD:;
bytes = pp_tail(pp, &len);
return UU_NEOPIXEL_Load(unit, bytes, len);
/** Load sparse (uint32_t) colors, 0x00RRGGBB, little endian. */
case CMD_LOAD_U32_LE:
if (pp_length(pp) != priv->pixels*4) goto bad_count;
ws2812_load_sparse(priv->port, priv->ll_pin, pp->current, priv->pixels, 0);
break;
bytes = pp_tail(pp, &len);
return UU_NEOPIXEL_LoadU32LE(unit, bytes, len);
/** Load sparse (uint32_t) colors, 0x00RRGGBB, big endian. */
case CMD_LOAD_U32_BE:
if (pp_length(pp) != priv->pixels*4) goto bad_count;
ws2812_load_sparse(priv->port, priv->ll_pin, pp->current, priv->pixels, 1);
break;
bytes = pp_tail(pp, &len);
return UU_NEOPIXEL_LoadU32BE(unit, bytes, len);
/** Get the Neopixel strip length */
case CMD_GET_LEN:
com_respond_u16(frame_id, priv->pixels);
break;
com_respond_u16(frame_id, UU_NEOPIXEL_GetCount(unit));
return E_SUCCESS;
default:
com_respond_bad_cmd(frame_id);
return false;
return E_UNKNOWN_COMMAND;
}
return true;
bad_count:
com_respond_err(frame_id, "BAD PIXEL COUNT");
return false;
}
// ------------------------------------------------------------------------
units/neopixel/unit_neopixel.h
+40
View File
@@ -9,4 +9,44 @@
extern const UnitDriver UNIT_NEOPIXEL;
/**
* Clear the Neopixel strip
*
* @param unit
* @return success
*/
error_t UU_NEOPIXEL_Clear(Unit *unit);
/**
* Load the strip with packed bytes R,G,B.
*
* @param unit
* @param packed_rgb - bytes to load
* @param nbytes - number of bytes, must be count*3
* @return success
*/
error_t UU_NEOPIXEL_Load(Unit *unit, const uint8_t *packed_rgb, uint32_t nbytes);
/**
* Load the strip with sparse (uint32_t) colors 0x00RRGGBB as little endian bytes
* (B, G, R, 0, ...)
*
* @param unit
* @param bytes - bytes to load
* @param nbytes - number of bytes, must be count*4
* @return success
*/
error_t UU_NEOPIXEL_LoadU32LE(Unit *unit, const uint8_t *bytes, uint32_t nbytes);
/**
* Load the strip with sparse (uint32_t) colors 0x00RRGGBB as big endian bytes
* (0, R, G, B, ...)
*
* @param unit
* @param bytes - bytes to load
* @param nbytes - number of bytes, must be count*4
* @return success
*/
error_t UU_NEOPIXEL_LoadU32BE(Unit *unit, const uint8_t *bytes, uint32_t nbytes);
#endif //U_NEOPIXEL_H
units/neopixel/ws2812.c
+2 -2
View File
@@ -28,7 +28,7 @@ void ws2812_byte(GPIO_TypeDef *port, uint32_t ll_pin, uint8_t b)
}
/** Set many RGBs from packed stream */
void ws2812_load_raw(GPIO_TypeDef *port, uint32_t ll_pin, uint8_t *rgbs, uint32_t count)
void ws2812_load_raw(GPIO_TypeDef *port, uint32_t ll_pin, const uint8_t *rgbs, uint32_t count)
{
vPortEnterCritical();
uint8_t b, g, r;
@@ -45,7 +45,7 @@ void ws2812_load_raw(GPIO_TypeDef *port, uint32_t ll_pin, uint8_t *rgbs, uint32_
}
/** Set many RGBs from uint32 stream */
void ws2812_load_sparse(GPIO_TypeDef *port, uint32_t ll_pin, uint8_t *rgbs, uint32_t count, bool bigendian)
void ws2812_load_sparse(GPIO_TypeDef *port, uint32_t ll_pin, const uint8_t *rgbs, uint32_t count, bool bigendian)
{
vPortEnterCritical();
uint8_t b, g, r;
units/neopixel/ws2812.h
+2 -2
View File
@@ -11,7 +11,7 @@
* @param rgbs - packed R,G,B, R,G,B, ... array
* @param count - number of pixels (triplets)
*/
void ws2812_load_raw(GPIO_TypeDef *port, uint32_t ll_pin, uint8_t *rgbs, uint32_t count);
void ws2812_load_raw(GPIO_TypeDef *port, uint32_t ll_pin, const uint8_t *rgbs, uint32_t count);
/**
* Load all pixels with BLACK (0,0,0)
@@ -30,6 +30,6 @@ void ws2812_clear(GPIO_TypeDef *port, uint32_t ll_pin, uint32_t count);
* @param count - number of pixels
* @param bigendian - big endian ordering
*/
void ws2812_load_sparse(GPIO_TypeDef *port, uint32_t ll_pin, uint8_t *rgbs, uint32_t count, bool bigendian);
void ws2812_load_sparse(GPIO_TypeDef *port, uint32_t ll_pin, const uint8_t *rgbs, uint32_t count, bool bigendian);
#endif //WS2812_H