rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
Stephane D'Alu 2016-06-29 21:11:38 +02:00
parent b20bf874d0
commit a8b2364267
2 changed files with 68 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
os/hal/ports/NRF51/NRF51822/hal_qei_lld.c
View File

@ -28,7 +28,7 @@
/*===========================================================================*/ /*===========================================================================*/
/* Driver local definitions. */ /* To be moved in hal_qei */
/*===========================================================================*/ /*===========================================================================*/
static inline static inline
@ -84,35 +84,6 @@ bool qei_adjust_count(qeicnt_t *count, qeidelta_t *delta,
} }
} }
qeidelta_t qei_lld_adjust_count(QEIDriver *qeip, qeidelta_t delta) {
// Get boundaries
qeicnt_t min = QEI_COUNT_MIN;
qeicnt_t max = QEI_COUNT_MAX;
if (qeip->config->min != qeip->config->max) {
min = qeip->config->min;
max = qeip->config->max;
}
// Snapshot counter for later comparison
qeicnt_t count = qeip->count;
// Adjust counter value
bool overflowed = qei_adjust_count(&qeip->count, &delta,
min, max, qeip->config->overflow);
// Notify for value change
if ((qeip->count != count) && qeip->config->notify_cb)
qeip->config->notify_cb(qeip);
// Notify for overflow (passing the remaining delta)
if (overflowed && qeip->config->overflow_cb)
qeip->config->overflow_cb(qeip, delta);
// Remaining delta
return delta;
}
/** /**
* @brief Adjust the counter by delta. * @brief Adjust the counter by delta.
* *
@ -152,8 +123,29 @@ void qeiSetCount(QEIDriver *qeip, qeicnt_t value) {
} }
/*===========================================================================*/
/* Driver local definitions. */
/*===========================================================================*/
/*===========================================================================*/
/* Driver exported variables. */
/*===========================================================================*/
/**
* @brief QEID1 driver identifier.
*/
#if NRF51_QEI_USE_QDEC0 || defined(__DOXYGEN__)
QEIDriver QEID1;
#endif
/*===========================================================================*/
/* Driver local variables and types. */
/*===========================================================================*/
/*===========================================================================*/
/* Driver local functions. */
/*===========================================================================*/
/** /**
* @brief Common IRQ handler. * @brief Common IRQ handler.
@ -191,27 +183,6 @@ static void serve_interrupt(QEIDriver *qeip) {
} }
} }
/*===========================================================================*/
/* Driver exported variables. */
/*===========================================================================*/
/**
* @brief QEID1 driver identifier.
*/
#if NRF51_QEI_USE_QDEC0 || defined(__DOXYGEN__)
QEIDriver QEID1;
#endif
/*===========================================================================*/
/* Driver local variables and types. */
/*===========================================================================*/
/*===========================================================================*/
/* Driver local functions. */
/*===========================================================================*/
/*===========================================================================*/ /*===========================================================================*/
/* Driver interrupt handlers. */ /* Driver interrupt handlers. */
/*===========================================================================*/ /*===========================================================================*/
@ -265,7 +236,7 @@ void qei_lld_start(QEIDriver *qeip) {
palSetLineMode(cfg->phase_b, PAL_MODE_INPUT); palSetLineMode(cfg->phase_b, PAL_MODE_INPUT);
#if NRF51_QEI_USE_LED == TRUE #if NRF51_QEI_USE_LED == TRUE
if (cfg->led != PAL_NOLINE) { if (cfg->led != PAL_NOLINE) {
palSetLineMode(cfg->led, PAL_MODE_INPUT); palSetLineMode(cfg->led, PAL_MODE_INPUT);
} }
#endif #endif
@ -344,7 +315,7 @@ void qei_lld_stop(QEIDriver *qeip) {
palSetLineMode(cfg->phase_b, PAL_MODE_RESET); palSetLineMode(cfg->phase_b, PAL_MODE_RESET);
#if NRF51_QEI_USE_LED == TRUE #if NRF51_QEI_USE_LED == TRUE
if (cfg->led != PAL_NOLINE) { if (cfg->led != PAL_NOLINE) {
palSetLineMode(cfg->led, PAL_MODE_RESET); palSetLineMode(cfg->led, PAL_MODE_RESET);
} }
#endif #endif
} }
@ -378,6 +349,45 @@ void qei_lld_disable(QEIDriver *qeip) {
} }
/**
* @brief Adjust counter
*
* @param[in] qeip pointer to the @p QEIDriver object
* @param[in] delta value to use for adjustement
* @return remaining adjustement that were not applied
*
* @notapi
*/
qeidelta_t qei_lld_adjust_count(QEIDriver *qeip, qeidelta_t delta) {
// Get boundaries
qeicnt_t min = QEI_COUNT_MIN;
qeicnt_t max = QEI_COUNT_MAX;
if (qeip->config->min != qeip->config->max) {
min = qeip->config->min;
max = qeip->config->max;
}
// Snapshot counter for later comparison
qeicnt_t count = qeip->count;
// Adjust counter value
bool overflowed = qei_adjust_count(&qeip->count, &delta,
min, max, qeip->config->overflow);
// Notify for value change
if ((qeip->count != count) && qeip->config->notify_cb)
qeip->config->notify_cb(qeip);
// Notify for overflow (passing the remaining delta)
if (overflowed && qeip->config->overflow_cb)
qeip->config->overflow_cb(qeip, delta);
// Remaining delta
return delta;
}
#endif /* HAL_USE_QEI */ #endif /* HAL_USE_QEI */
/** @} */ /** @} */

5
os/hal/ports/NRF51/NRF51822/hal_qei_lld.h
View File

@ -354,10 +354,15 @@ extern "C" {
void qei_lld_stop(QEIDriver *qeip); void qei_lld_stop(QEIDriver *qeip);
void qei_lld_enable(QEIDriver *qeip); void qei_lld_enable(QEIDriver *qeip);
void qei_lld_disable(QEIDriver *qeip); void qei_lld_disable(QEIDriver *qeip);
qeidelta_t qei_lld_adjust_count(QEIDriver *qeip, qeidelta_t delta);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
/*===========================================================================*/
/* To be moved in hal_qei */
/*===========================================================================*/
void qeiSetCount(QEIDriver *qeip, qeicnt_t value); void qeiSetCount(QEIDriver *qeip, qeicnt_t value);
qeidelta_t qeiAdjust(QEIDriver *qeip, qeidelta_t delta); qeidelta_t qeiAdjust(QEIDriver *qeip, qeidelta_t delta);