Skip to content

Commit 6ff4e0e

Browse files
deshipudeshipu
committed
Add GamePadShift for handling shift-register-based buttons
1 parent 29615da commit 6ff4e0e

6 files changed

Lines changed: 119 additions & 17 deletions

File tree

‎shared-bindings/gamepad/GamePad.c‎

Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@
3535
#include "supervisor/shared/translate.h"
3636
#include "GamePad.h"
3737

38+
digitalio_digitalinout_obj_t *validate_pin(mp_obj_t obj) {
39+
if (!MP_OBJ_IS_TYPE(obj, &digitalio_digitalinout_type)) {
40+
mp_raise_TypeError(translate("expected a DigitalInOut"));
41+
}
42+
digitalio_digitalinout_obj_t *pin = MP_OBJ_TO_PTR(obj);
43+
raise_error_if_deinited(
44+
common_hal_digitalio_digitalinout_deinited(pin));
45+
return pin;
46+
}
3847

3948
//| .. currentmodule:: gamepad
4049
//|
@@ -100,19 +109,52 @@ STATIC mp_obj_t gamepad_make_new(const mp_obj_type_t *type, size_t n_args,
100109
mp_raise_TypeError(translate("too many arguments"));
101110
}
102111
for (size_t i = 0; i < n_args; ++i) {
103-
if (!MP_OBJ_IS_TYPE(args[i], &digitalio_digitalinout_type)) {
104-
mp_raise_TypeError(translate("expected a DigitalInOut"));
105-
}
106-
digitalio_digitalinout_obj_t *pin = MP_OBJ_TO_PTR(args[i]);
107-
raise_error_if_deinited(
108-
common_hal_digitalio_digitalinout_deinited(pin));
112+
validate_pin(args[i]);
113+
}
114+
if (!MP_STATE_VM(gamepad_singleton)) {
115+
gamepad_obj_t* gamepad_singleton = m_new_obj(gamepad_obj_t);
116+
gamepad_singleton->base.type = &gamepad_type;
117+
MP_STATE_VM(gamepad_singleton) = gc_make_long_lived(gamepad_singleton);
109118
}
119+
gamepad_init_pins(n_args, args);
120+
return MP_OBJ_FROM_PTR(MP_STATE_VM(gamepad_singleton));
121+
}
122+
123+
124+
//| .. class:: GamePadShift(data, clock, latch)
125+
//|
126+
//| Initializes button scanning routines.
127+
//|
128+
//| The ``data``, ``clock`` and ``latch`` parameters are ``DigitalInOut``
129+
//| objects connected to the shift register controlling the buttons.
130+
//|
131+
//| They button presses are accumulated, until the ``get_pressed`` method
132+
//| is called, at which point the button state is cleared, and the new
133+
//| button presses start to be recorded.
134+
//|
135+
STATIC mp_obj_t gamepadshift_make_new(const mp_obj_type_t *type, size_t n_args,
136+
const mp_obj_t *pos_args, mp_map_t *kw_args) {
137+
138+
enum { ARG_data, ARG_clock, ARG_latch };
139+
static const mp_arg_t allowed_args[] = {
140+
{ MP_QSTR_data, MP_ARG_REQUIRED | MP_ARG_OBJ },
141+
{ MP_QSTR_clock, MP_ARG_REQUIRED | MP_ARG_OBJ},
142+
{ MP_QSTR_latch, MP_ARG_REQUIRED | MP_ARG_OBJ},
143+
};
144+
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
145+
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args),
146+
allowed_args, args);
147+
148+
digitalio_digitalinout_obj_t *data_pin = validate_pin(args[ARG_data].u_obj);
149+
digitalio_digitalinout_obj_t *clock_pin = validate_pin(args[ARG_clock].u_obj);
150+
digitalio_digitalinout_obj_t *latch_pin = validate_pin(args[ARG_latch].u_obj);
151+
110152
if (!MP_STATE_VM(gamepad_singleton)) {
111153
gamepad_obj_t* gamepad_singleton = m_new_obj(gamepad_obj_t);
112154
gamepad_singleton->base.type = &gamepad_type;
113155
MP_STATE_VM(gamepad_singleton) = gc_make_long_lived(gamepad_singleton);
114156
}
115-
gamepad_init(n_args, args);
157+
gamepad_init_shift(data_pin, clock_pin, latch_pin);
116158
return MP_OBJ_FROM_PTR(MP_STATE_VM(gamepad_singleton));
117159
}
118160

@@ -158,3 +200,15 @@ const mp_obj_type_t gamepad_type = {
158200
.make_new = gamepad_make_new,
159201
.locals_dict = (mp_obj_dict_t*)&gamepad_locals_dict,
160202
};
203+
204+
STATIC const mp_rom_map_elem_t gamepadshift_locals_dict_table[] = {
205+
{ MP_OBJ_NEW_QSTR(MP_QSTR_get_pressed), MP_ROM_PTR(&gamepad_get_pressed_obj)},
206+
{ MP_OBJ_NEW_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&gamepad_deinit_obj)},
207+
};
208+
STATIC MP_DEFINE_CONST_DICT(gamepadshift_locals_dict, gamepadshift_locals_dict_table);
209+
const mp_obj_type_t gamepadshift_type = {
210+
{ &mp_type_type },
211+
.name = MP_QSTR_GamePadShift,
212+
.make_new = gamepadshift_make_new,
213+
.locals_dict = (mp_obj_dict_t*)&gamepadshift_locals_dict,
214+
};

‎shared-bindings/gamepad/GamePad.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@
2929
#define MICROPY_INCLUDED_SHARED_BINDINGS_GAMEPAD_GAMEPAD_H
3030

3131
extern const mp_obj_type_t gamepad_type;
32+
extern const mp_obj_type_t gamepadshift_type;
3233

3334
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_GAMEPAD_GAMEPAD_H

‎shared-bindings/gamepad/__init__.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
STATIC const mp_rom_map_elem_t gamepad_module_globals_table[] = {
4545
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_gamepad) },
4646
{ MP_OBJ_NEW_QSTR(MP_QSTR_GamePad), MP_ROM_PTR(&gamepad_type)},
47+
{ MP_OBJ_NEW_QSTR(MP_QSTR_GamePadShift), MP_ROM_PTR(&gamepadshift_type)},
4748
};
4849
STATIC MP_DEFINE_CONST_DICT(gamepad_module_globals,
4950
gamepad_module_globals_table);

‎shared-module/gamepad/GamePad.c‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "shared-bindings/util.h"
3636

3737

38-
void gamepad_init(size_t n_pins, const mp_obj_t* pins) {
38+
void gamepad_init_pins(size_t n_pins, const mp_obj_t* pins) {
3939
gamepad_obj_t* gamepad_singleton = MP_STATE_VM(gamepad_singleton);
4040
for (size_t i = 0; i < 8; ++i) {
4141
gamepad_singleton->pins[i] = NULL;
@@ -57,4 +57,23 @@ void gamepad_init(size_t n_pins, const mp_obj_t* pins) {
5757
gamepad_singleton->pins[i] = pin;
5858
}
5959
gamepad_singleton->last = 0;
60+
gamepad_singleton->kind = GAMEPAD_KIND_PINS;
61+
}
62+
63+
void gamepad_init_shift(digitalio_digitalinout_obj_t *data_pin,
64+
digitalio_digitalinout_obj_t *clock_pin,
65+
digitalio_digitalinout_obj_t *latch_pin) {
66+
gamepad_obj_t* gamepad_singleton = MP_STATE_VM(gamepad_singleton);
67+
68+
common_hal_digitalio_digitalinout_switch_to_input(data_pin, PULL_NONE);
69+
gamepad_singleton->pins[0] = data_pin;
70+
71+
common_hal_digitalio_digitalinout_switch_to_output(clock_pin, 0, DRIVE_MODE_PUSH_PULL);
72+
gamepad_singleton->pins[1] = clock_pin;
73+
74+
common_hal_digitalio_digitalinout_switch_to_output(clock_pin, 1, DRIVE_MODE_PUSH_PULL);
75+
gamepad_singleton->pins[2] = latch_pin;
76+
77+
gamepad_singleton->last = 0;
78+
gamepad_singleton->kind = GAMEPAD_KIND_PINS;
6079
}

‎shared-module/gamepad/GamePad.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,15 @@ typedef struct {
3737
volatile uint8_t last;
3838
volatile uint8_t pressed;
3939
uint8_t pulls;
40+
uint8_t kind;
4041
} gamepad_obj_t;
4142

42-
void gamepad_init(size_t n_pins, const mp_obj_t* pins);
43+
#define GAMEPAD_KIND_PINS 0
44+
#define GAMEPAD_KIND_SHIFT 1
45+
46+
void gamepad_init_pins(size_t n_pins, const mp_obj_t* pins);
47+
void gamepad_init_shift(digitalio_digitalinout_obj_t *data_pin,
48+
digitalio_digitalinout_obj_t *clock_pin,
49+
digitalio_digitalinout_obj_t *latch_pin);
4350

4451
#endif // MICROPY_INCLUDED_GAMEPAD_GAMEPAD_H

‎shared-module/gamepad/__init__.c‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,37 @@ void gamepad_tick(void) {
4040
}
4141
uint8_t gamepad_current = 0;
4242
uint8_t bit = 1;
43-
for (int i = 0; i < 8; ++i) {
44-
digitalio_digitalinout_obj_t* pin = gamepad_singleton->pins[i];
45-
if (!pin) {
46-
break;
43+
switch (gamepad_singleton->kind) {
44+
case GAMEPAD_KIND_PINS:
45+
for (int i = 0; i < 8; ++i) {
46+
digitalio_digitalinout_obj_t* pin = gamepad_singleton->pins[i];
47+
if (!pin) {
48+
break;
49+
}
50+
if (common_hal_digitalio_digitalinout_get_value(pin)) {
51+
gamepad_current |= bit;
52+
}
53+
bit <<= 1;
4754
}
48-
if (common_hal_digitalio_digitalinout_get_value(pin)) {
49-
gamepad_current |= bit;
55+
gamepad_current ^= gamepad_singleton->pulls;
56+
break;
57+
case GAMEPAD_KIND_SHIFT:
58+
bit = 1;
59+
digitalio_digitalinout_obj_t* data_pin = gamepad_singleton->pins[0];
60+
digitalio_digitalinout_obj_t* clock_pin = gamepad_singleton->pins[1];
61+
digitalio_digitalinout_obj_t* latch_pin = gamepad_singleton->pins[2];
62+
common_hal_digitalio_digitalinout_set_value(latch_pin, 0);
63+
for (int i = 0; i < 8; ++i) {
64+
common_hal_digitalio_digitalinout_set_value(clock_pin, 1);
65+
if (common_hal_digitalio_digitalinout_get_value(data_pin)) {
66+
gamepad_current |= bit;
67+
}
68+
bit <<= 1;
69+
common_hal_digitalio_digitalinout_set_value(clock_pin, 0);
5070
}
51-
bit <<= 1;
71+
common_hal_digitalio_digitalinout_set_value(latch_pin, 1);
72+
break;
5273
}
53-
gamepad_current ^= gamepad_singleton->pulls;
5474
gamepad_singleton->pressed |= gamepad_singleton->last & gamepad_current;
5575
gamepad_singleton->last = gamepad_current;
5676
}

0 commit comments

Comments
 (0)