LocalPeripheral is now Peripheral; more work on basic GATTS support; UART not working yet

5 files changed, 61 insertions, 60 deletions

diff --git a/shared-bindings/bleio/Characteristic.c b/shared-bindings/bleio/Characteristic.c
index 4fb71de47..d6ae4dfe4 100644
--- a/shared-bindings/bleio/Characteristic.c
+++ b/shared-bindings/bleio/Characteristic.c
@@ -233,7 +233,7 @@ const mp_obj_property_t bleio_characteristic_uuid_obj = {
 STATIC mp_obj_t bleio_characteristic_get_value(mp_obj_t self_in) {
     bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    common_hal_bleio_characteristic_read_value(self);
+    common_hal_bleio_characteristic_get_value(self);
 
     return self->value_data;
 }
@@ -245,7 +245,7 @@ STATIC mp_obj_t bleio_characteristic_set_value(mp_obj_t self_in, mp_obj_t value_
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(value_in, &bufinfo, MP_BUFFER_READ);
 
-    common_hal_bleio_characteristic_write_value(self, &bufinfo);
+    common_hal_bleio_characteristic_set_value(self, &bufinfo);
 
     return mp_const_none;
 }
diff --git a/shared-bindings/bleio/Characteristic.h b/shared-bindings/bleio/Characteristic.h
index 0e99e97cc..aec60ebbc 100644
--- a/shared-bindings/bleio/Characteristic.h
+++ b/shared-bindings/bleio/Characteristic.h
@@ -32,7 +32,7 @@
 extern const mp_obj_type_t bleio_characteristic_type;
 
 extern void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self);
-extern void common_hal_bleio_characteristic_read_value(bleio_characteristic_obj_t *self);
-extern void common_hal_bleio_characteristic_write_value(bleio_characteristic_obj_t *self, mp_buffer_info_t *bufinfo);
+extern void common_hal_bleio_characteristic_get_value(bleio_characteristic_obj_t *self);
+extern void common_hal_bleio_characteristic_set_value(bleio_characteristic_obj_t *self, mp_buffer_info_t *bufinfo);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_CHARACTERISTIC_H
diff --git a/shared-bindings/bleio/LocalPeripheral.c b/shared-bindings/bleio/Peripheral.c
index a40e0c043..1027bbb1f 100644
--- a/shared-bindings/bleio/LocalPeripheral.c
+++ b/shared-bindings/bleio/Peripheral.c
@@ -37,20 +37,20 @@
 #include "shared-bindings/bleio/Adapter.h"
 #include "shared-bindings/bleio/AddressType.h"
 #include "shared-bindings/bleio/Characteristic.h"
-#include "shared-bindings/bleio/LocalPeripheral.h"
+#include "shared-bindings/bleio/Peripheral.h"
 #include "shared-bindings/bleio/Service.h"
 #include "shared-bindings/bleio/UUID.h"
 #include "shared-module/bleio/AdvertisementData.h"
 #include "shared-module/bleio/ScanEntry.h"
 
-#include "common-hal/bleio/LocalPeripheral.h"
+#include "common-hal/bleio/Peripheral.h"
 
 // TODO: Add unique MAC address part to name
 static const char default_name[] = "CIRCUITPY";
 
 //| .. currentmodule:: bleio
 //|
-//| :class:`LocalPeripheral` -- A BLE peripheral device
+//| :class:`Peripheral` -- A BLE peripheral device
 //| =========================================================
 //|
 //| Implement a BLE peripheral which runs locally.
@@ -67,25 +67,25 @@ static const char default_name[] = "CIRCUITPY";
 //|    serv = bleio.Service(bleio.UUID(0x180f), [chara])
 //|
 //|    # Create a peripheral and start it up.
-//|    periph = bleio.LocalPeripheral([service])
+//|    periph = bleio.Peripheral([service])
 //|    periph.start_advertising()
 //|
 //|    while not periph.connected():
 //|        # Wait for connection.
 //|        pass
 //|
-//| .. class:: LocalPeripheral(services, *, name='CIRCUITPY')
+//| .. class:: Peripheral(services, *, name='CIRCUITPY')
 //|
-//|   Create a new LocalPeripheral object.
+//|   Create a new Peripheral object.
 
 //|   :param iterable services: the Service objects representing services available from this peripheral.
 //|   :param str name: The name used when advertising this peripheral
 //|
 
-STATIC mp_obj_t bleio_local_peripheral_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *pos_args) {
+STATIC mp_obj_t bleio_peripheral_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *pos_args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, true);
-    bleio_local_peripheral_obj_t *self = m_new_obj(bleio_local_peripheral_obj_t);
-    self->base.type = &bleio_local_peripheral_type;
+    bleio_peripheral_obj_t *self = m_new_obj(bleio_peripheral_obj_t);
+    self->base.type = &bleio_peripheral_type;
     self->service_list = mp_obj_new_list(0, NULL);
     self->notif_handler = mp_const_none;
 
@@ -125,7 +125,7 @@ STATIC mp_obj_t bleio_local_peripheral_make_new(const mp_obj_type_t *type, size_
     }
 
     // Do port-specific initialization.
-    common_hal_bleio_local_peripheral_construct(self);
+    common_hal_bleio_peripheral_construct(self);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -134,17 +134,17 @@ STATIC mp_obj_t bleio_local_peripheral_make_new(const mp_obj_type_t *type, size_
 //|
 //|     True if connected to a BLE Central device.
 //|
-STATIC mp_obj_t bleio_local_peripheral_get_connected(mp_obj_t self_in) {
-    bleio_local_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t bleio_peripheral_get_connected(mp_obj_t self_in) {
+    bleio_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // Return list as a tuple so user won't be able to change it.
-    return mp_obj_new_bool(common_hal_bleio_local_peripheral_get_connected(self));
+    return mp_obj_new_bool(common_hal_bleio_peripheral_get_connected(self));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_local_peripheral_get_connected_obj, bleio_local_peripheral_get_connected);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_peripheral_get_connected_obj, bleio_peripheral_get_connected);
 
-const mp_obj_property_t bleio_local_peripheral_connected_obj = {
+const mp_obj_property_t bleio_peripheral_connected_obj = {
     .base.type = &mp_type_property,
-    .proxy = { (mp_obj_t)&bleio_local_peripheral_get_connected_obj,
+    .proxy = { (mp_obj_t)&bleio_peripheral_get_connected_obj,
                (mp_obj_t)&mp_const_none_obj,
                (mp_obj_t)&mp_const_none_obj },
 };
@@ -153,17 +153,17 @@ const mp_obj_property_t bleio_local_peripheral_connected_obj = {
 //|
 //|     A `tuple` of `bleio.Service` that are offered by this peripheral. (read-only)
 //|
-STATIC mp_obj_t bleio_local_peripheral_get_services(mp_obj_t self_in) {
-    bleio_local_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t bleio_peripheral_get_services(mp_obj_t self_in) {
+    bleio_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
     // Return list as a tuple so user won't be able to change it.
     mp_obj_list_t *service_list = MP_OBJ_TO_PTR(self->service_list);
     return mp_obj_new_tuple(service_list->len, service_list->items);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_local_peripheral_get_services_obj, bleio_local_peripheral_get_services);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_peripheral_get_services_obj, bleio_peripheral_get_services);
 
-const mp_obj_property_t bleio_local_peripheral_services_obj = {
+const mp_obj_property_t bleio_peripheral_services_obj = {
     .base.type = &mp_type_property,
-    .proxy = { (mp_obj_t)&bleio_local_peripheral_get_services_obj,
+    .proxy = { (mp_obj_t)&bleio_peripheral_get_services_obj,
                (mp_obj_t)&mp_const_none_obj,
                (mp_obj_t)&mp_const_none_obj },
 };
@@ -172,16 +172,16 @@ const mp_obj_property_t bleio_local_peripheral_services_obj = {
 //|
 //|     The peripheral's name, included when advertising. (read-only)
 //|
-STATIC mp_obj_t bleio_local_peripheral_get_name(mp_obj_t self_in) {
-    bleio_local_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t bleio_peripheral_get_name(mp_obj_t self_in) {
+    bleio_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     return self->name;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(bleio_local_peripheral_get_name_obj, bleio_local_peripheral_get_name);
+MP_DEFINE_CONST_FUN_OBJ_1(bleio_peripheral_get_name_obj, bleio_peripheral_get_name);
 
-const mp_obj_property_t bleio_local_peripheral_name_obj = {
+const mp_obj_property_t bleio_peripheral_name_obj = {
     .base.type = &mp_type_property,
-    .proxy = { (mp_obj_t)&bleio_local_peripheral_get_name_obj,
+    .proxy = { (mp_obj_t)&bleio_peripheral_get_name_obj,
                (mp_obj_t)&mp_const_none_obj,
                (mp_obj_t)&mp_const_none_obj },
 };
@@ -194,8 +194,8 @@ const mp_obj_property_t bleio_local_peripheral_name_obj = {
 //|     :param bool connectable:  If `True` then other devices are allowed to connect to this peripheral.
 //|     :param buf data:  If not None, then send data bytes in advertising packets.
 //|
-STATIC mp_obj_t bleio_local_peripheral_start_advertising(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    bleio_local_peripheral_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+STATIC mp_obj_t bleio_peripheral_start_advertising(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    bleio_peripheral_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
     enum { ARG_connectable, ARG_data };
     static const mp_arg_t allowed_args[] = {
@@ -211,40 +211,40 @@ STATIC mp_obj_t bleio_local_peripheral_start_advertising(mp_uint_t n_args, const
         mp_get_buffer_raise(args[ARG_data].u_obj, &bufinfo, MP_BUFFER_READ);
     }
 
-    common_hal_bleio_local_peripheral_start_advertising(self, args[ARG_connectable].u_bool, &bufinfo);
+    common_hal_bleio_peripheral_start_advertising(self, args[ARG_connectable].u_bool, &bufinfo);
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_local_peripheral_start_advertising_obj, 0, bleio_local_peripheral_start_advertising);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_peripheral_start_advertising_obj, 0, bleio_peripheral_start_advertising);
 
 //|   .. method:: stop_advertising()
 //|
 //|     Stop sending advertising packets.
-STATIC mp_obj_t bleio_local_peripheral_stop_advertising(mp_obj_t self_in) {
-    bleio_local_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t bleio_peripheral_stop_advertising(mp_obj_t self_in) {
+    bleio_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    common_hal_bleio_local_peripheral_stop_advertising(self);
+    common_hal_bleio_peripheral_stop_advertising(self);
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_local_peripheral_stop_advertising_obj, bleio_local_peripheral_stop_advertising);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_peripheral_stop_advertising_obj, bleio_peripheral_stop_advertising);
 
-STATIC const mp_rom_map_elem_t bleio_local_peripheral_locals_dict_table[] = {
+STATIC const mp_rom_map_elem_t bleio_peripheral_locals_dict_table[] = {
     // Methods
-    { MP_ROM_QSTR(MP_QSTR_start_advertising),  MP_ROM_PTR(&bleio_local_peripheral_start_advertising_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stop_advertising),   MP_ROM_PTR(&bleio_local_peripheral_stop_advertising_obj) },
+    { MP_ROM_QSTR(MP_QSTR_start_advertising),  MP_ROM_PTR(&bleio_peripheral_start_advertising_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stop_advertising),   MP_ROM_PTR(&bleio_peripheral_stop_advertising_obj) },
 
     // Properties
-    { MP_ROM_QSTR(MP_QSTR_connected),          MP_ROM_PTR(&bleio_local_peripheral_connected_obj) },
-    { MP_ROM_QSTR(MP_QSTR_name),               MP_ROM_PTR(&bleio_local_peripheral_name_obj) },
-    { MP_ROM_QSTR(MP_QSTR_services),           MP_ROM_PTR(&bleio_local_peripheral_services_obj) },
+    { MP_ROM_QSTR(MP_QSTR_connected),          MP_ROM_PTR(&bleio_peripheral_connected_obj) },
+    { MP_ROM_QSTR(MP_QSTR_name),               MP_ROM_PTR(&bleio_peripheral_name_obj) },
+    { MP_ROM_QSTR(MP_QSTR_services),           MP_ROM_PTR(&bleio_peripheral_services_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(bleio_local_peripheral_locals_dict, bleio_local_peripheral_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(bleio_peripheral_locals_dict, bleio_peripheral_locals_dict_table);
 
-const mp_obj_type_t bleio_local_peripheral_type = {
+const mp_obj_type_t bleio_peripheral_type = {
     { &mp_type_type },
-    .name = MP_QSTR_LocalPeripheral,
-    .make_new = bleio_local_peripheral_make_new,
-    .locals_dict = (mp_obj_dict_t*)&bleio_local_peripheral_locals_dict
+    .name = MP_QSTR_Peripheral,
+    .make_new = bleio_peripheral_make_new,
+    .locals_dict = (mp_obj_dict_t*)&bleio_peripheral_locals_dict
 };
diff --git a/shared-bindings/bleio/LocalPeripheral.h b/shared-bindings/bleio/Peripheral.h
index bd6d5cbbb..02a5c1ef8 100644
--- a/shared-bindings/bleio/LocalPeripheral.h
+++ b/shared-bindings/bleio/Peripheral.h
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2018 Artur Pacholec
+ * Copyright (c) 2018 Dan Halbert for Adafruit Industries
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,16 +25,16 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_LOCALPERIPHERAL_H
-#define MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_LOCALPERIPHERAL_H
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_PERIPHERAL_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_PERIPHERAL_H
 
-#include "common-hal/bleio/LocalPeripheral.h"
+#include "common-hal/bleio/Peripheral.h"
 
-extern const mp_obj_type_t bleio_local_peripheral_type;
+extern const mp_obj_type_t bleio_peripheral_type;
 
-extern void common_hal_bleio_local_peripheral_construct(bleio_local_peripheral_obj_t *self);
-extern bool common_hal_bleio_local_peripheral_get_connected(bleio_local_peripheral_obj_t *self);
-extern void common_hal_bleio_local_peripheral_start_advertising(bleio_local_peripheral_obj_t *device, bool connectable, mp_buffer_info_t *raw_data);
-extern void common_hal_bleio_local_peripheral_stop_advertising(bleio_local_peripheral_obj_t *device);
+extern void common_hal_bleio_peripheral_construct(bleio_peripheral_obj_t *self);
+extern bool common_hal_bleio_peripheral_get_connected(bleio_peripheral_obj_t *self);
+extern void common_hal_bleio_peripheral_start_advertising(bleio_peripheral_obj_t *device, bool connectable, mp_buffer_info_t *raw_data);
+extern void common_hal_bleio_peripheral_stop_advertising(bleio_peripheral_obj_t *device);
 
-#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_LOCALPERIPHERAL_H
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_PERIPHERAL_H
diff --git a/shared-bindings/bleio/__init__.c b/shared-bindings/bleio/__init__.c
index b35907159..d30d59942 100644
--- a/shared-bindings/bleio/__init__.c
+++ b/shared-bindings/bleio/__init__.c
@@ -32,7 +32,7 @@
 #include "shared-bindings/bleio/Broadcaster.h"
 #include "shared-bindings/bleio/Characteristic.h"
 #include "shared-bindings/bleio/Descriptor.h"
-#include "shared-bindings/bleio/PeripheralServer.h"
+#include "shared-bindings/bleio/Peripheral.h"
 #include "shared-bindings/bleio/ScanEntry.h"
 #include "shared-bindings/bleio/Scanner.h"
 #include "shared-bindings/bleio/Service.h"
@@ -78,7 +78,7 @@ STATIC const mp_rom_map_elem_t bleio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Broadcaster),       MP_ROM_PTR(&bleio_broadcaster_type) },
     { MP_ROM_QSTR(MP_QSTR_Characteristic),    MP_ROM_PTR(&bleio_characteristic_type) },
     { MP_ROM_QSTR(MP_QSTR_Descriptor),        MP_ROM_PTR(&bleio_descriptor_type) },
-    { MP_ROM_QSTR(MP_QSTR_PeripheralServer),  MP_ROM_PTR(&bleio_peripheral_server_type) },
+    { MP_ROM_QSTR(MP_QSTR_Peripheral),        MP_ROM_PTR(&bleio_peripheral_type) },
     { MP_ROM_QSTR(MP_QSTR_ScanEntry),         MP_ROM_PTR(&bleio_scanentry_type) },
     { MP_ROM_QSTR(MP_QSTR_Scanner),           MP_ROM_PTR(&bleio_scanner_type) },
     { MP_ROM_QSTR(MP_QSTR_Service),           MP_ROM_PTR(&bleio_service_type) },