merge upstream/main

5 files changed, 45 insertions, 45 deletions

diff --git a/shared-module/_bleio/Characteristic.h b/shared-module/_bleio/Characteristic.h
index 7776b1fa5..298592b9e 100644
--- a/shared-module/_bleio/Characteristic.h
+++ b/shared-module/_bleio/Characteristic.h
@@ -39,18 +39,18 @@ typedef enum {
     CHAR_PROP_WRITE =             1u << 4,
     CHAR_PROP_WRITE_NO_RESPONSE = 1u << 5,
     CHAR_PROP_ALL =               (CHAR_PROP_BROADCAST | CHAR_PROP_INDICATE | CHAR_PROP_NOTIFY |
-                                   CHAR_PROP_READ | CHAR_PROP_WRITE | CHAR_PROP_WRITE_NO_RESPONSE)
+        CHAR_PROP_READ | CHAR_PROP_WRITE | CHAR_PROP_WRITE_NO_RESPONSE)
 } bleio_characteristic_properties_enum_t;
 typedef uint8_t bleio_characteristic_properties_t;
 
 // Bluetooth spec property values
-#define BT_GATT_CHRC_BROADCAST			0x01
-#define BT_GATT_CHRC_READ			0x02
-#define BT_GATT_CHRC_WRITE_WITHOUT_RESP		0x04
-#define BT_GATT_CHRC_WRITE			0x08
-#define BT_GATT_CHRC_NOTIFY			0x10
-#define BT_GATT_CHRC_INDICATE			0x20
-#define BT_GATT_CHRC_AUTH			0x40
-#define BT_GATT_CHRC_EXT_PROP			0x80
+#define BT_GATT_CHRC_BROADCAST                  0x01
+#define BT_GATT_CHRC_READ                       0x02
+#define BT_GATT_CHRC_WRITE_WITHOUT_RESP         0x04
+#define BT_GATT_CHRC_WRITE                      0x08
+#define BT_GATT_CHRC_NOTIFY                     0x10
+#define BT_GATT_CHRC_INDICATE                   0x20
+#define BT_GATT_CHRC_AUTH                       0x40
+#define BT_GATT_CHRC_EXT_PROP                   0x80
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_BLEIO_CHARACTERISTIC_H
diff --git a/shared-module/_bleio/ScanEntry.c b/shared-module/_bleio/ScanEntry.c
index af9e4b347..28ff215a3 100644
--- a/shared-module/_bleio/ScanEntry.c
+++ b/shared-module/_bleio/ScanEntry.c
@@ -52,7 +52,7 @@ bool common_hal_bleio_scanentry_get_scan_response(bleio_scanentry_obj_t *self) {
     return self->scan_response;
 }
 
-bool bleio_scanentry_data_matches(const uint8_t* data, size_t len, const uint8_t* prefixes, size_t prefixes_length, bool any) {
+bool bleio_scanentry_data_matches(const uint8_t *data, size_t len, const uint8_t *prefixes, size_t prefixes_length, bool any) {
     if (prefixes_length == 0) {
         return true;
     }
@@ -61,7 +61,7 @@ bool bleio_scanentry_data_matches(const uint8_t* data, size_t len, const uint8_t
         return false;
     }
     size_t i = 0;
-    while(i < prefixes_length) {
+    while (i < prefixes_length) {
         uint8_t prefix_length = prefixes[i];
         i += 1;
         size_t j = 0;
@@ -91,6 +91,6 @@ bool bleio_scanentry_data_matches(const uint8_t* data, size_t len, const uint8_t
     return !any;
 }
 
-bool common_hal_bleio_scanentry_matches(bleio_scanentry_obj_t *self, const uint8_t* prefixes, size_t prefixes_len, bool all) {
+bool common_hal_bleio_scanentry_matches(bleio_scanentry_obj_t *self, const uint8_t *prefixes, size_t prefixes_len, bool all) {
     return bleio_scanentry_data_matches(self->data->data, self->data->len, prefixes, prefixes_len, !all);
 }
diff --git a/shared-module/_bleio/ScanEntry.h b/shared-module/_bleio/ScanEntry.h
index 94361a397..9e142fd6e 100644
--- a/shared-module/_bleio/ScanEntry.h
+++ b/shared-module/_bleio/ScanEntry.h
@@ -42,6 +42,6 @@ typedef struct {
     uint64_t time_received;
 } bleio_scanentry_obj_t;
 
-bool bleio_scanentry_data_matches(const uint8_t* data, size_t len, const uint8_t* prefixes, size_t prefix_length, bool any);
+bool bleio_scanentry_data_matches(const uint8_t *data, size_t len, const uint8_t *prefixes, size_t prefix_length, bool any);
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_BLEIO_SCANENTRY_H
diff --git a/shared-module/_bleio/ScanResults.c b/shared-module/_bleio/ScanResults.c
index cb48d636d..25ce387d0 100644
--- a/shared-module/_bleio/ScanResults.c
+++ b/shared-module/_bleio/ScanResults.c
@@ -34,8 +34,8 @@
 #include "shared-bindings/_bleio/ScanEntry.h"
 #include "shared-bindings/_bleio/ScanResults.h"
 
-bleio_scanresults_obj_t* shared_module_bleio_new_scanresults(size_t buffer_size, uint8_t* prefixes, size_t prefixes_len, mp_int_t minimum_rssi) {
-    bleio_scanresults_obj_t* self = m_new_obj(bleio_scanresults_obj_t);
+bleio_scanresults_obj_t *shared_module_bleio_new_scanresults(size_t buffer_size, uint8_t *prefixes, size_t prefixes_len, mp_int_t minimum_rssi) {
+    bleio_scanresults_obj_t *self = m_new_obj(bleio_scanresults_obj_t);
     self->base.type = &bleio_scanresults_type;
     ringbuf_alloc(&self->buf, buffer_size, false);
     self->prefixes = prefixes;
@@ -57,16 +57,16 @@ mp_obj_t common_hal_bleio_scanresults_next(bleio_scanresults_obj_t *self) {
     bool connectable = (type & (1 << 0)) != 0;
     bool scan_response = (type & (1 << 1)) != 0;
     uint64_t ticks_ms;
-    ringbuf_get_n(&self->buf, (uint8_t*) &ticks_ms, sizeof(ticks_ms));
+    ringbuf_get_n(&self->buf, (uint8_t *)&ticks_ms, sizeof(ticks_ms));
     uint8_t rssi = ringbuf_get(&self->buf);
     uint8_t peer_addr[NUM_BLEIO_ADDRESS_BYTES];
     ringbuf_get_n(&self->buf, peer_addr, sizeof(peer_addr));
     uint8_t addr_type = ringbuf_get(&self->buf);
     uint16_t len;
-    ringbuf_get_n(&self->buf, (uint8_t*) &len, sizeof(len));
+    ringbuf_get_n(&self->buf, (uint8_t *)&len, sizeof(len));
 
     mp_obj_str_t *o = MP_OBJ_TO_PTR(mp_obj_new_bytes_of_zeros(len));
-    ringbuf_get_n(&self->buf, (uint8_t*) o->data, len);
+    ringbuf_get_n(&self->buf, (uint8_t *)o->data, len);
 
     bleio_scanentry_obj_t *entry = m_new_obj(bleio_scanentry_obj_t);
     entry->base.type = &bleio_scanentry_type;
@@ -86,15 +86,15 @@ mp_obj_t common_hal_bleio_scanresults_next(bleio_scanresults_obj_t *self) {
 }
 
 
-void shared_module_bleio_scanresults_append(bleio_scanresults_obj_t* self,
-                                            uint64_t ticks_ms,
-                                            bool connectable,
-                                            bool scan_response,
-                                            int8_t rssi,
-                                            uint8_t *peer_addr,
-                                            uint8_t addr_type,
-                                            uint8_t *data,
-                                            uint16_t len) {
+void shared_module_bleio_scanresults_append(bleio_scanresults_obj_t *self,
+    uint64_t ticks_ms,
+    bool connectable,
+    bool scan_response,
+    int8_t rssi,
+    uint8_t *peer_addr,
+    uint8_t addr_type,
+    uint8_t *data,
+    uint16_t len) {
     int32_t packet_size = sizeof(uint8_t) + sizeof(ticks_ms) + sizeof(rssi) + NUM_BLEIO_ADDRESS_BYTES +
         sizeof(addr_type) + sizeof(len) + len;
     int32_t empty_space = self->buf.size - ringbuf_num_filled(&self->buf);
@@ -121,19 +121,19 @@ void shared_module_bleio_scanresults_append(bleio_scanresults_obj_t* self,
 
     // Add the packet to the buffer.
     ringbuf_put(&self->buf, type);
-    ringbuf_put_n(&self->buf, (uint8_t*) &ticks_ms, sizeof(ticks_ms));
+    ringbuf_put_n(&self->buf, (uint8_t *)&ticks_ms, sizeof(ticks_ms));
     ringbuf_put(&self->buf, rssi);
     ringbuf_put_n(&self->buf, peer_addr, NUM_BLEIO_ADDRESS_BYTES);
     ringbuf_put(&self->buf, addr_type);
-    ringbuf_put_n(&self->buf, (uint8_t*) &len, sizeof(len));
+    ringbuf_put_n(&self->buf, (uint8_t *)&len, sizeof(len));
     ringbuf_put_n(&self->buf, data, len);
 }
 
-bool shared_module_bleio_scanresults_get_done(bleio_scanresults_obj_t* self) {
+bool shared_module_bleio_scanresults_get_done(bleio_scanresults_obj_t *self) {
     return self->done;
 }
 
-void shared_module_bleio_scanresults_set_done(bleio_scanresults_obj_t* self, bool done) {
+void shared_module_bleio_scanresults_set_done(bleio_scanresults_obj_t *self, bool done) {
     self->done = done;
     self->common_hal_data = NULL;
 }
diff --git a/shared-module/_bleio/ScanResults.h b/shared-module/_bleio/ScanResults.h
index 8912357a9..fa181aabe 100644
--- a/shared-module/_bleio/ScanResults.h
+++ b/shared-module/_bleio/ScanResults.h
@@ -36,29 +36,29 @@
 typedef struct {
     mp_obj_base_t base;
     // Pointers that needs to live until the scan is done.
-    void* common_hal_data;
+    void *common_hal_data;
     ringbuf_t buf;
     // Prefixes is a length encoded array of prefixes.
-    uint8_t* prefixes;
+    uint8_t *prefixes;
     size_t prefix_length;
     mp_int_t minimum_rssi;
     bool active;
     bool done;
 } bleio_scanresults_obj_t;
 
-bleio_scanresults_obj_t* shared_module_bleio_new_scanresults(size_t buffer_size, uint8_t* prefixes, size_t prefixes_len, mp_int_t minimum_rssi);
+bleio_scanresults_obj_t *shared_module_bleio_new_scanresults(size_t buffer_size, uint8_t *prefixes, size_t prefixes_len, mp_int_t minimum_rssi);
 
-bool shared_module_bleio_scanresults_get_done(bleio_scanresults_obj_t* self);
-void shared_module_bleio_scanresults_set_done(bleio_scanresults_obj_t* self, bool done);
+bool shared_module_bleio_scanresults_get_done(bleio_scanresults_obj_t *self);
+void shared_module_bleio_scanresults_set_done(bleio_scanresults_obj_t *self, bool done);
 
-void shared_module_bleio_scanresults_append(bleio_scanresults_obj_t* self,
-                                            uint64_t ticks_ms,
-                                            bool connectable,
-                                            bool scan_result,
-                                            int8_t rssi,
-                                            uint8_t *peer_addr,
-                                            uint8_t addr_type,
-                                            uint8_t* data,
-                                            uint16_t len);
+void shared_module_bleio_scanresults_append(bleio_scanresults_obj_t *self,
+    uint64_t ticks_ms,
+    bool connectable,
+    bool scan_result,
+    int8_t rssi,
+    uint8_t *peer_addr,
+    uint8_t addr_type,
+    uint8_t *data,
+    uint16_t len);
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_BLEIO_SCANRESULTS_H