From 297af6036ef28a8e1558b5ca0a2e6f689a7af474 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 1 Jan 2017 20:05:35 +0300 Subject: examples/hwapi: Use Signal for inverted LED on ESP-12. --- examples/hwapi/hwconfig_esp8266_esp12.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/hwapi') diff --git a/examples/hwapi/hwconfig_esp8266_esp12.py b/examples/hwapi/hwconfig_esp8266_esp12.py index e8cf2d12e..fb6d5fe90 100644 --- a/examples/hwapi/hwconfig_esp8266_esp12.py +++ b/examples/hwapi/hwconfig_esp8266_esp12.py @@ -1,5 +1,5 @@ -from machine import Pin +from machine import Pin, Signal # ESP12 module as used by many boards -# Blue LED on pin 2 -LED = Pin(2, Pin.OUT) +# Blue LED on pin 2, active low (inverted) +LED = Signal(Pin(2, Pin.OUT), inverted=True) -- cgit v1.2.3 From a5bed53738e8aedc3b4be39dc8f9dface6b0abbb Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 29 Jan 2017 19:09:33 +0300 Subject: examples/hwapi: Consistently use Signal class to define LEDs. --- examples/hwapi/hwconfig_dragonboard410c.py | 4 ++-- examples/hwapi/hwconfig_z_frdm_k64f.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/hwapi') diff --git a/examples/hwapi/hwconfig_dragonboard410c.py b/examples/hwapi/hwconfig_dragonboard410c.py index 8061d7b74..2db21165d 100644 --- a/examples/hwapi/hwconfig_dragonboard410c.py +++ b/examples/hwapi/hwconfig_dragonboard410c.py @@ -13,10 +13,10 @@ from machine import Pin # echo -n "gpio_keys" >/sys/class/input/input1/device/driver/unbind # User LED 1 on gpio21 -LED = Pin(21, Pin.OUT) +LED = Signal(Pin(21, Pin.OUT)) # User LED 2 on gpio120 -LED2 = Pin(120, Pin.OUT) +LED2 = Signal(Pin(120, Pin.OUT)) # Button S3 on gpio107 BUTTON = Pin(107, Pin.IN) diff --git a/examples/hwapi/hwconfig_z_frdm_k64f.py b/examples/hwapi/hwconfig_z_frdm_k64f.py index c45e3e756..583e8d7aa 100644 --- a/examples/hwapi/hwconfig_z_frdm_k64f.py +++ b/examples/hwapi/hwconfig_z_frdm_k64f.py @@ -2,4 +2,4 @@ from machine import Pin # Freescale/NXP FRDM-K64F board # Blue LED on port B, pin 21 -LED = Pin(("GPIO_1", 21), Pin.OUT) +LED = Signal(Pin(("GPIO_1", 21), Pin.OUT)) -- cgit v1.2.3 From a4a439caa3f352f8bbbb1d0c79923270561869d3 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 5 Feb 2017 18:01:42 +0300 Subject: examples/button_reaction: Update for time_pulse_us() no longer raising exc. --- examples/hwapi/button_reaction.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/hwapi') diff --git a/examples/hwapi/button_reaction.py b/examples/hwapi/button_reaction.py index 5e1890d5a..b72e813e4 100644 --- a/examples/hwapi/button_reaction.py +++ b/examples/hwapi/button_reaction.py @@ -11,9 +11,9 @@ Ready? Cliiiiick! """) while 1: - try: - delay = machine.time_pulse_us(BUTTON, 1, 10*1000*1000) - print("You are as slow as %d microseconds!" % delay) - except OSError: + delay = machine.time_pulse_us(BUTTON, 1, 10*1000*1000) + if delay < 0: print("Well, you're *really* slow") + else: + print("You are as slow as %d microseconds!" % delay) utime.sleep_ms(10) -- cgit v1.2.3 From c8febe631af902de0878c48820346fac87acecd4 Mon Sep 17 00:00:00 2001 From: Kai Fricke Date: Wed, 8 Feb 2017 20:33:54 +0100 Subject: examples/hwapi: Add hwconfig_pyboard.py for pyboard. --- examples/hwapi/hwconfig_pyboard.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 examples/hwapi/hwconfig_pyboard.py (limited to 'examples/hwapi') diff --git a/examples/hwapi/hwconfig_pyboard.py b/examples/hwapi/hwconfig_pyboard.py new file mode 100644 index 000000000..4db432491 --- /dev/null +++ b/examples/hwapi/hwconfig_pyboard.py @@ -0,0 +1,13 @@ +from machine import Pin, Signal + +# Red LED on pin LED_RED also kown as A13 +LED = Signal(Pin('LED_RED', Pin.OUT)) + +# Green LED on pin LED_GREEN also known as A14 +LED2 = Signal(Pin('LED_GREEN', Pin.OUT)) + +# Yellow LED on pin LED_YELLOW also known as A15 +LED3 = Signal(Pin('LED_YELLOW', Pin.OUT)) + +# Blue LED on pin LED_BLUE also known as B4 +LED4 = Signal(Pin('LED_BLUE', Pin.OUT)) -- cgit v1.2.3 From c66c39313026413472039d6dc0394e1903414713 Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 9 Feb 2017 15:21:57 +1100 Subject: examples/hwapi: Be sure to import Signal when it's used. --- examples/hwapi/hwconfig_dragonboard410c.py | 2 +- examples/hwapi/hwconfig_z_frdm_k64f.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/hwapi') diff --git a/examples/hwapi/hwconfig_dragonboard410c.py b/examples/hwapi/hwconfig_dragonboard410c.py index 2db21165d..eec358203 100644 --- a/examples/hwapi/hwconfig_dragonboard410c.py +++ b/examples/hwapi/hwconfig_dragonboard410c.py @@ -1,4 +1,4 @@ -from machine import Pin +from machine import Pin, Signal # 96Boards/Qualcomm DragonBoard 410c # diff --git a/examples/hwapi/hwconfig_z_frdm_k64f.py b/examples/hwapi/hwconfig_z_frdm_k64f.py index 583e8d7aa..6313e2ddb 100644 --- a/examples/hwapi/hwconfig_z_frdm_k64f.py +++ b/examples/hwapi/hwconfig_z_frdm_k64f.py @@ -1,4 +1,4 @@ -from machine import Pin +from machine import Pin, Signal # Freescale/NXP FRDM-K64F board # Blue LED on port B, pin 21 -- cgit v1.2.3 From dd00d0134bf4a15fe4f72dc8a157587052717c59 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 14 Feb 2017 13:11:49 +0300 Subject: examples/hwapi/soft_pwm: Use Signal on()/off() methods. Just one sample is updated with on()/off() for now, there should be remaining sample(s) showing .value() use (but more can be converted later, as long as 1 or so good samples of .value() remains). --- examples/hwapi/soft_pwm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/hwapi') diff --git a/examples/hwapi/soft_pwm.py b/examples/hwapi/soft_pwm.py index a9a556171..72291b0ec 100644 --- a/examples/hwapi/soft_pwm.py +++ b/examples/hwapi/soft_pwm.py @@ -14,10 +14,10 @@ def pwm_cycle(led, duty, cycles): duty_off = 20 - duty for i in range(cycles): if duty: - led.value(1) + led.on() utime.sleep_ms(duty) if duty_off: - led.value(0) + led.off() utime.sleep_ms(duty_off) -- cgit v1.2.3 From 61616e84ce41e1b1a0fad62704488d79b87cfbe2 Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 12 Apr 2017 13:00:40 +1000 Subject: extmod/machine_signal: Rename "inverted" arg to "invert", it's shorter. A shorter name takes less code size, less room in scripts and is faster to type at the REPL. Tests and HW-API examples are updated to reflect the change. --- examples/hwapi/hwconfig_esp8266_esp12.py | 2 +- extmod/machine_signal.c | 22 +++++++++++----------- tests/extmod/machine_signal.py | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'examples/hwapi') diff --git a/examples/hwapi/hwconfig_esp8266_esp12.py b/examples/hwapi/hwconfig_esp8266_esp12.py index fb6d5fe90..198a652d0 100644 --- a/examples/hwapi/hwconfig_esp8266_esp12.py +++ b/examples/hwapi/hwconfig_esp8266_esp12.py @@ -2,4 +2,4 @@ from machine import Pin, Signal # ESP12 module as used by many boards # Blue LED on pin 2, active low (inverted) -LED = Signal(Pin(2, Pin.OUT), inverted=True) +LED = Signal(Pin(2, Pin.OUT), invert=True) diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c index b10d90166..d08931296 100644 --- a/extmod/machine_signal.c +++ b/extmod/machine_signal.c @@ -39,12 +39,12 @@ typedef struct _machine_signal_t { mp_obj_base_t base; mp_obj_t pin; - bool inverted; + bool invert; } machine_signal_t; STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_obj_t pin = args[0]; - bool inverted = false; + bool invert = false; #if defined(MICROPY_PY_MACHINE_PIN_MAKE_NEW) mp_pin_p_t *pin_p = NULL; @@ -55,7 +55,7 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t } if (pin_p == NULL) { - // If first argument isn't a Pin-like object, we filter out "inverted" + // If first argument isn't a Pin-like object, we filter out "invert" // from keyword arguments and pass them all to the exported Pin // constructor to create one. mp_obj_t pin_args[n_args + n_kw * 2]; @@ -64,8 +64,8 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t mp_obj_t *dst = pin_args + n_args; mp_obj_t *sig_value = NULL; for (size_t cnt = n_kw; cnt; cnt--) { - if (*src == MP_OBJ_NEW_QSTR(MP_QSTR_inverted)) { - inverted = mp_obj_is_true(src[1]); + if (*src == MP_OBJ_NEW_QSTR(MP_QSTR_invert)) { + invert = mp_obj_is_true(src[1]); n_kw--; } else { *dst++ = *src; @@ -80,7 +80,7 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t src += 2; } - if (inverted && sig_value != NULL) { + if (invert && sig_value != NULL) { *sig_value = mp_obj_is_true(*sig_value) ? MP_OBJ_NEW_SMALL_INT(0) : MP_OBJ_NEW_SMALL_INT(1); } @@ -95,8 +95,8 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t { if (n_args == 1) { if (n_kw == 0) { - } else if (n_kw == 1 && args[1] == MP_OBJ_NEW_QSTR(MP_QSTR_inverted)) { - inverted = mp_obj_is_true(args[1]); + } else if (n_kw == 1 && args[1] == MP_OBJ_NEW_QSTR(MP_QSTR_invert)) { + invert = mp_obj_is_true(args[1]); } else { goto error; } @@ -109,7 +109,7 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t machine_signal_t *o = m_new_obj(machine_signal_t); o->base.type = type; o->pin = pin; - o->inverted = inverted; + o->invert = invert; return MP_OBJ_FROM_PTR(o); } @@ -119,10 +119,10 @@ STATIC mp_uint_t signal_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg switch (request) { case MP_PIN_READ: { - return mp_virtual_pin_read(self->pin) ^ self->inverted; + return mp_virtual_pin_read(self->pin) ^ self->invert; } case MP_PIN_WRITE: { - mp_virtual_pin_write(self->pin, arg ^ self->inverted); + mp_virtual_pin_write(self->pin, arg ^ self->invert); return 0; } } diff --git a/tests/extmod/machine_signal.py b/tests/extmod/machine_signal.py index 401533f23..96b8f43c7 100644 --- a/tests/extmod/machine_signal.py +++ b/tests/extmod/machine_signal.py @@ -33,7 +33,7 @@ print(p.value(), s.value()) # test inverted, and using on/off methods p = Pin() -s = machine.Signal(p, inverted=True) +s = machine.Signal(p, invert=True) s.off() print(p.value(), s.value()) s.on() -- cgit v1.2.3 From 11a962099ea8735227623443c62c0248b98e4805 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 27 Apr 2017 18:08:05 +0300 Subject: examples/hwapi: Add config for Zephyr port of 96Boards Carbon. --- examples/hwapi/hwconfig_z_96b_carbon.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 examples/hwapi/hwconfig_z_96b_carbon.py (limited to 'examples/hwapi') diff --git a/examples/hwapi/hwconfig_z_96b_carbon.py b/examples/hwapi/hwconfig_z_96b_carbon.py new file mode 100644 index 000000000..97fd57a07 --- /dev/null +++ b/examples/hwapi/hwconfig_z_96b_carbon.py @@ -0,0 +1,9 @@ +from machine import Signal + +# 96Boards Carbon board +# USR1 - User controlled led, connected to PD2 +# USR2 - User controlled led, connected to PA15 +# BT - Bluetooth indicator, connected to PB5. +# Note - 96b_carbon uses (at the time of writing) non-standard +# for Zephyr port device naming convention. +LED = Signal(("GPIOA", 15), Pin.OUT) -- cgit v1.2.3 From 5feeba889799834af0d504dcb5993be5905a9d63 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 12 May 2017 01:19:13 +0300 Subject: examples/hwapi/hwconfig*: Use inline Signal() args where possible. --- examples/hwapi/hwconfig_esp8266_esp12.py | 2 +- examples/hwapi/hwconfig_pyboard.py | 8 ++++---- examples/hwapi/hwconfig_z_frdm_k64f.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/hwapi') diff --git a/examples/hwapi/hwconfig_esp8266_esp12.py b/examples/hwapi/hwconfig_esp8266_esp12.py index 198a652d0..2e855ee3d 100644 --- a/examples/hwapi/hwconfig_esp8266_esp12.py +++ b/examples/hwapi/hwconfig_esp8266_esp12.py @@ -2,4 +2,4 @@ from machine import Pin, Signal # ESP12 module as used by many boards # Blue LED on pin 2, active low (inverted) -LED = Signal(Pin(2, Pin.OUT), invert=True) +LED = Signal(2, Pin.OUT, invert=True) diff --git a/examples/hwapi/hwconfig_pyboard.py b/examples/hwapi/hwconfig_pyboard.py index 4db432491..fb260033e 100644 --- a/examples/hwapi/hwconfig_pyboard.py +++ b/examples/hwapi/hwconfig_pyboard.py @@ -1,13 +1,13 @@ from machine import Pin, Signal # Red LED on pin LED_RED also kown as A13 -LED = Signal(Pin('LED_RED', Pin.OUT)) +LED = Signal('LED_RED', Pin.OUT) # Green LED on pin LED_GREEN also known as A14 -LED2 = Signal(Pin('LED_GREEN', Pin.OUT)) +LED2 = Signal('LED_GREEN', Pin.OUT) # Yellow LED on pin LED_YELLOW also known as A15 -LED3 = Signal(Pin('LED_YELLOW', Pin.OUT)) +LED3 = Signal('LED_YELLOW', Pin.OUT) # Blue LED on pin LED_BLUE also known as B4 -LED4 = Signal(Pin('LED_BLUE', Pin.OUT)) +LED4 = Signal('LED_BLUE', Pin.OUT) diff --git a/examples/hwapi/hwconfig_z_frdm_k64f.py b/examples/hwapi/hwconfig_z_frdm_k64f.py index 6313e2ddb..377c63878 100644 --- a/examples/hwapi/hwconfig_z_frdm_k64f.py +++ b/examples/hwapi/hwconfig_z_frdm_k64f.py @@ -2,4 +2,4 @@ from machine import Pin, Signal # Freescale/NXP FRDM-K64F board # Blue LED on port B, pin 21 -LED = Signal(Pin(("GPIO_1", 21), Pin.OUT)) +LED = Signal(("GPIO_1", 21), Pin.OUT) -- cgit v1.2.3 From 0af974b77754ea8bcdaab07527fe685b3fc11631 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 17 May 2017 00:42:26 +0300 Subject: examples/hwapi/soft_pwm2_uasyncio: Update for call_later_ms(). Following finalized naming in uasyncio. --- examples/hwapi/soft_pwm2_uasyncio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/hwapi') diff --git a/examples/hwapi/soft_pwm2_uasyncio.py b/examples/hwapi/soft_pwm2_uasyncio.py index abeb4b1bf..908ef2d8a 100644 --- a/examples/hwapi/soft_pwm2_uasyncio.py +++ b/examples/hwapi/soft_pwm2_uasyncio.py @@ -27,5 +27,5 @@ async def fade_in_out(LED): loop = uasyncio.get_event_loop() loop.create_task(fade_in_out(LED)) -loop.call_later_ms_(800, fade_in_out(LED2)) +loop.call_later_ms(800, fade_in_out(LED2)) loop.run_forever() -- cgit v1.2.3