Merge branch 'master' into f/serial

Author: arekzaluski

LICENSE

@@ -1,14 +1,22 @@
+The MIT License (MIT)
 
-DAP.JS
-
+Copyright (c) Arm Limited 2018
 Copyright (c) Microsoft Corporation
 
-All rights reserved.�
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -89,7 +89,3 @@ await this.target.reset();
 API documentation can be viewed at:
 
 https://armmbed.github.io/dapjs/docs/
-
-## Code of Conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

src/dap/utils.ts

@@ -1,5 +1,5 @@
 import * as MemoryMap from "nrf-intel-hex";
-import {Utils} from "../dap/utils";
+import {isBufferBinary} from "../util";
 
 export class FlashSection {
     constructor(public address: number, public data: Uint32Array) {
@@ -40,7 +40,7 @@ export class FlashProgram {
     constructor(public sections: FlashSection[]) {}
 
     public static fromArrayBuffer(buffer: ArrayBuffer): FlashProgram {
-        if (Utils.isBufferBinary(buffer)) {
+        if (isBufferBinary(buffer)) {
             return FlashProgram.fromBinary(0, new Uint32Array(buffer));
         }
         const bufferString = Buffer.from(buffer).toString("utf8");

src/targets/FlashProgram.ts

@@ -25,6 +25,11 @@ export class HID {
     private epIn: USBEndpoint;
     private epOut: USBEndpoint;
     private useControlTransfer: boolean;
+    private packetSize = 64;
+    private controlTransferGetReport = 0x01;
+    private controlTransferSetReport = 0x09;
+    private controlTransferOutReport = 0x200;
+    private controlTransferInReport = 0x100;
 
     constructor(device: USBDevice) {
         this.device = device;
@@ -72,15 +77,14 @@ export class HID {
             return this.device.transferOut(this.epOut.endpointNumber, buffer);
         } else {
             // Device does not have out endpoint. Send data using control transfer
-            const buffer = bufferExtend(data, 64);
-            const interfaceNumber = this.interface.interfaceNumber;
+            const buffer = bufferExtend(data, this.packetSize);
             return this.device.controlTransferOut(
                 {
                     requestType: "class",
                     recipient: "interface",
-                    request: 0x09,
-                    value: 0x200,
-                    index: interfaceNumber
+                    request: this.controlTransferSetReport,
+                    value: this.controlTransferOutReport,
+                    index: this.interface.interfaceNumber
                 },
                 buffer
             );
@@ -93,16 +97,15 @@ export class HID {
             return this.device.transferIn(this.epIn.endpointNumber, reportSize)
                 .then(res => res.data);
         } else {
-            const interfaceNumber = this.interface.interfaceNumber;
             return this.device.controlTransferIn(
                 {
                     requestType: "class",
                     recipient: "interface",
-                    request: 0x01,
-                    value: 0x100,
-                    index: interfaceNumber
+                    request: this.controlTransferGetReport,
+                    value: this.controlTransferInReport,
+                    index: this.interface.interfaceNumber
                 },
-                64
+                this.packetSize
             ).then(res => res.data);
         }
     }

src/transport/hid.ts

@@ -113,3 +113,18 @@ export const hexBytes = (bytes: number[]) => {
 
     return r.toUpperCase();
 };
+
+export const isBufferBinary = (buffer: ArrayBuffer): boolean => {
+    // detect if buffer contains text or binary data
+    const lengthToCheck = buffer.byteLength > 50 ? 50 : buffer.byteLength;
+    const bufferString = Buffer.from(buffer).toString("utf8");
+    for (let i = 0; i < lengthToCheck; i++) {
+        const charCode = bufferString.charCodeAt(i);
+        // 65533 is a code for unknown character
+        // 0-8 are codes for control characters
+        if (charCode === 65533 || charCode <= 8) {
+            return true;
+        }
+    }
+    return false;
+};

src/util.ts

@@ -15,7 +15,7 @@
         "max-line-length": [false],
         "member-ordering": [true, { "order": ["static-field", "instance-field", "constructor", "static-method", "instance-method"] }],
         "no-bitwise": false,
-        "no-console": [false],
+        "no-console": [true],
         "no-empty-interface": false,
         "no-floating-promises": true,
         "no-trailing-whitespace": [true],