Add BLE GAP/GATT support to the dev-esp32 branch

components/base_nodemcu/user_main.c

@@ -160,7 +160,13 @@ void __attribute__((noreturn)) app_main(void)
 
   nodemcu_init ();
 
-  nvs_flash_init ();
+  // This is the standard flash init sequence
+  int rc = nvs_flash_init();
+  if (rc == ESP_ERR_NVS_NO_FREE_PAGES || rc == ESP_ERR_NVS_NEW_VERSION_FOUND) {
+    nvs_flash_erase();
+    nvs_flash_init();
+  }
+
   esp_netif_init ();
 
   start_lua ();

components/modules/ble.c

@@ -19,7 +19,6 @@
 
 #include "sdkconfig.h"
 #ifdef CONFIG_NODEMCU_CMODULE_BLE
-#include "nvs_flash.h"
 #include <assert.h>
 #include <errno.h>
 
@@ -34,6 +33,10 @@
 #include <esp_log.h>
 #define TAG "ble"
 
+#ifndef CONFIG_BT_NIMBLE_ENABLED
+#error You must enable NIMBLE if you want the Lua ble module. Hopefully this can be made automatic some day.
+#endif
+
 /* BLE */
 #include "esp_nimble_hci.h"
 #include "nimble/nimble_port.h"
@@ -196,7 +199,8 @@ free_gatt_svcs(lua_State *L, const struct ble_gatt_svc_def * svcs) {
 
 static int
 lble_access_cb(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
-  // Actually the only thing we care about is the arg and the ctxt
+  UNUSED(conn_handle);
+  UNUSED(attr_handle);
 
   size_t task_block_size = sizeof(task_block_t);
 
@@ -220,6 +224,7 @@ lble_access_cb(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_acces
     task_block->length = OS_MBUF_PKTLEN(ctxt->om);
     uint16_t outlen;
     if (ble_hs_mbuf_to_flat(ctxt->om, task_block->buffer, task_block->length, &outlen)) {
+      free(task_block);
       return BLE_ATT_ERR_UNLIKELY;
     }
   }
@@ -232,7 +237,7 @@ lble_access_cb(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_acces
   response_message_t message;
 
   while (1) {
-    if (xQueueReceive(response_queue, &message, (TickType_t) (10000/portTICK_PERIOD_MS) ) != pdPASS) {
+    if (xQueueReceive(response_queue, &message, (TickType_t) (2000/portTICK_PERIOD_MS) ) != pdPASS) {
       free(task_block);
       return BLE_ATT_ERR_UNLIKELY;
     }
@@ -270,6 +275,8 @@ lble_task_cb(task_param_t param, task_prio_t prio) {
   message.errcode = BLE_ATT_ERR_UNLIKELY;
 
   lua_State *L = lua_getstate();
+  int top = lua_gettop(L);
+
   lua_rawgeti(L, LUA_REGISTRYINDEX, (int) task_block->arg);
   // Now we have the characteristic table in -1
   lua_getfield(L, -1, "type");
@@ -391,12 +398,12 @@ lble_task_cb(task_param_t param, task_prio_t prio) {
     } else {
       lua_pop(L, 1);  // Throw away the null write pointer
     }
-    lua_pop(L, 1);	// THrow away the value
+    lua_pop(L, 1);	// Throw away the value
     message.errcode = 0;
   }
 
 cleanup:
-  lua_pop(L, 2);
+  lua_settop(L, top);
   message.seqno = task_block->seqno;
 
   xQueueSend(response_queue, &message, (TickType_t) 0);
@@ -563,7 +570,6 @@ gatt_svr_init(lua_State *L) {
 
     struct ble_gatt_svc_def *svcs = NULL;
     lble_build_gatt_svcs(L, &svcs, &notify_handles);
-    //free_gatt_svcs(L, gatt_svr_svcs);
     gatt_svr_svcs = svcs;
 
     rc = ble_gatts_count_cfg(gatt_svr_svcs);
@@ -608,18 +614,6 @@ lble_print_conn_desc(struct ble_gap_conn_desc *desc)
 
 static int
 lble_sys_init(lua_State *L) {
-  int rc = nvs_flash_init();
-  if (rc == ESP_ERR_NVS_NO_FREE_PAGES || rc == ESP_ERR_NVS_NEW_VERSION_FOUND) {
-    rc = nvs_flash_erase();
-    if (rc) {
-      return luaL_error(L, "Failed to erase flash: %d", rc);
-    }
-    rc = nvs_flash_init();
-  }
-  if (rc) {
-    return luaL_error(L, "Failed to init flash: %d", rc);
-  }
-
   task_handle = task_get_id(lble_task_cb);
   response_queue = xQueueCreate(2, sizeof(response_message_t));
 
@@ -944,11 +938,6 @@ static int lble_notify(lua_State *L) {
 
   ble_gatts_chr_updated(notify_handles[handle]);
 
-/*
-  if (rc) {
-    return luaL_error(L, "Must supply a valid handle");
-  }
-*/
   return 0;
 }
 

components/modules/ledc.c

@@ -30,8 +30,6 @@ static int lledc_new_channel( lua_State *L )
 
   ledc_timer.timer_num = opt_checkint_range(L, "timer", -1, 0, LEDC_TIMER_MAX-1);
 
-  ledc_timer.clk_cfg = LEDC_AUTO_CLK;
-
   /* Setup channel */
   ledc_channel_config_t channel_config = {
     .speed_mode = ledc_timer.speed_mode,

docs/modules/ble.md

@@ -30,9 +30,9 @@ function read_battery_level()
   -- This ought to do something better!
   return 50
 end
-local battery = { uuid="180f", characteristics={ {uuid="2a19", type='B', read=read_battery_level} } }
-local myservice = {uuid="0123456789abcdef0123456789abcdef", characteristics={{uuid="1234", value=0, type='c'}}}
-local config = {name="MyGadget=", services={ myservice, battery }
+battery = { uuid="180f", characteristics={ {uuid="2a19", type='B', read=read_battery_level} } }
+myservice = {uuid="0123456789abcdef0123456789abcdef", characteristics={{uuid="1234", value=0, type='c'}}}
+config = {name="MyGadget", services={ myservice, battery } }
 ble.init(config)
 ```
 
@@ -120,11 +120,13 @@ The characteristic table contains the following keys:
 
 - `uuid` The UUID of the characteristics. This can be either a 16 byte string or a 2 byte string that identifies the particular characteristic. Typically, 2 byte strings are used for well-known characteristics.
 - `type` This is the optional type of the value. It has the same value as a unpack code in the `struct` module.
-- `value` This is the actual value of the characteristic. This will be a string of bytes unless a `type` value is set.
+- `value` This is the actual value of the characteristic. This will be a string of bytes (unless `type` is set).
 - `read` This is a function that will be invoked to read the value (and so does not need the `value` entry). It should return a string of bytes (unless `type` is set).
 - `write` This is a function that will be invoked to write the value (and so does not need the `value` entry). It is given a string of bytes (unless `type` is set)
 - `notify` If this attribute is present then notifications are supported on this characteristic. The value of the `notify` attribute is updated to be an integer which is the value to be passed into `ble.notify()`
 
+In the above functions, the value is that passed to/from the write/read functions is of the type specified by the `type` key. If this key is missing, then the default type is a string of bytes. For example, if `type` is `'B'` then the value is an integer (in the range 0 - 255) and the bluetooth client will see a single byte containing that value.
+
 If the `value` key is present, then the characteristic is read/write. However, if one or `read` or `write` is set to `true`, then it restricts access to that mode.
 
 The characteristics are treated as read/write unless only one of the `read` or `write` keys is present and the `value` key is not specified.

install.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 echo "Installing IDF prerequisites..."
 
 IDF_DIR=./sdk/esp32-esp-idf