summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormicrobuilder <contact@microbuilder.eu>2017-12-22 11:47:15 +0100
committermicrobuilder <contact@microbuilder.eu>2017-12-22 11:47:15 +0100
commitb9e229f739e78d35898cede74d604cf01a5f9487 (patch)
treecd4b654dfaf044ba3b001f6a1d4e5314053b9fb1
parentace872bf113c099cdb162eb1016106ea705317d5 (diff)
Removed old code snippets
-rw-r--r--ports/nrf/common-hal/pulseio/PulseIn.c208
1 files changed, 0 insertions, 208 deletions
diff --git a/ports/nrf/common-hal/pulseio/PulseIn.c b/ports/nrf/common-hal/pulseio/PulseIn.c
index c343bffac..a6f1bf10d 100644
--- a/ports/nrf/common-hal/pulseio/PulseIn.c
+++ b/ports/nrf/common-hal/pulseio/PulseIn.c
@@ -85,211 +85,3 @@ uint16_t common_hal_pulseio_pulsein_get_len(pulseio_pulsein_obj_t* self) {
uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t* self, int16_t index) {
return 0xadaf;
}
-
-
-#if 0
-
-static pulseio_pulsein_obj_t *active_pulseins[EIC_NUMBER_OF_INTERRUPTS];
-static uint64_t last_ms[EIC_NUMBER_OF_INTERRUPTS];
-static uint16_t last_us[EIC_NUMBER_OF_INTERRUPTS];
-
-void pulsein_reset(void) {
- for (int i = 0; i < EIC_NUMBER_OF_INTERRUPTS; i++) {
- if (active_pulseins[i] != NULL) {
- extint_chan_disable_callback(i, EXTINT_CALLBACK_TYPE_DETECT);
- }
- active_pulseins[i] = NULL;
- last_ms[i] = 0;
- last_us[i] = 0;
- }
-}
-
-static void pulsein_set_config(pulseio_pulsein_obj_t* self, bool first_edge) {
- struct extint_chan_conf config;
- extint_chan_get_config_defaults(&config);
- config.gpio_pin = self->pin;
- config.gpio_pin_pull = EXTINT_PULL_NONE;
- config.filter_input_signal = true;
-
- if (!first_edge) {
- config.detection_criteria = EXTINT_DETECT_BOTH;
- } else if (self->idle_state) {
- config.detection_criteria = EXTINT_DETECT_FALLING;
- } else {
- config.detection_criteria = EXTINT_DETECT_RISING;
- }
- extint_chan_disable_callback(self->channel, EXTINT_CALLBACK_TYPE_DETECT);
- extint_chan_set_config(self->channel, &config);
- // Clear any interrupts that may have triggered without notifying the CPU.
- EIC->INTFLAG.reg |= (1UL << self->channel);
- extint_chan_enable_callback(self->channel, EXTINT_CALLBACK_TYPE_DETECT);
-}
-
-static void pulsein_callback(void) {
- // Grab the current time first.
- uint16_t current_us = tc_get_count_value(&ms_timer);
- // Add the overflow flag to account for tick interrupts that are blocked by
- // this interrupt.
- uint64_t current_ms = ticks_ms + TC5->COUNT16.INTFLAG.bit.OVF;
- pulseio_pulsein_obj_t* self = active_pulseins[extint_get_current_channel()];
- current_us = current_us * 1000 / self->ticks_per_ms;
- if (self->first_edge) {
- self->first_edge = false;
- pulsein_set_config(self, false);
- } else {
- uint32_t ms_diff = current_ms - last_ms[self->channel];
- uint16_t us_diff = current_us - last_us[self->channel];
- uint32_t total_diff = us_diff;
- if (last_us[self->channel] > current_us) {
- total_diff = 1000 + current_us - last_us[self->channel];
- if (ms_diff > 1) {
- total_diff += (ms_diff - 1) * 1000;
- }
- } else {
- total_diff += ms_diff * 1000;
- }
- uint16_t duration = 0xffff;
- if (total_diff < duration) {
- duration = total_diff;
- }
-
- uint16_t i = (self->start + self->len) % self->maxlen;
- self->buffer[i] = duration;
- if (self->len < self->maxlen) {
- self->len++;
- } else {
- self->start++;
- }
- }
- last_ms[self->channel] = current_ms;
- last_us[self->channel] = current_us;
-}
-
-void common_hal_pulseio_pulsein_construct(pulseio_pulsein_obj_t* self,
- const mcu_pin_obj_t* pin, uint16_t maxlen, bool idle_state) {
- if (!pin->has_extint) {
- mp_raise_RuntimeError("No hardware support on pin");
- }
- // TODO(tannewt): Switch to checking actual extint peripheral state when other
- // classes use extints.
- if (active_pulseins[pin->extint_channel] != NULL) {
- mp_raise_RuntimeError("EXTINT channel already in use");
- }
-
- self->buffer = (uint16_t *) gc_alloc(maxlen * sizeof(uint16_t), false);
- if (self->buffer == NULL) {
- mp_raise_msg_varg(&mp_type_MemoryError, "Failed to allocate RX buffer of %d bytes", maxlen * sizeof(uint16_t));
- }
- self->channel = pin->extint_channel;
- self->pin = pin->pin;
- self->maxlen = maxlen;
- self->idle_state = idle_state;
- self->start = 0;
- self->len = 0;
- self->first_edge = true;
- self->ticks_per_ms = (system_cpu_clock_get_hz() / 1000 - 1);
-
- active_pulseins[pin->extint_channel] = self;
-
- pulsein_set_config(self, true);
- extint_register_callback(
- pulsein_callback,
- self->channel,
- EXTINT_CALLBACK_TYPE_DETECT);
- extint_chan_enable_callback(self->channel, EXTINT_CALLBACK_TYPE_DETECT);
-}
-
-bool common_hal_pulseio_pulsein_deinited(pulseio_pulsein_obj_t* self) {
- return self->pin == NO_PIN;
-}
-
-void common_hal_pulseio_pulsein_deinit(pulseio_pulsein_obj_t* self) {
- if (common_hal_pulseio_pulsein_deinited(self)) {
- return;
- }
- extint_chan_disable_callback(self->channel, EXTINT_CALLBACK_TYPE_DETECT);
- active_pulseins[self->channel] = NULL;
- reset_pin(self->pin);
- self->pin = NO_PIN;
-}
-
-void common_hal_pulseio_pulsein_pause(pulseio_pulsein_obj_t* self) {
- extint_chan_disable_callback(self->channel, EXTINT_CALLBACK_TYPE_DETECT);
-}
-
-void common_hal_pulseio_pulsein_resume(pulseio_pulsein_obj_t* self,
- uint16_t trigger_duration) {
- // Send the trigger pulse.
- if (trigger_duration > 0) {
- struct port_config pin_conf;
- port_get_config_defaults(&pin_conf);
-
- pin_conf.direction = PORT_PIN_DIR_OUTPUT;
- pin_conf.input_pull = PORT_PIN_PULL_NONE;
- port_pin_set_config(self->pin, &pin_conf);
-
- // TODO(tannewt): delay_us isn't exactly correct so we adjust the value
- // here before calling it. Find out why its not exact and fix it instead
- // of hacking around it here.
- uint32_t adjusted_duration = trigger_duration;
- adjusted_duration *= 4;
- adjusted_duration /= 5;
-
- common_hal_mcu_disable_interrupts();
- port_pin_set_output_level(self->pin, !self->idle_state);
- common_hal_mcu_delay_us(adjusted_duration);
- port_pin_set_output_level(self->pin, self->idle_state);
- common_hal_mcu_enable_interrupts();
- }
-
- // Reconfigure the pin and make sure its set to detect the first edge.
- last_ms[self->channel] = 0;
- last_us[self->channel] = 0;
- self->first_edge = true;
- pulsein_set_config(self, true);
-}
-
-void common_hal_pulseio_pulsein_clear(pulseio_pulsein_obj_t* self) {
- common_hal_mcu_disable_interrupts();
- self->start = 0;
- self->len = 0;
- common_hal_mcu_enable_interrupts();
-}
-
-uint16_t common_hal_pulseio_pulsein_popleft(pulseio_pulsein_obj_t* self) {
- if (self->len == 0) {
- mp_raise_IndexError("pop from an empty PulseIn");
- }
- common_hal_mcu_disable_interrupts();
- uint16_t value = self->buffer[self->start];
- self->start = (self->start + 1) % self->maxlen;
- self->len--;
- common_hal_mcu_enable_interrupts();
-
- return value;
-}
-
-uint16_t common_hal_pulseio_pulsein_get_maxlen(pulseio_pulsein_obj_t* self) {
- return self->maxlen;
-}
-
-uint16_t common_hal_pulseio_pulsein_get_len(pulseio_pulsein_obj_t* self) {
- return self->len;
-}
-
-uint16_t common_hal_pulseio_pulsein_get_item(pulseio_pulsein_obj_t* self,
- int16_t index) {
- common_hal_mcu_disable_interrupts();
- if (index < 0) {
- index += self->len;
- }
- if (index < 0 || index >= self->len) {
- common_hal_mcu_enable_interrupts();
- mp_raise_IndexError("index out of range");
- }
- uint16_t value = self->buffer[(self->start + index) % self->maxlen];
- common_hal_mcu_enable_interrupts();
- return value;
-}
-
-#endif