Modularization, stage 1
This commit is contained in:
@@ -0,0 +1,173 @@
|
||||
//
|
||||
// Created by MightyPork on 2018/02/03.
|
||||
//
|
||||
|
||||
#include "platform.h"
|
||||
#include "unit_base.h"
|
||||
#include "unit_dout.h"
|
||||
|
||||
#define DOUT_INTERNAL
|
||||
|
||||
#include "_dout_internal.h"
|
||||
|
||||
static void clear_pulse_by_mask(struct priv *priv, uint16_t spread)
|
||||
{
|
||||
assert_param(priv);
|
||||
|
||||
for (int i = 0; i < 16; i++) {
|
||||
if (spread & (1 << i)) {
|
||||
priv->msec_pulse_cnt[i] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
error_t UU_DOut_Write(Unit *unit, uint16_t packed)
|
||||
{
|
||||
CHECK_TYPE(unit, &UNIT_DOUT);
|
||||
|
||||
struct priv *priv = unit->data;
|
||||
uint16_t mask = priv->pins;
|
||||
uint16_t spread = pinmask_spread(packed, mask);
|
||||
clear_pulse_by_mask(priv, spread);
|
||||
|
||||
uint16_t set = spread;
|
||||
uint16_t reset = ((~spread) & mask);
|
||||
priv->port->BSRR = set | (reset << 16);
|
||||
return E_SUCCESS;
|
||||
}
|
||||
|
||||
error_t UU_DOut_Set(Unit *unit, uint16_t packed)
|
||||
{
|
||||
CHECK_TYPE(unit, &UNIT_DOUT);
|
||||
|
||||
struct priv *priv = unit->data;
|
||||
uint16_t mask = priv->pins;
|
||||
uint16_t spread = pinmask_spread(packed, mask);
|
||||
clear_pulse_by_mask(priv, spread);
|
||||
|
||||
priv->port->BSRR = spread;
|
||||
return E_SUCCESS;
|
||||
}
|
||||
|
||||
error_t UU_DOut_Clear(Unit *unit, uint16_t packed)
|
||||
{
|
||||
CHECK_TYPE(unit, &UNIT_DOUT);
|
||||
|
||||
struct priv *priv = unit->data;
|
||||
uint16_t mask = priv->pins;
|
||||
uint16_t spread = pinmask_spread(packed, mask);
|
||||
clear_pulse_by_mask(priv, spread);
|
||||
|
||||
priv->port->BSRR = (spread << 16);
|
||||
return E_SUCCESS;
|
||||
}
|
||||
|
||||
error_t UU_DOut_Toggle(Unit *unit, uint16_t packed)
|
||||
{
|
||||
CHECK_TYPE(unit, &UNIT_DOUT);
|
||||
|
||||
struct priv *priv = unit->data;
|
||||
uint16_t mask = priv->pins;
|
||||
uint16_t spread = pinmask_spread(packed, mask);
|
||||
clear_pulse_by_mask(priv, spread);
|
||||
|
||||
uint16_t flipped = (uint16_t) (~priv->port->ODR) & mask;
|
||||
uint16_t set = flipped & spread;
|
||||
uint16_t reset = ((~flipped) & mask) & spread;
|
||||
priv->port->BSRR = set | (reset << 16);
|
||||
return E_SUCCESS;
|
||||
}
|
||||
|
||||
error_t UU_DOut_GetPinCount(Unit *unit, uint8_t *count)
|
||||
{
|
||||
CHECK_TYPE(unit, &UNIT_DOUT);
|
||||
struct priv *priv = unit->data;
|
||||
|
||||
uint32_t packed = pinmask_pack(0xFFFF, priv->pins);
|
||||
*count = (uint8_t) (32 - __CLZ(packed));
|
||||
return E_SUCCESS;
|
||||
}
|
||||
|
||||
error_t UU_DOut_Pulse(Unit *unit, uint16_t packed, bool polarity, bool is_usec, uint16_t count)
|
||||
{
|
||||
CHECK_TYPE(unit, &UNIT_DOUT);
|
||||
struct priv *priv = unit->data;
|
||||
assert_param(priv);
|
||||
|
||||
uint16_t mask = priv->pins;
|
||||
uint16_t spread = pinmask_spread(packed, mask);
|
||||
clear_pulse_by_mask(priv, spread);
|
||||
|
||||
vPortEnterCritical();
|
||||
|
||||
if (is_usec) {
|
||||
// we're gonna do this right here as a delay loop.
|
||||
if (count >= 1000) {
|
||||
// too long, fall back to msec
|
||||
count /= 1000;
|
||||
is_usec = false;
|
||||
}
|
||||
else {
|
||||
const uint32_t bsrr1 = spread << (polarity ? 0 : 16);
|
||||
const uint32_t bsrr0 = spread << (polarity ? 16 : 0);
|
||||
|
||||
const uint32_t start = PTIM_MicroDelayAlign();
|
||||
priv->port->BSRR = bsrr1;
|
||||
PTIM_MicroDelayAligned(count, start);
|
||||
priv->port->BSRR = bsrr0;
|
||||
}
|
||||
}
|
||||
|
||||
if (!is_usec) {
|
||||
// Load the counters
|
||||
for (int i = 0; i < 16; i++) {
|
||||
if (spread & (1 << i)) {
|
||||
priv->msec_pulse_cnt[i] = (uint16_t) (count + 1);
|
||||
}
|
||||
}
|
||||
|
||||
if (polarity) {
|
||||
priv->msec_pulse_scheduled_1 |= spread;
|
||||
} else {
|
||||
priv->msec_pulse_scheduled_0 |= spread;
|
||||
}
|
||||
|
||||
unit->_tick_cnt = 0;
|
||||
unit->tick_interval = 1;
|
||||
}
|
||||
|
||||
vPortExitCritical();
|
||||
|
||||
return E_SUCCESS;
|
||||
}
|
||||
|
||||
void DOut_Tick(Unit *unit)
|
||||
{
|
||||
struct priv *priv = unit->data;
|
||||
|
||||
uint16_t odr = (uint16_t) priv->port->ODR;
|
||||
int live_cnt = 0;
|
||||
for (int i = 0; i < 16; i++) {
|
||||
if (priv->msec_pulse_scheduled_1 & (1<<i)) {
|
||||
odr |= (1<<i);
|
||||
} else if (priv->msec_pulse_scheduled_0 & (1<<i)) {
|
||||
odr &= ~(1<<i);
|
||||
}
|
||||
|
||||
if (priv->msec_pulse_cnt[i] > 0) {
|
||||
live_cnt++;
|
||||
priv->msec_pulse_cnt[i]--;
|
||||
if (priv->msec_pulse_cnt[i] == 0) {
|
||||
odr ^= 1 << i;
|
||||
}
|
||||
}
|
||||
}
|
||||
priv->port->ODR = odr;
|
||||
priv->msec_pulse_scheduled_1 = 0;
|
||||
priv->msec_pulse_scheduled_0 = 0;
|
||||
|
||||
if (live_cnt == 0) {
|
||||
unit->_tick_cnt = 0;
|
||||
unit->tick_interval = 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
//
|
||||
// Created by MightyPork on 2018/02/03.
|
||||
//
|
||||
|
||||
#include "platform.h"
|
||||
#include "unit_base.h"
|
||||
|
||||
#define DOUT_INTERNAL
|
||||
#include "_dout_internal.h"
|
||||
|
||||
/** Allocate data structure and set defaults */
|
||||
error_t DOut_preInit(Unit *unit)
|
||||
{
|
||||
struct priv *priv = unit->data = calloc_ck(1, sizeof(struct priv));
|
||||
if (priv == NULL) return E_OUT_OF_MEM;
|
||||
|
||||
// some defaults
|
||||
priv->port_name = 'A';
|
||||
priv->pins = 0x0001;
|
||||
priv->open_drain = 0x0000;
|
||||
priv->initial = 0x0000;
|
||||
|
||||
return E_SUCCESS;
|
||||
}
|
||||
|
||||
/** Finalize unit set-up */
|
||||
error_t DOut_init(Unit *unit)
|
||||
{
|
||||
bool suc = true;
|
||||
struct priv *priv = unit->data;
|
||||
|
||||
priv->initial &= priv->pins;
|
||||
priv->open_drain &= priv->pins;
|
||||
|
||||
// --- Parse config ---
|
||||
priv->port = hw_port2periph(priv->port_name, &suc);
|
||||
if (!suc) return E_BAD_CONFIG;
|
||||
|
||||
// Claim all needed pins
|
||||
TRY(rsc_claim_gpios(unit, priv->port_name, priv->pins));
|
||||
|
||||
for (int i = 0; i < 16; i++) {
|
||||
if (priv->pins & (1 << i)) {
|
||||
uint32_t ll_pin = hw_pin2ll((uint8_t) i, &suc);
|
||||
|
||||
// --- Init hardware ---
|
||||
LL_GPIO_SetPinMode(priv->port, ll_pin, LL_GPIO_MODE_OUTPUT);
|
||||
LL_GPIO_SetPinOutputType(priv->port, ll_pin,
|
||||
(priv->open_drain & (1 << i)) ? LL_GPIO_OUTPUT_OPENDRAIN : LL_GPIO_OUTPUT_PUSHPULL);
|
||||
LL_GPIO_SetPinSpeed(priv->port, ll_pin, LL_GPIO_SPEED_FREQ_HIGH);
|
||||
}
|
||||
}
|
||||
|
||||
// Set the initial state
|
||||
priv->port->ODR &= ~priv->pins;
|
||||
priv->port->ODR |= priv->initial;
|
||||
|
||||
return E_SUCCESS;
|
||||
}
|
||||
|
||||
/** Tear down the unit */
|
||||
void DOut_deInit(Unit *unit)
|
||||
{
|
||||
// pins are de-inited during teardown
|
||||
|
||||
// Release all resources
|
||||
rsc_teardown(unit);
|
||||
|
||||
// Free memory
|
||||
free_ck(unit->data);
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
//
|
||||
// Created by MightyPork on 2018/02/03.
|
||||
//
|
||||
|
||||
#ifndef GEX_F072_DOUT_INTERNAL_H
|
||||
#define GEX_F072_DOUT_INTERNAL_H
|
||||
|
||||
#ifndef DOUT_INTERNAL
|
||||
#error bad include!
|
||||
#endif
|
||||
|
||||
#include "unit_base.h"
|
||||
|
||||
/** Private data structure */
|
||||
struct priv {
|
||||
char port_name;
|
||||
uint16_t pins; // pin mask
|
||||
uint16_t initial; // initial pin states
|
||||
uint16_t open_drain; // open drain pins
|
||||
|
||||
GPIO_TypeDef *port;
|
||||
uint16_t msec_pulse_cnt[16];
|
||||
uint16_t msec_pulse_scheduled_1;
|
||||
uint16_t msec_pulse_scheduled_0;
|
||||
};
|
||||
|
||||
/** Allocate data structure and set defaults */
|
||||
error_t DOut_preInit(Unit *unit);
|
||||
|
||||
/** Load from a binary buffer stored in Flash */
|
||||
void DOut_loadBinary(Unit *unit, PayloadParser *pp);
|
||||
|
||||
/** Write to a binary buffer for storing in Flash */
|
||||
void DOut_writeBinary(Unit *unit, PayloadBuilder *pb);
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
/** Parse a key-value pair from the INI file */
|
||||
error_t DOut_loadIni(Unit *unit, const char *key, const char *value);
|
||||
|
||||
/** Generate INI file section for the unit */
|
||||
void DOut_writeIni(Unit *unit, IniWriter *iw);
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
/** Finalize unit set-up */
|
||||
error_t DOut_init(Unit *unit);
|
||||
|
||||
/** Tear down the unit */
|
||||
void DOut_deInit(Unit *unit);
|
||||
|
||||
void DOut_Tick(Unit *unit);
|
||||
|
||||
#endif //GEX_F072_DOUT_INTERNAL_H
|
||||
@@ -0,0 +1,82 @@
|
||||
//
|
||||
// Created by MightyPork on 2018/02/03.
|
||||
//
|
||||
|
||||
#include "platform.h"
|
||||
#include "unit_base.h"
|
||||
|
||||
#define DOUT_INTERNAL
|
||||
#include "_dout_internal.h"
|
||||
|
||||
/** Load from a binary buffer stored in Flash */
|
||||
void DOut_loadBinary(Unit *unit, PayloadParser *pp)
|
||||
{
|
||||
struct priv *priv = unit->data;
|
||||
|
||||
uint8_t version = pp_u8(pp);
|
||||
(void)version;
|
||||
|
||||
priv->port_name = pp_char(pp);
|
||||
priv->pins = pp_u16(pp);
|
||||
priv->initial = pp_u16(pp);
|
||||
priv->open_drain = pp_u16(pp);
|
||||
}
|
||||
|
||||
/** Write to a binary buffer for storing in Flash */
|
||||
void DOut_writeBinary(Unit *unit, PayloadBuilder *pb)
|
||||
{
|
||||
struct priv *priv = unit->data;
|
||||
|
||||
pb_u8(pb, 0); // version
|
||||
|
||||
pb_char(pb, priv->port_name);
|
||||
pb_u16(pb, priv->pins);
|
||||
pb_u16(pb, priv->initial);
|
||||
pb_u16(pb, priv->open_drain);
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
/** Parse a key-value pair from the INI file */
|
||||
error_t DOut_loadIni(Unit *unit, const char *key, const char *value)
|
||||
{
|
||||
bool suc = true;
|
||||
struct priv *priv = unit->data;
|
||||
|
||||
if (streq(key, "port")) {
|
||||
suc = cfg_port_parse(value, &priv->port_name);
|
||||
}
|
||||
else if (streq(key, "pins")) {
|
||||
priv->pins = cfg_pinmask_parse(value, &suc);
|
||||
}
|
||||
else if (streq(key, "initial")) {
|
||||
priv->initial = cfg_pinmask_parse(value, &suc);
|
||||
}
|
||||
else if (streq(key, "open-drain")) {
|
||||
priv->open_drain = cfg_pinmask_parse(value, &suc);
|
||||
}
|
||||
else {
|
||||
return E_BAD_KEY;
|
||||
}
|
||||
|
||||
if (!suc) return E_BAD_VALUE;
|
||||
return E_SUCCESS;
|
||||
}
|
||||
|
||||
/** Generate INI file section for the unit */
|
||||
void DOut_writeIni(Unit *unit, IniWriter *iw)
|
||||
{
|
||||
struct priv *priv = unit->data;
|
||||
|
||||
iw_comment(iw, "Port name");
|
||||
iw_entry(iw, "port", "%c", priv->port_name);
|
||||
|
||||
iw_comment(iw, "Pins (comma separated, supports ranges)");
|
||||
iw_entry_s(iw, "pins", cfg_pinmask_encode(priv->pins, unit_tmp512, 0));
|
||||
|
||||
iw_comment(iw, "Initially high pins");
|
||||
iw_entry_s(iw, "initial", cfg_pinmask_encode(priv->initial, unit_tmp512, 0));
|
||||
|
||||
iw_comment(iw, "Open-drain pins");
|
||||
iw_entry_s(iw, "open-drain", cfg_pinmask_encode(priv->open_drain, unit_tmp512, 0));
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
//
|
||||
// Created by MightyPork on 2017/11/25.
|
||||
//
|
||||
|
||||
#include "unit_base.h"
|
||||
#include "unit_dout.h"
|
||||
|
||||
#define DOUT_INTERNAL
|
||||
#include "_dout_internal.h"
|
||||
|
||||
enum PinCmd_ {
|
||||
CMD_WRITE = 0,
|
||||
CMD_SET = 1,
|
||||
CMD_CLEAR = 2,
|
||||
CMD_TOGGLE = 3,
|
||||
CMD_PULSE = 4,
|
||||
};
|
||||
|
||||
/** Handle a request message */
|
||||
static error_t DOut_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, PayloadParser *pp)
|
||||
{
|
||||
uint16_t packed = pp_u16(pp);
|
||||
|
||||
switch (command) {
|
||||
case CMD_WRITE:
|
||||
return UU_DOut_Write(unit, packed);
|
||||
|
||||
case CMD_SET:
|
||||
return UU_DOut_Set(unit, packed);
|
||||
|
||||
case CMD_CLEAR:
|
||||
return UU_DOut_Clear(unit, packed);
|
||||
|
||||
case CMD_TOGGLE:
|
||||
return UU_DOut_Toggle(unit, packed);
|
||||
|
||||
case CMD_PULSE:;
|
||||
bool polarity = pp_bool(pp);
|
||||
bool is_usec = pp_bool(pp);
|
||||
uint16_t count = pp_u16(pp);
|
||||
return UU_DOut_Pulse(unit, packed, polarity, is_usec, count);
|
||||
|
||||
default:
|
||||
return E_UNKNOWN_COMMAND;
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
/** Unit template */
|
||||
const UnitDriver UNIT_DOUT = {
|
||||
.name = "DO",
|
||||
.description = "Digital output",
|
||||
// Settings
|
||||
.preInit = DOut_preInit,
|
||||
.cfgLoadBinary = DOut_loadBinary,
|
||||
.cfgWriteBinary = DOut_writeBinary,
|
||||
.cfgLoadIni = DOut_loadIni,
|
||||
.cfgWriteIni = DOut_writeIni,
|
||||
// Init
|
||||
.init = DOut_init,
|
||||
.deInit = DOut_deInit,
|
||||
// Function
|
||||
.handleRequest = DOut_handleRequest,
|
||||
.updateTick = DOut_Tick,
|
||||
};
|
||||
@@ -0,0 +1,71 @@
|
||||
//
|
||||
// Created by MightyPork on 2017/11/25.
|
||||
//
|
||||
// Digital output unit; single or multiple pin write access on one port (A-F)
|
||||
//
|
||||
|
||||
#ifndef U_DOUT_H
|
||||
#define U_DOUT_H
|
||||
|
||||
#include "unit.h"
|
||||
|
||||
extern const UnitDriver UNIT_DOUT;
|
||||
|
||||
/**
|
||||
* Write pins (e.g. writing 0b10 if configured pins are PA5 and PA0 sets PA5=1,PA0=0)
|
||||
*
|
||||
* @param unit
|
||||
* @param packed - packed pin states (aligned to right)
|
||||
* @return success
|
||||
*/
|
||||
error_t UU_DOut_Write(Unit *unit, uint16_t packed);
|
||||
|
||||
/**
|
||||
* Set pins (clear none)
|
||||
*
|
||||
* @param unit
|
||||
* @param packed - packed pins, 1 if pin should be set
|
||||
* @return success
|
||||
*/
|
||||
error_t UU_DOut_Set(Unit *unit, uint16_t packed);
|
||||
|
||||
/**
|
||||
* Clear multiple pins
|
||||
*
|
||||
* @param unit
|
||||
* @param packed - packed pins, 1 if pin should be cleared
|
||||
* @return
|
||||
*/
|
||||
error_t UU_DOut_Clear(Unit *unit, uint16_t packed);
|
||||
|
||||
/**
|
||||
* Toggle pins
|
||||
*
|
||||
* @param unit
|
||||
* @param packed - packed pins, 1 if pin should be toggled
|
||||
* @return
|
||||
*/
|
||||
error_t UU_DOut_Toggle(Unit *unit, uint16_t packed);
|
||||
|
||||
/**
|
||||
* Get number of configured pins
|
||||
*
|
||||
* @param unit
|
||||
* @param count output, written with 0-16
|
||||
* @return success
|
||||
*/
|
||||
error_t UU_DOut_GetPinCount(Unit *unit, uint8_t *count);
|
||||
|
||||
/**
|
||||
* Send a pulse
|
||||
*
|
||||
* @param unit
|
||||
* @param packed - pins to pulse
|
||||
* @param polarity - pulse active level
|
||||
* @param is_usec - use usec precision (for < 1 ms)
|
||||
* @param count - number of units (msec or usec)
|
||||
* @return success
|
||||
*/
|
||||
error_t UU_DOut_Pulse(Unit *unit, uint16_t packed, bool polarity, bool is_usec, uint16_t count);
|
||||
|
||||
#endif //U_DOUT_H
|
||||
Reference in New Issue
Block a user