summaryrefslogtreecommitdiff
path: root/shared-module
diff options
context:
space:
mode:
Diffstat (limited to 'shared-module')
-rw-r--r--shared-module/bitbangio/I2C.c15
-rw-r--r--shared-module/bitbangio/types.h1
-rw-r--r--shared-module/busio/I2C.c4
-rw-r--r--shared-module/gamepad/GamePad.c18
-rw-r--r--shared-module/gamepad/GamePad.h3
-rw-r--r--shared-module/gamepad/__init__.c15
6 files changed, 37 insertions, 19 deletions
diff --git a/shared-module/bitbangio/I2C.c b/shared-module/bitbangio/I2C.c
index 7eeda0e00..47529748a 100644
--- a/shared-module/bitbangio/I2C.c
+++ b/shared-module/bitbangio/I2C.c
@@ -25,16 +25,15 @@
*/
#include "shared-bindings/bitbangio/I2C.h"
-
#include "py/mperrno.h"
#include "py/obj.h"
+#include "py/runtime.h"
#include "common-hal/microcontroller/Pin.h"
#include "shared-bindings/microcontroller/__init__.h"
#include "shared-bindings/digitalio/DigitalInOut.h"
#include "shared-module/bitbangio/types.h"
-#define I2C_STRETCH_LIMIT 255
STATIC void delay(bitbangio_i2c_obj_t *self) {
// We need to use an accurate delay to get acceptable I2C
@@ -48,11 +47,16 @@ STATIC void scl_low(bitbangio_i2c_obj_t *self) {
STATIC void scl_release(bitbangio_i2c_obj_t *self) {
common_hal_digitalio_digitalinout_set_value(&self->scl, true);
+ uint32_t count = self->us_timeout;
delay(self);
// For clock stretching, wait for the SCL pin to be released, with timeout.
- for (int count = I2C_STRETCH_LIMIT; !common_hal_digitalio_digitalinout_get_value(&self->scl) && count; --count) {
+ for (; !common_hal_digitalio_digitalinout_get_value(&self->scl) && count; --count) {
common_hal_mcu_delay_us(1);
}
+ // raise exception on timeout
+ if (count == 0) {
+ mp_raise_msg(&mp_type_TimeoutError, "Clock stretch too long");
+ }
}
STATIC void sda_low(bitbangio_i2c_obj_t *self) {
@@ -142,7 +146,10 @@ STATIC bool read_byte(bitbangio_i2c_obj_t *self, uint8_t *val, bool ack) {
void shared_module_bitbangio_i2c_construct(bitbangio_i2c_obj_t *self,
const mcu_pin_obj_t * scl,
const mcu_pin_obj_t * sda,
- uint32_t frequency) {
+ uint32_t frequency,
+ uint32_t us_timeout) {
+
+ self->us_timeout = us_timeout;
self->us_delay = 500000 / frequency;
if (self->us_delay == 0) {
self->us_delay = 1;
diff --git a/shared-module/bitbangio/types.h b/shared-module/bitbangio/types.h
index dfe50f049..6d1723474 100644
--- a/shared-module/bitbangio/types.h
+++ b/shared-module/bitbangio/types.h
@@ -36,6 +36,7 @@ typedef struct {
digitalio_digitalinout_obj_t scl;
digitalio_digitalinout_obj_t sda;
uint32_t us_delay;
+ uint32_t us_timeout;
volatile bool locked;
} bitbangio_i2c_obj_t;
diff --git a/shared-module/busio/I2C.c b/shared-module/busio/I2C.c
index 68d6ea22a..06e1af10a 100644
--- a/shared-module/busio/I2C.c
+++ b/shared-module/busio/I2C.c
@@ -30,8 +30,8 @@
#include "py/nlr.h"
void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
- const mcu_pin_obj_t* scl, const mcu_pin_obj_t* sda, uint32_t freq) {
- shared_module_bitbangio_i2c_construct(&self->bitbang, scl, sda, freq);
+ const mcu_pin_obj_t* scl, const mcu_pin_obj_t* sda, uint32_t freq, uint32_t timeout) {
+ shared_module_bitbangio_i2c_construct(&self->bitbang, scl, sda, freq, timeout);
}
bool common_hal_busio_i2c_deinited(busio_i2c_obj_t *self) {
diff --git a/shared-module/gamepad/GamePad.c b/shared-module/gamepad/GamePad.c
index cd1df9b57..2c14fa02a 100644
--- a/shared-module/gamepad/GamePad.c
+++ b/shared-module/gamepad/GamePad.c
@@ -26,6 +26,7 @@
#include <stdbool.h>
+#include "py/mpstate.h"
#include "__init__.h"
#include "GamePad.h"
@@ -35,17 +36,24 @@
void gamepad_init(size_t n_pins, const mp_obj_t* pins) {
- for (size_t i=0; i<8; ++i) {
+ gamepad_obj_t* gamepad_singleton = MP_STATE_VM(gamepad_singleton);
+ for (size_t i = 0; i < 8; ++i) {
gamepad_singleton->pins[i] = NULL;
}
- for (size_t i=0; i<n_pins; ++i) {
+ gamepad_singleton->pulls = 0;
+ for (size_t i = 0; i < n_pins; ++i) {
digitalio_digitalinout_obj_t *pin = MP_OBJ_TO_PTR(pins[i]);
- raise_error_if_deinited(common_hal_digitalio_digitalinout_deinited(pin));
digitalio_direction_t direction = common_hal_digitalio_digitalinout_get_direction(pin);
- digitalio_pull_t pull = common_hal_digitalio_digitalinout_get_pull(pin);
- if (direction != DIRECTION_INPUT || pull == PULL_NONE) {
+ if (direction != DIRECTION_INPUT) {
common_hal_digitalio_digitalinout_switch_to_input(pin, PULL_UP);
}
+ digitalio_pull_t pull = common_hal_digitalio_digitalinout_get_pull(pin);
+ if (pull == PULL_NONE) {
+ common_hal_digitalio_digitalinout_set_pull(pin, PULL_UP);
+ }
+ if (pull != PULL_DOWN) {
+ gamepad_singleton->pulls |= 1 << i;
+ }
gamepad_singleton->pins[i] = pin;
}
gamepad_singleton->last = 0;
diff --git a/shared-module/gamepad/GamePad.h b/shared-module/gamepad/GamePad.h
index e5f709134..9fd5c9626 100644
--- a/shared-module/gamepad/GamePad.h
+++ b/shared-module/gamepad/GamePad.h
@@ -36,10 +36,9 @@ typedef struct {
digitalio_digitalinout_obj_t* pins[8];
volatile uint8_t last;
volatile uint8_t pressed;
+ uint8_t pulls;
} gamepad_obj_t;
-extern gamepad_obj_t* gamepad_singleton;
-
void gamepad_init(size_t n_pins, const mp_obj_t* pins);
#endif // MICROPY_INCLUDED_GAMEPAD_GAMEPAD_H
diff --git a/shared-module/gamepad/__init__.c b/shared-module/gamepad/__init__.c
index 591a2fa0a..8414ddfbe 100644
--- a/shared-module/gamepad/__init__.c
+++ b/shared-module/gamepad/__init__.c
@@ -26,6 +26,7 @@
#include <stdbool.h>
+#include "py/mpstate.h"
#include "__init__.h"
#include "GamePad.h"
@@ -33,25 +34,27 @@
void gamepad_tick(void) {
+ gamepad_obj_t* gamepad_singleton = MP_STATE_VM(gamepad_singleton);
if (!gamepad_singleton) {
return;
}
uint8_t gamepad_current = 0;
- for (int i=0; i<8; ++i) {
+ uint8_t bit = 1;
+ for (int i = 0; i < 8; ++i) {
digitalio_digitalinout_obj_t* pin = gamepad_singleton->pins[i];
if (!pin) {
break;
}
- digitalio_pull_t pull = common_hal_digitalio_digitalinout_get_pull(pin);
- bool value = common_hal_digitalio_digitalinout_get_value(pin);
- if ((pull == PULL_UP && !value) || (pull == PULL_DOWN && value)) {
- gamepad_current |= 1 << i;
+ if (common_hal_digitalio_digitalinout_get_value(pin)) {
+ gamepad_current |= bit;
}
+ bit <<= 1;
}
+ gamepad_current ^= gamepad_singleton->pulls;
gamepad_singleton->pressed |= gamepad_singleton->last & gamepad_current;
gamepad_singleton->last = gamepad_current;
}
void gamepad_reset(void) {
- gamepad_singleton = NULL;
+ MP_STATE_VM(gamepad_singleton) = NULL;
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-08-09 18:03:31 +0000