From: Gerhard Sittig <redacted>
Date: Sat, 25 Feb 2023 17:21:53 +0000 (+0100)
Subject: serial_bt: add support for JL AC6328 chips (RFCOMM and BLE)
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d0a73799c9dca7711198bd34296371c91af48c53;p=libsigrok.git

serial_bt: add support for JL AC6328 chips (RFCOMM and BLE)

Add support for the JL AC6328B chip which happens to communicate both
RFCOMM (traditional Bluetooth) as well as BLE.

Support was tested with ATORCH USB loads and meters. Add a few product
names so that scans can list the "cable" when detected. Suggest to users
(as part of scan result output) that RFCOMM channel 2 is needed which is
not the default number.
---

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 8bd78eba..7499e15f 100644
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -1572,6 +1572,7 @@ struct sr_serial_dev_inst {
 		SER_BT_CONN_BLE122,	/**!< BLE, BLE122 module, indications */
 		SER_BT_CONN_NRF51,	/**!< BLE, Nordic nRF51, notifications */
 		SER_BT_CONN_CC254x,	/**!< BLE, TI CC254x, notifications */
+		SER_BT_CONN_AC6328,	/**!< BLE, JL AC6328B, notifications */
 		SER_BT_CONN_MAX,	/**!< sentinel */
 	} bt_conn_type;
 	char *bt_addr_local;
diff --git a/src/serial_bt.c b/src/serial_bt.c
index 23b4dd6c..ba2edab0 100644
--- a/src/serial_bt.c
+++ b/src/serial_bt.c
@@ -80,7 +80,11 @@ static const struct scan_supported_item {
 } scan_supported_items[] = {
 	{ "121GW", SER_BT_CONN_BLE122, NULL, },
 	{ "Adafruit Bluefruit LE 8134", SER_BT_CONN_NRF51, NULL, },
+	{ "DL24M_BLE", SER_BT_CONN_AC6328, NULL, },
+	{ "DL24M_SPP", SER_BT_CONN_RFCOMM, "/channel=2", },
 	{ "HC-05", SER_BT_CONN_RFCOMM, NULL, },
+	{ "UC96_BLE", SER_BT_CONN_AC6328, NULL, },
+	{ "UC96_SPP", SER_BT_CONN_RFCOMM, "/channel=2", },
 	{ "UM25C", SER_BT_CONN_RFCOMM, NULL, },
 	{ NULL, SER_BT_CONN_UNKNOWN, NULL, },
 };
@@ -108,6 +112,7 @@ static const char *ser_bt_conn_names[SER_BT_CONN_MAX] = {
 	[SER_BT_CONN_BLE122] = "ble122",
 	[SER_BT_CONN_NRF51] = "nrf51",
 	[SER_BT_CONN_CC254x] = "cc254x",
+	[SER_BT_CONN_AC6328] = "ac6328",
 };
 
 static enum ser_bt_conn_t lookup_conn_name(const char *name)
@@ -286,6 +291,16 @@ static int ser_bt_parse_conn_spec(
 		if (cccd_val)
 			*cccd_val = 0x0001;
 		break;
+	case SER_BT_CONN_AC6328:
+		if (read_hdl)
+			*read_hdl = 12;
+		if (write_hdl)
+			*write_hdl = 15;
+		if (cccd_hdl)
+			*cccd_hdl = 13;
+		if (cccd_val)
+			*cccd_val = 0x0001;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -469,6 +484,7 @@ static int ser_bt_open(struct sr_serial_dev_inst *serial, int flags)
 	case SER_BT_CONN_BLE122:
 	case SER_BT_CONN_NRF51:
 	case SER_BT_CONN_CC254x:
+	case SER_BT_CONN_AC6328:
 		rc = sr_bt_config_notify(desc,
 			read_hdl, write_hdl, cccd_hdl, cccd_val);
 		if (rc < 0)
@@ -501,6 +517,7 @@ static int ser_bt_open(struct sr_serial_dev_inst *serial, int flags)
 	case SER_BT_CONN_BLE122:
 	case SER_BT_CONN_NRF51:
 	case SER_BT_CONN_CC254x:
+	case SER_BT_CONN_AC6328:
 		rc = sr_bt_connect_ble(desc);
 		if (rc < 0)
 			return SR_ERR;
@@ -577,6 +594,7 @@ static int ser_bt_write(struct sr_serial_dev_inst *serial,
 	case SER_BT_CONN_BLE122:
 	case SER_BT_CONN_NRF51:
 	case SER_BT_CONN_CC254x:
+	case SER_BT_CONN_AC6328:
 		/*
 		 * Assume that when applications call the serial layer's
 		 * write routine, then the BLE chip/module does support
@@ -642,6 +660,7 @@ static int ser_bt_read(struct sr_serial_dev_inst *serial,
 		case SER_BT_CONN_BLE122:
 		case SER_BT_CONN_NRF51:
 		case SER_BT_CONN_CC254x:
+		case SER_BT_CONN_AC6328:
 			dlen = sr_ser_has_queued_data(serial);
 			rc = sr_bt_check_notify(serial->bt_desc);
 			if (rc < 0)
@@ -739,6 +758,7 @@ static int bt_source_cb(int fd, int revents, void *cb_data)
 		case SER_BT_CONN_BLE122:
 		case SER_BT_CONN_NRF51:
 		case SER_BT_CONN_CC254x:
+		case SER_BT_CONN_AC6328:
 			dlen = sr_ser_has_queued_data(serial);
 			rc = sr_bt_check_notify(serial->bt_desc);
 			if (rc < 0)