Merge branch 'develop' of https://github.com/microsoft/vscode-arduino into pre-release-v0.3.4

Author: adiazulay

src/arduino/arduino.ts

@@ -320,15 +320,21 @@ export class ArduinoApp {
             return;
         }
         const cppConfigFile = fs.readFileSync(configFilePath, "utf8");
-        const cppConfig = JSON.parse(cppConfigFile) as { configurations: Array<{ includePath: string[], forcedInclude: string[] }> };
+        const cppConfig = JSON.parse(cppConfigFile) as { configurations: Array<{
+            includePath: string[],
+            forcedInclude: string[],
+            defines: string[],
+        }> };
         const libPaths = this.getDefaultPackageLibPaths();
         const defaultForcedInclude = this.getDefaultForcedIncludeFiles();
+        const defines = this.getDefaultDefines();
         const configuration = cppConfig.configurations[0];
 
         let cppConfigFileUpdated = false;
-        // cpp exntension changes \\ to \\\\ in paths in JSON string, revert them first
+        // cpp extension changes \\ to \\\\ in paths in JSON string, revert them first
         configuration.includePath = configuration.includePath.map((path) => path.replace(/\\\\/g, "\\"));
         configuration.forcedInclude = configuration.forcedInclude.map((path) => path.replace(/\\\\/g, "\\"));
+        configuration.defines = configuration.defines.map((path) => path.replace(/\\\\/g, "\\"));
 
         for (const libPath of libPaths) {
             if (configuration.includePath.indexOf(libPath) === -1) {
@@ -343,6 +349,12 @@ export class ArduinoApp {
             }
         }
 
+        for (const define of defines) {
+            if (configuration.defines.indexOf(define) === -1) {
+                cppConfigFileUpdated = true;
+                configuration.defines.push(define);
+            }
+        }
         // remove all unexisting paths
         // concern mistake removal, comment temporary
         // for (let pathIndex = 0; pathIndex < configuration.includePath.length; pathIndex++) {
@@ -386,6 +398,7 @@ export class ArduinoApp {
         }
 
         const defaultForcedInclude = this.getDefaultForcedIncludeFiles();
+        const defaultDefines = this.getDefaultDefines();
 
         if (!ArduinoWorkspace.rootPath) {
             return;
@@ -444,6 +457,10 @@ export class ArduinoApp {
             configSection.forcedInclude = defaultForcedInclude.concat(configSection.forcedInclude);
         }
 
+        if (!configSection.defines) {
+            configSection.defines = defaultDefines;
+        }
+
         fs.writeFileSync(configFilePath, JSON.stringify(deviceContext, null, 4));
     }
 
@@ -577,6 +594,16 @@ Please make sure the folder is not occupied by other procedures .`);
         }
         const toolsPath = boardDescriptor.platform.rootBoardPath;
         result.push(path.normalize(path.join(toolsPath, "**")));
+        const hardwareToolPath = path.join(toolsPath, "..", "..", "tools");
+        if (fs.existsSync(hardwareToolPath)) {
+            result.push(path.normalize(path.join(hardwareToolPath, "**")));
+        }
+
+        // Add default libraries to include path
+        result.push(path.normalize(path.join(this._settings.defaultLibPath, "**")));
+
+        const userLibsPath = (path.join(this._settings.sketchbookPath, "libraries", "**"));
+        result.push(userLibsPath);
         // if (util.directoryExistsSync(path.join(toolsPath, "cores"))) {
         //     const coreLibs = fs.readdirSync(path.join(toolsPath, "cores"));
         //     if (coreLibs && coreLibs.length > 0) {
@@ -608,6 +635,13 @@ Please make sure the folder is not occupied by other procedures .`);
         return result;
     }
 
+    public getDefaultDefines(): string[] {
+        const result = [];
+        // USBCON is required in order for Serial to be recognized by intellisense
+        result.push("USBCON");
+        return result;
+    }
+
     public openExample(example) {
         function tmpName(name) {
             let counter = 0;

src/serialmonitor/serialMonitor.ts

@@ -22,7 +22,7 @@ export class SerialMonitor implements vscode.Disposable {
     public static DEFAULT_BAUD_RATE: number = 115200;
 
     public static listBaudRates(): number[] {
-        return [300, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 74880, 115200, 230400, 250000];
+        return [300, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 74880, 115200, 230400, 250000, 500000, 1000000, 2000000];
     }
 
     public static getInstance(): SerialMonitor {

src/serialmonitor/serialportctrl.ts

@@ -79,6 +79,11 @@ export class SerialPortCtrl {
               reject(err);
             } else {
               this._outputChannel.appendLine(`[Info] Opened the serial port - ${this._currentPort}`);
+              this._currentSerialPort.set(["dtr=true", "rts=true"], (err) => {
+                if (err) {
+                  reject(err);
+                }
+              });
               resolve();
             }
           });
@@ -164,7 +169,13 @@ export class SerialPortCtrl {
         if (err) {
           reject(err);
         } else {
-          resolve();
+          this._currentSerialPort.set(["dtr=true", "rts=true"], (err) => {
+            if (err) {
+              reject(err);
+            } else {
+              resolve();
+            }
+          });
         }
       });
     });