Merge branch 'release/v0.9.0'

platformio · Dec 28, 2017 · 9ecacb4 · 9ecacb4
2 parents 871f679 + d4cb4e6
commit 9ecacb4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 100 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release Notes
 
+## 0.9.0 (2017-12-28)
+
+* Upgraded to PIO Core 3.5.0
+* Pre-install PIO Home in pair with PIO Core (resolve issue with "timeout")
+* Fixed issue with PIO Core update/upgrade commands (issue [#62](https://github.com/platformio/platformio-vscode-ide/issues/62))
+
 ## 0.8.2 (2017-12-02)
 
 * Fixed issue with broken PIO Home and user's Python <2.7.9 (Windows). Automatically install compatible Python

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "platformio-ide",
-  "version": "0.8.2",
+  "version": "0.9.0",
   "preview": true,
   "displayName": "PlatformIO IDE",
   "description": "Official PlatformIO IDE for IoT, Arduino, ARM mbed, Espressif (ESP8266/ESP32), STM32, PIC32, nRF51/nRF52, FPGA, CMSIS, SPL, AVR, Samsung ARTIK, libOpenCM3",
@@ -86,11 +86,6 @@
         "title": "Serial Monitor",
         "category": "PlatformIO"
       },
-      {
-        "command": "platformio-ide.initProject",
-        "title": "Initialize or Update Project",
-        "category": "PlatformIO"
-      },
       {
         "command": "platformio-ide.rebuildProjectIndex",
         "title": "Rebuild IntelliSense Index",
@@ -113,10 +108,6 @@
       }
     ],
     "keybindings": [
-      {
-        "command": "platformio-ide.initProject",
-        "key": "ctrl+alt+i"
-      },
       {
         "command": "platformio-ide.build",
         "key": "ctrl+alt+b"
@@ -177,7 +168,7 @@
         },
         "platformio-ide.useDevelopmentPIOCore": {
           "type": "boolean",
-          "default": false,
+          "default": true,
           "description": "Use development version of PlatformIO Core"
         },
         "platformio-ide.autoRebuildAutocompleteIndex": {
@@ -229,7 +220,7 @@
   "dependencies": {
     "fs-plus": "^3.0.0",
     "ini": "^1.3.4",
-    "platformio-node-helpers": "^0.2.8"
+    "platformio-node-helpers": "^0.3.0"
   },
   "extensionDependencies": [
     "ms-vscode.cpptools",

diff --git a/src/commands/init.js b/src/commands/init.js
diff --git a/src/constants.js b/src/constants.js
@@ -11,4 +11,4 @@ export const IS_OSX = process.platform == 'darwin';
 export const IS_LINUX = !IS_WINDOWS && !IS_OSX;
 
 export const AUTO_REBUILD_DELAY = 3000;
-export const PIO_CORE_MIN_VERSION = '3.5.0-rc.3';
+export const PIO_CORE_MIN_VERSION = '3.5.0';
diff --git a/src/installer/manager.js b/src/installer/manager.js
@@ -30,7 +30,7 @@ export default class InstallationManager {
         pioCoreMinVersion: PIO_CORE_MIN_VERSION,
         useBuiltinPIOCore: config.get('useBuiltinPIOCore'),
         setUseBuiltinPIOCore: (value) => config.update('platformio-ide.useBuiltinPIOCore', value),
-        useDevelopmentPIOCore: config.get('useDevelopmentPIOCore') || true, // @FIXME: remove "|| true" when released
+        useDevelopmentPIOCore: config.get('useDevelopmentPIOCore'),
         pythonPrompt: new PythonPrompt()
       }),
     ];

diff --git a/src/main.js b/src/main.js
@@ -15,7 +15,6 @@ import InstallationManager from './installer/manager';
 import PIOTasksProvider from './tasks';
 import PIOTerminal from './terminal';
 import ProjectIndexer from './project/indexer';
-import initCommand from './commands/init';
 import vscode from 'vscode';
 
 
@@ -115,10 +114,6 @@ class PlatformIOVSCodeExtension {
       () => vscode.commands.executeCommand('vscode.previewHtml', vscode.Uri.parse('platformio-home://'), vscode.ViewColumn.One, 'PIO Home')
     ));
 
-    this._context.subscriptions.push(vscode.commands.registerCommand(
-      'platformio-ide.initProject',
-      initCommand
-    ));
     this._context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.build',
       async () => {
@@ -154,10 +149,6 @@ class PlatformIOVSCodeExtension {
         vscode.commands.executeCommand('workbench.action.tasks.runTask', 'PlatformIO: Monitor');
       }
     ));
-    this._context.subscriptions.push(vscode.commands.registerCommand(
-      'platformio-ide.libraryManager',
-      () => this.pioTerm.sendText('pio lib')
-    ));
     this._context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.newTerminal',
       () => this.pioTerm.new().show()

diff --git a/src/terminal.js b/src/terminal.js
@@ -29,7 +29,7 @@ export default class PIOTerminal {
 
   sendText(text) {
     if (!this._instance) {
-      this.new();
+      this._instance = this.new();
     }
     this._instance.sendText(text);
     this._instance.show();