v3.0.7.0 - breaking change: hard coded to Arduino esp32 v3.0.7

PaulZC · PaulZC · commit 9d0d643580f5 · 2025-08-27T11:12:09.000+01:00
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 # SparkFun Apple Accessory Arduino Library
 
-An Arduino Library for Apple Accessories using iAP2 connections - precompiled for ESP32
+An Arduino Library for Apple Accessories using iAP2 connections - precompiled for Arduino esp32 v3.0.7 (IDF 5.1)
 
 This library supports communication with Apple Accessories using the iAP2 protocol, as defined in the Accessory Interface Specification (Release R44). Unfortunately, the Interface Specification is only available under NDA. This library is precompiled for the ESP32 to protect the source code.
 
-iAP2 is supported over several transports, including Bluetooth, UART and USB. The [ESP32_BluetoothSerial](./examples/ESP32_BluetoothSerial/ESP32_BluetoothSerial.ino) example demonstrates how to communicate with an Accessory using ESP32 BluetoothSerial as the transport. The example depends on a modified version of BluetoothSerial which makes ACL more accessible. It also depends on a modified version of libbt.a which has been compiled with SPP enabled.
+iAP2 is supported over several transports, including Bluetooth, UART and USB. The [ESP32_BluetoothSerial](./examples/ESP32_BluetoothSerial/ESP32_BluetoothSerial.ino) example demonstrates how to communicate with an Accessory using ESP32 BluetoothSerial as the transport. The example depends on a modified version of BluetoothSerial which makes ACL more accessible. It also depends on a modified version of libbt.a which has been compiled with BLUEDROID, L2CAP and SDP enabled.
 
 ## Repository Contents
 
diff --git a/examples/ESP32_BluetoothSerial/ESP32_BluetoothSerial.ino b/examples/ESP32_BluetoothSerial/ESP32_BluetoothSerial.ino
@@ -49,7 +49,7 @@
     CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
   (SPP is disabled in the standard libbt.a)
 
-  Tried and tested on: Arduino esp32 v3.1.3 (IDF 5.3) and v3.2.0 (IDF 5.4)
+  Tried and tested on: Arduino esp32 v3.0.7 (IDF 5.1)
 
 */
 
@@ -161,12 +161,12 @@ void setup()
   
   esp_sdp_init();
 
-  esp_bluetooth_sdp_raw_record_t record = {(esp_bluetooth_sdp_types_t)0};
-  record.hdr.type = ESP_SDP_TYPE_RAW;
-  record.hdr.uuid.len = sizeof(UUID_IAP2);
-  memcpy(record.hdr.uuid.uuid.uuid128, UUID_IAP2, sizeof(UUID_IAP2));
-  record.hdr.service_name_length = strlen(sdp_service_name) + 1;
-  record.hdr.service_name = (char *)sdp_service_name;
+  esp_bluetooth_sdp_hdr_overlay_t record = {(esp_bluetooth_sdp_types_t)0};
+  record.type = ESP_SDP_TYPE_RAW;
+  record.uuid.len = sizeof(UUID_IAP2);
+  memcpy(record.uuid.uuid.uuid128, UUID_IAP2, sizeof(UUID_IAP2));
+  record.service_name_length = strlen(sdp_service_name) + 1;
+  record.service_name = (char *)sdp_service_name;
   esp_sdp_create_record((esp_bluetooth_sdp_record_t *)&record);
 
   // ==============================================================================================================
diff --git a/examples/ESP32_BluetoothSerial/patch/libbt.a b/examples/ESP32_BluetoothSerial/patch/libbt.a
diff --git a/examples/ESP32_BluetoothSerial/src/BluetoothSerial/BluetoothSerial.cpp b/examples/ESP32_BluetoothSerial/src/BluetoothSerial/BluetoothSerial.cpp
@@ -73,9 +73,11 @@ static esp_bd_addr_t _peer_bd_addr;
 static char _remote_name[ESP_BT_GAP_MAX_BDNAME_LEN + 1];
 static bool _isRemoteAddressSet;
 static bool _isMaster;
+#ifdef CONFIG_BT_SSP_ENABLED
 static bool _enableSSP;
 static bool _IO_CAP_INPUT;
 static bool _IO_CAP_OUTPUT;
+#endif
 esp_bt_pin_code_t _pin_code = {0};
 uint8_t _pin_code_len = 0; // Number of valid Bytes in the esp_bt_pin_code_t array
 static esp_spp_sec_t _sec_mask;
@@ -654,7 +656,8 @@ static void esp_bt_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
             esp_bt_gap_pin_reply(param->pin_req.bda, true, _pin_code_len, _pin_code);
         }
         break;
-    case ESP_BT_GAP_CFM_REQ_EVT: // Enum 6 - Security Simple Pairing User Confirmation request.
+#ifdef CONFIG_BT_SSP_ENABLED
+        case ESP_BT_GAP_CFM_REQ_EVT: // Enum 6 - Security Simple Pairing User Confirmation request.
         log_i("ESP_BT_GAP_CFM_REQ_EVT Please compare the numeric value: %d", param->cfm_req.num_val);
         if (confirm_request_callback)
         {
@@ -669,10 +672,11 @@ static void esp_bt_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
             esp_bt_gap_ssp_confirm_reply(param->cfm_req.bda, true);
         }
         break;
-
+#endif
     case ESP_BT_GAP_KEY_NOTIF_EVT: // Enum 7 - Security Simple Pairing Passkey Notification
         log_i("ESP_BT_GAP_KEY_NOTIF_EVT passkey:%d", param->key_notif.passkey);
         break;
+#ifdef CONFIG_BT_SSP_ENABLED
     case ESP_BT_GAP_KEY_REQ_EVT: // Enum 8 - Security Simple Pairing Passkey request
         log_i("ESP_BT_GAP_KEY_REQ_EVT Please enter passkey!");
         if (key_request_callback)
@@ -686,7 +690,7 @@ static void esp_bt_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
             esp_bt_gap_ssp_confirm_reply(param->cfm_req.bda, false);
         }
         break;
-
+#endif
     case ESP_BT_GAP_READ_RSSI_DELTA_EVT: // Enum 9 - Read rssi event
         log_i("ESP_BT_GAP_READ_RSSI_DELTA_EVT Read rssi event");
         break;
@@ -741,9 +745,11 @@ static void esp_bt_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
               param->acl_disconn_cmpl_stat.reason, param->acl_disconn_cmpl_stat.handle);
         break;
 
+#if false
     case ESP_BT_GAP_ENC_CHG_EVT: // Enum 21
         log_i("ESP_BT_GAP_ENC_CHG_EVT");
         break;
+#endif
 
     default:
         log_i("ESP-BT_GAP_* unknown message: %d", event);
@@ -824,7 +830,8 @@ static bool _init_bt(const char *deviceName, bt_mode mode)
     esp_bluedroid_status_t bt_state = esp_bluedroid_get_status();
     if (bt_state == ESP_BLUEDROID_STATUS_UNINITIALIZED)
     {
-
+//#ifdef CONFIG_BT_SSP_ENABLED
+#if false
         // Start with SSP
         esp_bluedroid_config_t bluedroid_cfg = BT_BLUEDROID_INIT_CONFIG_DEFAULT();
         if (_enableSSP == false)
@@ -835,6 +842,13 @@ static bool _init_bt(const char *deviceName, bt_mode mode)
             log_e("initialize bluedroid failed");
             return false;
         }
+#else
+        if (esp_bluedroid_init())
+        {
+            log_e("initialize bluedroid failed");
+            return false;
+        }
+#endif
     }
 
     if (bt_state != ESP_BLUEDROID_STATUS_ENABLED)
@@ -867,8 +881,10 @@ static bool _init_bt(const char *deviceName, bt_mode mode)
     }
 
     log_i("device name set");
-    esp_bt_gap_set_device_name(deviceName);
+    esp_bt_dev_set_device_name(deviceName);
+    //esp_bt_gap_set_device_name(deviceName);
 
+#ifdef CONFIG_BT_SSP_ENABLED
     if (_enableSSP)
     {
         log_i("Simple Secure Pairing");
@@ -892,6 +908,7 @@ static bool _init_bt(const char *deviceName, bt_mode mode)
         }
         esp_bt_gap_set_security_param(param_type, &iocap, sizeof(uint8_t));
     }
+#endif
 
     _aclConnected = false;
 
@@ -1104,6 +1121,7 @@ void BluetoothSerial::memrelease()
     esp_bt_mem_release(ESP_BT_MODE_BTDM);
 }
 
+#ifdef CONFIG_BT_SSP_ENABLED
 void BluetoothSerial::onConfirmRequest(ConfirmRequestCb cb)
 {
     confirm_request_callback = cb;
@@ -1118,6 +1136,7 @@ void BluetoothSerial::respondPasskey(uint32_t passkey)
 {
     esp_bt_gap_ssp_passkey_reply(current_bd_addr, true, passkey);
 }
+#endif
 
 void BluetoothSerial::onAuthComplete(AuthCompleteCb cb)
 {
@@ -1135,6 +1154,7 @@ esp_err_t BluetoothSerial::register_callback(esp_spp_cb_t callback)
     return ESP_OK;
 }
 
+#ifdef CONFIG_BT_SSP_ENABLED
 // Enable Simple Secure Pairing (using generated PIN)
 // This must be called before calling begin, otherwise has no effect!
 void BluetoothSerial::enableSSP()
@@ -1179,6 +1199,8 @@ void BluetoothSerial::disableSSP()
     _enableSSP = false;
 }
 
+#else
+
 bool BluetoothSerial::setPin(const char *pin, uint8_t pin_code_len)
 {
     if (pin_code_len == 0 || pin_code_len > 16)
@@ -1190,6 +1212,7 @@ bool BluetoothSerial::setPin(const char *pin, uint8_t pin_code_len)
     memcpy(_pin_code, pin, pin_code_len);
     return (esp_bt_gap_set_pin(ESP_BT_PIN_TYPE_FIXED, _pin_code_len, _pin_code) == ESP_OK);
 }
+#endif
 
 bool BluetoothSerial::connect(String remoteName)
 {
diff --git a/examples/ESP32_BluetoothSerial/src/BluetoothSerial/BluetoothSerial.h b/examples/ESP32_BluetoothSerial/src/BluetoothSerial/BluetoothSerial.h
@@ -56,16 +56,21 @@ class BluetoothSerial : public Stream {
   void onData(BluetoothSerialDataCb cb);
   esp_err_t register_callback(esp_spp_cb_t callback);
 
+#ifdef CONFIG_BT_SSP_ENABLED
   void onConfirmRequest(ConfirmRequestCb cb);
   void onKeyRequest(KeyRequestCb cb);
   void respondPasskey(uint32_t passkey);
+#endif
   void onAuthComplete(AuthCompleteCb cb);
   void confirmReply(boolean confirm);
 
+#ifdef CONFIG_BT_SSP_ENABLED
   void enableSSP();
   void enableSSP(bool inputCapability, bool outputCapability);
   void disableSSP();
+#else
   bool setPin(const char *pin, uint8_t pin_code_len);
+#endif
   bool connect(String remoteName);
   bool connect(
     uint8_t remoteAddress[], int channel = 0, esp_spp_sec_t sec_mask = (ESP_SPP_SEC_ENCRYPT | ESP_SPP_SEC_AUTHENTICATE),
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=SparkFun Apple Accessory Arduino Library
-version=1.0.2
+version=3.0.7.0
 author=SparkFun Electronics <techsupport@sparkfun.com>
 maintainer=SparkFun Electronics <sparkfun.com>
 sentence=An Arduino library for SparkFun Apple Accessories
diff --git a/src/esp32/SparkFun_Apple_Accessory_Arduino_Library.a b/src/esp32/SparkFun_Apple_Accessory_Arduino_Library.a
