summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorhathach <[email protected]>2019-05-24 12:37:36 +0700
committerGitHub <[email protected]>2019-05-24 12:37:36 +0700
commit981e227774e824cf5027fdf093e5d21e8a54a5a3 (patch)
tree351c687bcf917b1adfd720b7400997ee18320ee7 /examples
parent69edf13c714c1f334b527cb12a04adb37c352ab3 (diff)
parent5f34c63660348f422d1b3934fd03cee62cbf3092 (diff)
Merge pull request #76 from hathach/develop
fix raw hid inout
Diffstat (limited to 'examples')
-rw-r--r--examples/device/hid_generic_inout/hid_test.js17
-rw-r--r--examples/device/hid_generic_inout/src/usb_descriptors.c2
-rw-r--r--examples/make.mk2
-rw-r--r--examples/rules.mk2
4 files changed, 20 insertions, 3 deletions
diff --git a/examples/device/hid_generic_inout/hid_test.js b/examples/device/hid_generic_inout/hid_test.js
new file mode 100644
index 000000000..d4fc800c7
--- /dev/null
+++ b/examples/device/hid_generic_inout/hid_test.js
@@ -0,0 +1,17 @@
+var HID = require('node-hid');
+var devices = HID.devices();
+var deviceInfo = devices.find( function(d) {
+ var isNRF = d.vendorId===0Xcafe && d.productId===0X4004;
+ return isNRF;
+});
+if( deviceInfo ) {
+ console.log(deviceInfo)
+ var device = new HID.HID( deviceInfo.path );
+ device.on("data", function(data) {console.log(data)});
+
+ device.on("error", function(err) {console.log(err)});
+
+ setInterval(function () {
+ device.write([0x00, 0x01, 0x01, 0x05, 0xff, 0xff]);
+ },500)
+}
diff --git a/examples/device/hid_generic_inout/src/usb_descriptors.c b/examples/device/hid_generic_inout/src/usb_descriptors.c
index 28a487549..3cf0f711b 100644
--- a/examples/device/hid_generic_inout/src/usb_descriptors.c
+++ b/examples/device/hid_generic_inout/src/usb_descriptors.c
@@ -85,7 +85,7 @@ uint8_t const desc_configuration[] =
TUD_CONFIG_DESCRIPTOR(ITF_NUM_TOTAL, 0, CONFIG_TOTAL_LEN, TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, 100),
// Interface number, string index, protocol, report descriptor len, EP In & Out address, size & polling interval
- TUD_HID_INOUT_DESCRIPTOR(ITF_NUM_HID, 0, HID_PROTOCOL_NONE, sizeof(desc_hid_report), 0x80 | EPNUM_HID, EPNUM_HID, 16, 10)
+ TUD_HID_INOUT_DESCRIPTOR(ITF_NUM_HID, 0, HID_PROTOCOL_NONE, sizeof(desc_hid_report), 0x80 | EPNUM_HID, EPNUM_HID, CFG_TUD_HID_BUFSIZE, 10)
};
diff --git a/examples/make.mk b/examples/make.mk
index b71c75280..73e339d84 100644
--- a/examples/make.mk
+++ b/examples/make.mk
@@ -27,7 +27,7 @@ else
endif
# Build directory
-BUILD = build-$(BOARD)
+BUILD = _build/build-$(BOARD)
# Board specific
include $(TOP)/hw/bsp/$(BOARD)/board.mk
diff --git a/examples/rules.mk b/examples/rules.mk
index 213d9a5a1..07840f6ff 100644
--- a/examples/rules.mk
+++ b/examples/rules.mk
@@ -100,7 +100,7 @@ size: $(BUILD)/$(BOARD)-firmware.elf
-@echo ''
clean:
- rm -rf build-$(BOARD)
+ rm -rf $(BUILD)
# Flash binary using Jlink
ifeq ($(OS),Windows_NT)