Merge pull request #7 from adafruit/main

Pull latest changes

Author: ecasadod

.github/workflows/build.yml

@@ -35,13 +35,40 @@ jobs:
         python-version: 3.8
     - name: Install deps
       run: |
+        sudo apt-get update
         sudo apt-get install -y eatmydata
         sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64 latexmk texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
         pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black awscli mypy
     - name: Versions
       run: |
         gcc --version
         python3 --version
+    - name: Translations
+      run: make check-translate
+    - name: New boards check
+      run: python3 -u ci_new_boards_check.py
+      working-directory: tools
+    - name: Duplicate USB VID/PID Check
+      run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
+    - name: Build and Validate Stubs
+      run: make check-stubs -j2
+    - uses: actions/upload-artifact@v2
+      with:
+        name: stubs
+        path: circuitpython-stubs*
+    - name: Test Documentation Build (HTML)
+      run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
+    - uses: actions/upload-artifact@v2
+      with:
+        name: docs
+        path: _build/html
+    - name: Test Documentation Build (LaTeX/PDF)
+      run: |
+        make latexpdf
+    - uses: actions/upload-artifact@v2
+      with:
+        name: docs
+        path: _build/latex
     - name: Build mpy-cross
       run: make -C mpy-cross -j2
     - name: Build unix port
@@ -67,32 +94,6 @@ jobs:
     - name: mpy Tests
       run: MICROPY_CPYTHON3=python3.8 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
       working-directory: tests
-    - name: Build and Validate Stubs
-      run: make check-stubs -j2
-    - uses: actions/upload-artifact@v2
-      with:
-        name: stubs
-        path: circuitpython-stubs*
-    - name: Test Documentation Build (HTML)
-      run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
-    - uses: actions/upload-artifact@v2
-      with:
-        name: docs
-        path: _build/html
-    - name: Test Documentation Build (LaTeX/PDF)
-      run: |
-        make latexpdf
-    - uses: actions/upload-artifact@v2
-      with:
-        name: docs
-        path: _build/latex
-    - name: Translations
-      run: make check-translate
-    - name: New boards check
-      run: python3 -u ci_new_boards_check.py
-      working-directory: tools
-    - name: Duplicate USB VID/PID Check
-      run: python3 -u -m tools.ci_check_duplicate_usb_vid_pid
     - name: Build mpy-cross.static-raspbian
       run: make -C mpy-cross -j2 -f Makefile.static-raspbian
     - uses: actions/upload-artifact@v2
@@ -184,6 +185,7 @@ jobs:
         - "arduino_nano_33_iot"
         - "arduino_zero"
         - "bast_pro_mini_m0"
+        - "bastble"
         - "bdmicro_vina_d21"
         - "bdmicro_vina_d51"
         - "bless_dev_board_multi_sensor"
@@ -310,6 +312,7 @@ jobs:
         - "sparkfun_samd21_mini"
         - "sparkfun_samd51_thing_plus"
         - "spresense"
+        - "stackrduino_m0_pro"
         - "stm32f411ce_blackpill"
         - "stm32f411ve_discovery"
         - "stm32f412zg_discovery"
@@ -342,8 +345,8 @@ jobs:
       run: |
         sudo apt-get install -y gettext
         pip install requests sh click setuptools awscli
-        wget https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
-        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
+        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
     - name: Versions
       run: |
         gcc --version

.gitmodules

@@ -152,7 +152,7 @@
 	url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
 [submodule "ports/esp32s2/esp-idf"]
 	path = ports/esp32s2/esp-idf
-	url = https://github.com/jepler/esp-idf.git
+	url = https://github.com/adafruit/esp-idf.git
 [submodule "ports/esp32s2/certificates/nina-fw"]
 	path = ports/esp32s2/certificates/nina-fw
 	url = https://github.com/adafruit/nina-fw.git

Makefile

@@ -265,7 +265,7 @@ update-frozen-libraries:
 	@echo "Updating all frozen libraries to latest tagged version."
 	cd frozen; for library in *; do cd $$library; ../../tools/git-checkout-latest-tag.sh; cd ..; done
 
-one-of-each: samd21 samd51 esp32s2 litex mimxrt10xx nrf stm
+one-of-each: samd21 litex mimxrt10xx nrf stm
 
 samd21:
 	$(MAKE) -C ports/atmel-samd BOARD=trinket_m0

devices/ble_hci/common-hal/_bleio/att.c

@@ -61,7 +61,7 @@ STATIC struct {
 typedef struct __packed {
     uint8_t properties;
     uint16_t value_handle;
-    uint8_t uuid[0];  // 2 or 16 bytes
+    uint8_t uuid[];  // 2 or 16 bytes
 } characteristic_declaration_t;
 
 STATIC uint8_t bleio_properties_to_ble_spec_properties(uint8_t bleio_properties) {
@@ -1010,21 +1010,22 @@ void process_read_group_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, ui
 }
 
 int att_read_group_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t uuid, uint8_t response_buffer[]) {
-    struct __packed {
+
+    typedef struct __packed {
         struct bt_att_hdr h;
         struct bt_att_read_group_req r;
-    } req = { {
-            .code = BT_ATT_OP_READ_GROUP_REQ,
-        }, {
-            .start_handle = start_handle,
-            .end_handle = end_handle,
-        }
-    };
-    req.r.uuid[0] = uuid & 0xff;
-    req.r.uuid[1] = uuid >> 8;
+    } req_t;
 
+    uint8_t req_bytes[sizeof(req_t) + sizeof(uuid)];
+    req_t *req = (req_t *) req_bytes;
 
-    return send_req_wait_for_rsp(conn_handle, sizeof(req), (uint8_t *) &req, response_buffer);
+    req->h.code = BT_ATT_OP_READ_GROUP_REQ;
+    req->r.start_handle = start_handle;
+    req->r.end_handle = end_handle;
+    req->r.uuid[0] = uuid & 0xff;
+    req->r.uuid[1] = uuid >> 8;
+
+    return send_req_wait_for_rsp(conn_handle, sizeof(req_bytes), req_bytes, response_buffer);
 }
 
 STATIC void process_read_group_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) {
@@ -1305,20 +1306,21 @@ STATIC void process_read_type_req(uint16_t conn_handle, uint16_t mtu, uint8_t dl
 }
 
 int att_read_type_req(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, uint16_t type, uint8_t response_buffer[]) {
-    struct __packed {
+    typedef struct __packed {
         struct bt_att_hdr h;
         struct bt_att_read_type_req r;
-    } req = { {
-            .code = BT_ATT_OP_READ_TYPE_REQ,
-        }, {
-            .start_handle = start_handle,
-            .end_handle = end_handle,
-        }
-    };
-    req.r.uuid[0] = type & 0xff;
-    req.r.uuid[1] = type >> 8;
+    } req_t;
 
-    return send_req_wait_for_rsp(conn_handle, sizeof(req), (uint8_t *) &req, response_buffer);
+    uint8_t req_bytes[sizeof(req_t) + sizeof(type)];
+    req_t *req = (req_t *) req_bytes;
+
+    req->h.code = BT_ATT_OP_READ_TYPE_REQ;
+    req->r.start_handle = start_handle;
+    req->r.end_handle = end_handle;
+    req->r.uuid[0] = type & 0xff;
+    req->r.uuid[1] = type >> 8;
+
+    return send_req_wait_for_rsp(conn_handle, sizeof(req_bytes), req_bytes, response_buffer);
 }
 
 STATIC void process_read_type_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) {

devices/ble_hci/common-hal/_bleio/hci_include/att_internal.h

@@ -69,7 +69,7 @@ struct bt_att_info_128 {
 #define BT_ATT_OP_FIND_INFO_RSP			0x05
 struct bt_att_find_info_rsp {
 	uint8_t  format;
-	uint8_t  info[0];
+	uint8_t  info[];
 } __packed;
 
 /* Find By Type Value Request */
@@ -78,7 +78,7 @@ struct bt_att_find_type_req {
 	uint16_t start_handle;
 	uint16_t end_handle;
 	uint16_t type;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;
 
 struct bt_att_handle_group {
@@ -89,27 +89,28 @@ struct bt_att_handle_group {
 /* Find By Type Value Response */
 #define BT_ATT_OP_FIND_TYPE_RSP			0x07
 struct bt_att_find_type_rsp {
-	struct bt_att_handle_group list[0];
+        uint8_t _dummy[0];
+	struct bt_att_handle_group list[];
 } __packed;
 
 /* Read By Type Request */
 #define BT_ATT_OP_READ_TYPE_REQ			0x08
 struct bt_att_read_type_req {
 	uint16_t start_handle;
 	uint16_t end_handle;
-	uint8_t  uuid[0];
+	uint8_t  uuid[];
 } __packed;
 
 struct bt_att_data {
 	uint16_t handle;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;
 
 /* Read By Type Response */
 #define BT_ATT_OP_READ_TYPE_RSP			0x09
 struct bt_att_read_type_rsp {
 	uint8_t  len;
-	struct bt_att_data data[0];
+	struct bt_att_data data[];
 } __packed;
 
 /* Read Request */
@@ -121,7 +122,8 @@ struct bt_att_read_req {
 /* Read Response */
 #define BT_ATT_OP_READ_RSP			0x0b
 struct bt_att_read_rsp {
-	uint8_t  value[0];
+        uint8_t _dummy[0];
+	uint8_t  value[];
 } __packed;
 
 /* Read Blob Request */
@@ -134,49 +136,52 @@ struct bt_att_read_blob_req {
 /* Read Blob Response */
 #define BT_ATT_OP_READ_BLOB_RSP			0x0d
 struct bt_att_read_blob_rsp {
-	uint8_t  value[0];
+        uint8_t _dummy[0];
+	uint8_t  value[];
 } __packed;
 
 /* Read Multiple Request */
 #define BT_ATT_READ_MULT_MIN_LEN_REQ		0x04
 
 #define BT_ATT_OP_READ_MULT_REQ			0x0e
 struct bt_att_read_mult_req {
-	uint16_t handles[0];
+        uint8_t _dummy[0];
+	uint16_t handles[];
 } __packed;
 
 /* Read Multiple Respose */
 #define BT_ATT_OP_READ_MULT_RSP			0x0f
 struct bt_att_read_mult_rsp {
-	uint8_t  value[0];
+        uint8_t _dummy[0];
+	uint8_t  value[];
 } __packed;
 
 /* Read by Group Type Request */
 #define BT_ATT_OP_READ_GROUP_REQ		0x10
 struct bt_att_read_group_req {
 	uint16_t start_handle;
 	uint16_t end_handle;
-	uint8_t  uuid[0];
+	uint8_t  uuid[];
 } __packed;
 
 struct bt_att_group_data {
 	uint16_t start_handle;
 	uint16_t end_handle;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;
 
 /* Read by Group Type Response */
 #define BT_ATT_OP_READ_GROUP_RSP		0x11
 struct bt_att_read_group_rsp {
 	uint8_t  len;
-	struct bt_att_group_data data[0];
+	struct bt_att_group_data data[];
 } __packed;
 
 /* Write Request */
 #define BT_ATT_OP_WRITE_REQ			0x12
 struct bt_att_write_req {
 	uint16_t handle;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;
 
 /* Write Response */
@@ -187,15 +192,15 @@ struct bt_att_write_req {
 struct bt_att_prepare_write_req {
 	uint16_t handle;
 	uint16_t offset;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;
 
 /* Prepare Write Respond */
 #define BT_ATT_OP_PREPARE_WRITE_RSP		0x17
 struct bt_att_prepare_write_rsp {
 	uint16_t handle;
 	uint16_t offset;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;
 
 /* Execute Write Request */
@@ -214,14 +219,14 @@ struct bt_att_exec_write_req {
 #define BT_ATT_OP_NOTIFY			0x1b
 struct bt_att_notify {
 	uint16_t handle;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;
 
 /* Handle Value Indication */
 #define BT_ATT_OP_INDICATE			0x1d
 struct bt_att_indicate {
 	uint16_t handle;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;
 
 /* Handle Value Confirm */
@@ -233,34 +238,35 @@ struct bt_att_signature {
 
 #define BT_ATT_OP_READ_MULT_VL_REQ		0x20
 struct bt_att_read_mult_vl_req {
-	uint16_t handles[0];
+        uint8_t _dummy[0];
+	uint16_t handles[];
 } __packed;
 
 /* Read Multiple Respose */
 #define BT_ATT_OP_READ_MULT_VL_RSP		0x21
 struct bt_att_read_mult_vl_rsp {
 	uint16_t len;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;
 
 /* Handle Multiple Value Notification */
 #define BT_ATT_OP_NOTIFY_MULT			0x23
 struct bt_att_notify_mult {
 	uint16_t handle;
 	uint16_t len;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;
 
 /* Write Command */
 #define BT_ATT_OP_WRITE_CMD			0x52
 struct bt_att_write_cmd {
 	uint16_t handle;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;
 
 /* Signed Write Command */
 #define BT_ATT_OP_SIGNED_WRITE_CMD		0xd2
 struct bt_att_signed_write_cmd {
 	uint16_t handle;
-	uint8_t  value[0];
+	uint8_t  value[];
 } __packed;