Merge pull request micropython#8723 from jepler/jpegdecoder-enhancements

Jpegdecoder enhancements

Author: dhalbert

extmod/modjson.c

@@ -188,7 +188,7 @@ STATIC mp_uint_t json_python_readinto(mp_obj_t obj, void *buf, mp_uint_t size, i
 }
 
 STATIC mp_obj_t _mod_json_load(mp_obj_t stream_obj, bool return_first_json) {
-    const mp_stream_p_t *stream_p = mp_proto_get(MP_QSTR_protocol_stream, stream_obj);
+    const mp_stream_p_t *stream_p = mp_proto_get(0, stream_obj);
     json_stream_t s;
     uint8_t character_buffer[CIRCUITPY_JSON_READ_CHUNK_SIZE];
     if (stream_p == NULL) {

locale/circuitpython.pot

@@ -212,6 +212,10 @@ msgstr ""
 msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
+#: shared-bindings/jpegio/JpegDecoder.c
+msgid "%q must be of type %q, %q, or %q, not %q"
+msgstr ""
+
 #: py/argcheck.c shared-module/synthio/__init__.c
 msgid "%q must be of type %q, not %q"
 msgstr ""
@@ -249,6 +253,10 @@ msgstr ""
 msgid "%q() takes %d positional arguments but %d were given"
 msgstr ""
 
+#: shared-module/jpegio/JpegDecoder.c
+msgid "%q() without %q()"
+msgstr ""
+
 #: shared-bindings/usb_hid/Device.c
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""

ports/espressif/bindings/espnow/ESPNow.c

@@ -332,7 +332,6 @@ STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt
 }
 
 STATIC const mp_stream_p_t espnow_stream_p = {
-    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
     .ioctl = espnow_stream_ioctl,
 };
 

ports/espressif/common-hal/rotaryio/IncrementalEncoder.c

@@ -35,15 +35,24 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode
     claim_pin(pin_a);
     claim_pin(pin_b);
 
+    // This configuration counts on all edges of the quadrature signal: Channel 0
+    // counts on rising and falling edges of channel A, with the direction set by the
+    // polarity of channel B. Channel 1 does likewise, counting edges of channel B according
+    // to the polarity of channel A. A little pencil work suffices to show that this
+    // counts correctly on all 8 correct quadrature state transitions.
+    //
+    // These routines also implicitly configure the weak internal pull-ups, as expected
+    // in CircuitPython.
+
     // Prepare configuration for the PCNT unit
     pcnt_config_t pcnt_config_channel_0 = {
         // Set PCNT input signal and control GPIOs
         .pulse_gpio_num = pin_a->number,
         .ctrl_gpio_num = pin_b->number,
         .channel = PCNT_CHANNEL_0,
         // What to do on the positive / negative edge of pulse input?
-        .pos_mode = PCNT_COUNT_DEC,      // Count up on the positive edge
-        .neg_mode = PCNT_COUNT_INC,      // Keep the counter value on the negative edge
+        .pos_mode = PCNT_COUNT_DEC,      // Count down on the positive edge
+        .neg_mode = PCNT_COUNT_INC,      // Count up on negative edge
         // What to do when control input is low or high?
         .lctrl_mode = PCNT_MODE_REVERSE, // Reverse counting direction if low
         .hctrl_mode = PCNT_MODE_KEEP,    // Keep the primary counter mode if high
@@ -61,8 +70,8 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode
         .ctrl_gpio_num = pin_a->number,
         .channel = PCNT_CHANNEL_1,
         // What to do on the positive / negative edge of pulse input?
-        .pos_mode = PCNT_COUNT_DEC,      // Count up on the positive edge
-        .neg_mode = PCNT_COUNT_INC,      // Keep the counter value on the negative edge
+        .pos_mode = PCNT_COUNT_DEC,      // Count down on the positive edge
+        .neg_mode = PCNT_COUNT_INC,      // Count up on negative edge
         // What to do when control input is low or high?
         .lctrl_mode = PCNT_MODE_KEEP,        // Keep the primary counter mode if low
         .hctrl_mode = PCNT_MODE_REVERSE,     // Reverse counting direction if high
@@ -88,6 +97,7 @@ void common_hal_rotaryio_incrementalencoder_deinit(rotaryio_incrementalencoder_o
     reset_pin_number(self->pin_a);
     reset_pin_number(self->pin_b);
     peripherals_pcnt_deinit(&self->unit);
+    self->unit = PCNT_UNIT_MAX;
 }
 
 mp_int_t common_hal_rotaryio_incrementalencoder_get_position(rotaryio_incrementalencoder_obj_t *self) {

py/circuitpy_mpconfig.h

@@ -142,6 +142,7 @@ extern void common_hal_mcu_enable_interrupts(void);
 #define MICROPY_PY_GC                    (1)
 // Supplanted by shared-bindings/math
 #define MICROPY_PY_IO                    (CIRCUITPY_IO)
+#define MICROPY_PY_IO_IOBASE             (CIRCUITPY_IO_IOBASE)
 // In extmod
 #define MICROPY_PY_JSON                 (CIRCUITPY_JSON)
 #define MICROPY_PY_MATH                  (0)

py/circuitpy_mpconfig.mk

@@ -302,6 +302,10 @@ CFLAGS += -DCIRCUITPY_IMAGECAPTURE=$(CIRCUITPY_IMAGECAPTURE)
 CIRCUITPY_IO ?= $(CIRCUITPY_JSON)
 CFLAGS += -DCIRCUITPY_IO=$(CIRCUITPY_IO)
 
+# io.IOBase - enhances JPEG support
+CIRCUITPY_IO_IOBASE ?= $(call enable-if-all,$(CIRCUITPY_IO) $(CIRCUITPY_JPEGIO))
+CFLAGS += -DCIRCUITPY_IO_IOBASE=$(CIRCUITPY_IO_IOBASE)
+
 CIRCUITPY_IPADDRESS ?= $(CIRCUITPY_WIFI)
 CFLAGS += -DCIRCUITPY_IPADDRESS=$(CIRCUITPY_IPADDRESS)
 

py/makeqstrdata.py

@@ -250,6 +250,8 @@
     "zip",
 ]
 
+# CIRCUITPY-CHANGE
+# When taking the next merge from Micropython, prefer upstream's way of ensuring these appear in the "QSTR0" pool.
 # These qstrs have to be sorted early (preferably right after static_qstr_list) because they are required to fit in 8-bit values
 # however they should never be *forced* to appear
 # repeats len, hash, int from the static qstr list, but this doesn't hurt anything.

py/proto.h

@@ -27,6 +27,12 @@
 #ifndef MICROPY_INCLUDED_PY_PROTO_H
 #define MICROPY_INCLUDED_PY_PROTO_H
 
+// CIRCUITPY-CHANGE
+//
+// In CircuitPython, we have multiple different 'protocol' types (rather than multiplexing through ioctl).
+// The standard (read/write/ioctl) protocol is indicated by the "0" protocol, while others must MP_PROTO_IMPLEMENT(QSTR_...).
+// While not used in CircuitPython or tested, the ability to skip including the protocol field in a protocol object is included at the source level
+
 #ifdef MICROPY_UNSAFE_PROTO
 #define MP_PROTOCOL_HEAD /* NOTHING */
 #define MP_PROTO_IMPLEMENT(name) /* NOTHING */
@@ -35,7 +41,7 @@ static inline void *mp_proto_get(uint16_t name, mp_const_obj_type_t obj) {
 }
 #else
 #define MP_PROTOCOL_HEAD \
-    uint16_t name; // The name of this protocol, a qstr
+    uint16_t name;
 #define MP_PROTO_IMPLEMENT(n) .name = n,
 const void *mp_proto_get(uint16_t name, mp_const_obj_t obj);
 const void *mp_proto_get_or_throw(uint16_t name, mp_const_obj_t obj);

py/stream.c

@@ -83,14 +83,13 @@ mp_uint_t mp_stream_rw(mp_obj_t stream, void *buf_, mp_uint_t size, int *errcode
 }
 
 const mp_stream_p_t *mp_get_stream_raise(mp_obj_t self_in, int flags) {
-    const mp_obj_type_t *type = mp_obj_get_type(self_in);
-    if (MP_OBJ_TYPE_HAS_SLOT(type, protocol)) {
-        const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(type, protocol);
-        if (!((flags & MP_STREAM_OP_READ) && stream_p->read == NULL)
-            && !((flags & MP_STREAM_OP_WRITE) && stream_p->write == NULL)
-            && !((flags & MP_STREAM_OP_IOCTL) && stream_p->ioctl == NULL)) {
-            return stream_p;
-        }
+    // CIRCUITPY-CHANGE: using type-safe protocol accessor
+    const mp_stream_p_t *stream_p = mp_get_stream(self_in);
+    if (stream_p
+        && !((flags & MP_STREAM_OP_READ) && stream_p->read == NULL)
+        && !((flags & MP_STREAM_OP_WRITE) && stream_p->write == NULL)
+        && !((flags & MP_STREAM_OP_IOCTL) && stream_p->ioctl == NULL)) {
+        return stream_p;
     }
     // CPython: io.UnsupportedOperation, OSError subclass
     mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("stream operation not supported"));

py/stream.h

@@ -103,7 +103,8 @@ MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_ioctl_obj);
 
 // Object is assumed to have a non-NULL stream protocol with valid r/w/ioctl methods
 static inline const mp_stream_p_t *mp_get_stream(mp_const_obj_t self) {
-    return (const mp_stream_p_t *)MP_OBJ_TYPE_GET_SLOT(((const mp_obj_base_t *)MP_OBJ_TO_PTR(self))->type, protocol);
+    // CIRCUITPY-CHANGE: using type-safe protocol accessor
+    return mp_proto_get(0, (mp_obj_t)self);
 }
 
 const mp_stream_p_t *mp_get_stream_raise(mp_obj_t self_in, int flags);