Updated to CLI version 0.9.0-rc2

Author: spoenemann

arduino-debugger-extension/src/node/debug-adapter/arduino-debug-session.ts

@@ -91,7 +91,7 @@ export class ArduinoDebugSession extends GDBDebugSession {
                     // new Scope('Pins', this.variableHandles.create(pins), false),
                     new Scope('Local', this.variableHandles.create(frame), false),
                     new Scope('Global', GLOBAL_HANDLE_ID, false),
-                    new Scope('Static', STATIC_HANDLES_START + parseInt(args.frameId as any, 10), false)
+                    // new Scope('Static', STATIC_HANDLES_START + parseInt(args.frameId as any, 10), false)
                 ],
             };
 

arduino-debugger-extension/src/node/debug-adapter/arduino-variable-handler.ts

@@ -44,6 +44,28 @@ export class ArduinoVariableHandler {
         return variables;
     }
 
+    /** TODO */
+    async getStaticVariables(frameHandle: number): Promise<DebugProtocol.Variable[]> {
+        throw new Error('Static variables are not supported yet.');
+        const frame = this.frameHandles.get(frameHandle);
+        const result = await this.gdb.sendStackInfoFrame(this.gdb, frame.threadId, frame.frameId);
+        const file = path.normalize(result.frame.file || '');
+        const symbolInfo: any[] = [] // this.symbolTable.getStaticVariables(file);
+        const variables: DebugProtocol.Variable[] = [];
+
+        // Fetch stack depth to obtain frameId/threadId/depth tuple
+        const stackDepth = await mi.sendStackInfoDepth(this.gdb, { maxDepth: 100 });
+        const depth = parseInt(stackDepth.depth, 10);
+
+        for (const symbol of symbolInfo) {
+            const name = `${file}_static_var_${symbol.name}`;
+            const variable = await this.getVariables(frame, name, symbol.name, depth);
+            variables.push(variable);
+        }
+
+        return variables;
+    }
+
     private async getVariables(frame: FrameReference, name: string, expression: string, depth: number): Promise<DebugProtocol.Variable> {
         let global = this.varMgr.getVar(frame.frameId, frame.threadId, depth, name);
 
@@ -79,28 +101,6 @@ export class ArduinoVariableHandler {
         };
     }
 
-    /** TODO */
-    async getStaticVariables(frameHandle: number): Promise<DebugProtocol.Variable[]> {
-        throw new Error('Static variables are not supported yet.');
-        const frame = this.frameHandles.get(frameHandle);
-        const result = await this.gdb.sendStackInfoFrame(this.gdb, frame.threadId, frame.frameId);
-        const file = path.normalize(result.frame.file || '');
-        const symbolInfo: any[] = [] // this.symbolTable.getStaticVariables(file);
-        const variables: DebugProtocol.Variable[] = [];
-
-        // Fetch stack depth to obtain frameId/threadId/depth tuple
-        const stackDepth = await mi.sendStackInfoDepth(this.gdb, { maxDepth: 100 });
-        const depth = parseInt(stackDepth.depth, 10);
-
-        for (const symbol of symbolInfo) {
-            const name = `${file}_static_var_${symbol.name}`;
-            const variable = await this.getVariables(frame, name, symbol.name, depth);
-            variables.push(variable);
-        }
-
-        return variables;
-    }
-
     async handlePinStatusRequest(): Promise<DebugProtocol.Variable[]> {
         const variables: DebugProtocol.Variable[] = [];
         variables.push({

arduino-ide-extension/scripts/download-cli.js

@@ -10,7 +10,7 @@
 
 (() => {
 
-    const DEFAULT_VERSION = '0.7.1'; // require('moment')().format('YYYYMMDD');
+    const DEFAULT_VERSION = '0.9.0-rc2'; // require('moment')().format('YYYYMMDD');
 
     const path = require('path');
     const shell = require('shelljs');