From 06be9999d22bcdda25ce092b9e9f5d995225c265 Mon Sep 17 00:00:00 2001 From: Ronald Moesbergen Date: Thu, 12 Oct 2023 10:03:54 +0200 Subject: [PATCH 1/6] fix: don't show code preview by default (fixes #49) (#67) --------- Co-authored-by: Jefta --- src/app/domain/robot.type.ts | 2 +- src/app/state/app.state.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/domain/robot.type.ts b/src/app/domain/robot.type.ts index 8e69687f..0fb3745f 100644 --- a/src/app/domain/robot.type.ts +++ b/src/app/domain/robot.type.ts @@ -10,6 +10,6 @@ export class RobotType { public libs: string[], public isWired: boolean = true, public showLeaphyExtra: boolean = true, - public showCodeOnStart: boolean = true + public showCodeOnStart: boolean = false ) { } } diff --git a/src/app/state/app.state.ts b/src/app/state/app.state.ts index 02fafe27..21aef669 100644 --- a/src/app/state/app.state.ts +++ b/src/app/state/app.state.ts @@ -19,7 +19,7 @@ export class AppState { ['Leaphy Original Extension', 'Leaphy Extra Extension', 'Servo', 'Adafruit GFX Library', 'Adafruit SSD1306', 'Adafruit LSM9DS1 Library', 'Adafruit Unified Sensor'] ); private static leaphyFlitzRobotType = new RobotType('l_flitz', 'Leaphy Flitz', 'flitz.svg', 'Arduino UNO', 'arduino:avr:uno', 'hex', 'arduino:avr', - ['Leaphy Extra Extension', 'Servo', 'Adafruit GFX Library', 'Adafruit SSD1306', 'Adafruit LSM9DS1 Library', 'Adafruit Unified Sensor'], true, false, false + ['Leaphy Extra Extension', 'Servo', 'Adafruit GFX Library', 'Adafruit SSD1306', 'Adafruit LSM9DS1 Library', 'Adafruit Unified Sensor'], true, false ); private static leaphyClickRobotType = new RobotType('l_click', 'Leaphy Click', 'click.svg', 'Arduino UNO', 'arduino:avr:uno', 'hex', 'arduino:avr', ['Leaphy Extra Extension', 'Servo'] @@ -28,14 +28,14 @@ export class AppState { ['Leaphy Extra Extension', 'Servo', 'Adafruit GFX Library', 'Adafruit SSD1306', 'Adafruit LSM9DS1 Library', 'Adafruit Unified Sensor'] ); private static leaphyWiFiRobotType = new RobotType('l_wifi', 'Leaphy WiFi', 'wifi.svg', 'NodeMCU', 'esp8266:esp8266:nodemcuv2', 'bin', 'esp8266:esp8266', - ['Leaphy WiFi Extension', 'Leaphy Extra Extension', 'Servo', 'Adafruit GFX Library', 'Adafruit SSD1306', 'Adafruit LSM9DS1 Library', 'Adafruit Unified Sensor'], false + ['Leaphy WiFi Extension', 'Leaphy Extra Extension', 'Servo', 'Adafruit GFX Library', 'Adafruit SSD1306', 'Adafruit LSM9DS1 Library', 'Adafruit Unified Sensor'] ); public static genericRobotType = new RobotType('l_code', 'Generic Robot', null, 'Arduino UNO', 'arduino:avr:uno', 'hex', 'arduino:avr', ['Leaphy Original Extension', 'Leaphy Extra Extension', 'Servo', 'Adafruit GFX Library', 'Adafruit SSD1306', 'Adafruit LSM9DS1 Library', 'Adafruit Unified Sensor'] ); private static leaphyFlitzNanoRobotType = new RobotType('l_flitz_nano', 'Flitz Nano', 'flitz_nano.svg', 'Arduino Nano', 'arduino:avr:nano', 'hex', 'arduino:avr', - ['Leaphy Extra Extension', 'Servo', 'Adafruit GFX Library', 'Adafruit SSD1306', 'Adafruit LSM9DS1 Library', 'Adafruit Unified Sensor'], true, false, false + ['Leaphy Extra Extension', 'Servo', 'Adafruit GFX Library', 'Adafruit SSD1306', 'Adafruit LSM9DS1 Library', 'Adafruit Unified Sensor'], true, false ); private static arduinoNanoRobotType = new RobotType('l_nano', 'Arduino Nano', 'nano.svg', 'Arduino NANO', 'arduino:avr:nano', 'hex', 'arduino:avr', From b30e9e380c97f3c201affcd0d68cf887ba0a73e0 Mon Sep 17 00:00:00 2001 From: Ronald Moesbergen Date: Mon, 16 Oct 2023 12:27:27 +0200 Subject: [PATCH 2/6] chore: add servo block to flitz nano toolbox (fixes #55) (#70) --- src/assets/blockly/leaphy-toolbox.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/assets/blockly/leaphy-toolbox.xml b/src/assets/blockly/leaphy-toolbox.xml index 0a84c005..2ef007a2 100644 --- a/src/assets/blockly/leaphy-toolbox.xml +++ b/src/assets/blockly/leaphy-toolbox.xml @@ -190,6 +190,14 @@ + + + + + 90 + + + From 83128b431910ff33cdb2428fdef5c73f812a7a9d Mon Sep 17 00:00:00 2001 From: Ronald Moesbergen Date: Sat, 21 Oct 2023 17:40:19 +0200 Subject: [PATCH 3/6] feat: use nano blocks for the flitz nano (#71) --- package.json | 2 +- src/assets/blockly/leaphy-toolbox.xml | 6 +++--- yarn.lock | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index f2e0362d..a3451423 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@angular/platform-browser-dynamic": "~15.2.9", "@angular/router": "~15.2.9", "@fortawesome/fontawesome-free": "^6.1.1", - "@leaphy-robotics/leaphy-blocks": "^1.3.5", + "@leaphy-robotics/leaphy-blocks": "^1.3.6", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", "@serialport/parser-readline": "^10.3.0", diff --git a/src/assets/blockly/leaphy-toolbox.xml b/src/assets/blockly/leaphy-toolbox.xml index 2ef007a2..5fd46af9 100644 --- a/src/assets/blockly/leaphy-toolbox.xml +++ b/src/assets/blockly/leaphy-toolbox.xml @@ -140,13 +140,13 @@ - + - + - + diff --git a/yarn.lock b/yarn.lock index ac75fde6..a67d8651 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1737,10 +1737,10 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@leaphy-robotics/leaphy-blocks@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-1.3.5.tgz#1833ee03cb028e19e70d0ba851e1192438461142" - integrity sha512-1ZCOgctklWs7wOFTldxYODOwRc+DKpKkSjvMJbiduyr1Ra6K1kiK2nWciicnW0u1IsR962/32IPZfNKNXjIvgw== +"@leaphy-robotics/leaphy-blocks@^1.3.6": + version "1.3.6" + resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-1.3.6.tgz#69c098f6d41c88e11084bfd26df72678f55a994d" + integrity sha512-cgDvpomvAV429Q7jCKpJF5NIr0OeaLe54a5g3q7HqnbqwrBSx4XWMwwiRNhOCQxkV5fj+0dkDmhgBoN1Owad6Q== dependencies: blockly "^10.1.3" typescript "4.3.2" From 351ddbdcca5b9f037c276e5c92401d179f53ffa2 Mon Sep 17 00:00:00 2001 From: Ronald Moesbergen Date: Sun, 22 Oct 2023 17:07:42 +0200 Subject: [PATCH 4/6] chore: bump blocks to 1.3.7 (#73) --- package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a3451423..20dac5ef 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "Leaphy Webbased", "author": "Leaphy Robotics", "description": "Build Leaphy Arduino programs", - "version": "1.3.1", + "version": "1.6.1", "license": "GPLv3", "main": "src/main.ts", "scripts": { @@ -29,7 +29,7 @@ "@angular/platform-browser-dynamic": "~15.2.9", "@angular/router": "~15.2.9", "@fortawesome/fontawesome-free": "^6.1.1", - "@leaphy-robotics/leaphy-blocks": "^1.3.6", + "@leaphy-robotics/leaphy-blocks": "1.3.7", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", "@serialport/parser-readline": "^10.3.0", diff --git a/yarn.lock b/yarn.lock index a67d8651..56173b53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1737,10 +1737,10 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@leaphy-robotics/leaphy-blocks@^1.3.6": - version "1.3.6" - resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-1.3.6.tgz#69c098f6d41c88e11084bfd26df72678f55a994d" - integrity sha512-cgDvpomvAV429Q7jCKpJF5NIr0OeaLe54a5g3q7HqnbqwrBSx4XWMwwiRNhOCQxkV5fj+0dkDmhgBoN1Owad6Q== +"@leaphy-robotics/leaphy-blocks@1.3.7": + version "1.3.7" + resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-1.3.7.tgz#b61bb0d30b3d3b588a693f9265c8361ff7591646" + integrity sha512-OG1+wuyGEC3c+8HmL6iJowvEhc7fqa6uAVbB/QNXKaUw/1f6tngQdVjWOmmPK/4FIe7JtM0mtpmbrqmb8egjzQ== dependencies: blockly "^10.1.3" typescript "4.3.2" From e815960e92e0b15388056598295233391d3144a0 Mon Sep 17 00:00:00 2001 From: Ronald Moesbergen Date: Sat, 28 Oct 2023 09:23:41 +0200 Subject: [PATCH 5/6] feat: use nano-specific motor blocks for nano-based robots (#74) --- package.json | 2 +- src/assets/blockly/leaphy-toolbox.xml | 24 ++++++++++++++++++++++-- yarn.lock | 8 ++++---- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 20dac5ef..5a86ed7e 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@angular/platform-browser-dynamic": "~15.2.9", "@angular/router": "~15.2.9", "@fortawesome/fontawesome-free": "^6.1.1", - "@leaphy-robotics/leaphy-blocks": "1.3.7", + "@leaphy-robotics/leaphy-blocks": "^1.4.0", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", "@serialport/parser-readline": "^10.3.0", diff --git a/src/assets/blockly/leaphy-toolbox.xml b/src/assets/blockly/leaphy-toolbox.xml index 5fd46af9..863291aa 100644 --- a/src/assets/blockly/leaphy-toolbox.xml +++ b/src/assets/blockly/leaphy-toolbox.xml @@ -198,6 +198,26 @@ + + + + + + 100 + + + + + + + + + + 100 + + + + @@ -739,7 +759,7 @@ - + @@ -749,7 +769,7 @@ - + diff --git a/yarn.lock b/yarn.lock index 56173b53..725a039a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1737,10 +1737,10 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@leaphy-robotics/leaphy-blocks@1.3.7": - version "1.3.7" - resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-1.3.7.tgz#b61bb0d30b3d3b588a693f9265c8361ff7591646" - integrity sha512-OG1+wuyGEC3c+8HmL6iJowvEhc7fqa6uAVbB/QNXKaUw/1f6tngQdVjWOmmPK/4FIe7JtM0mtpmbrqmb8egjzQ== +"@leaphy-robotics/leaphy-blocks@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-1.4.0.tgz#b7bc88548e8b6a82dcc995ebf91d71f986f9d469" + integrity sha512-Cf6ftyRfncvwfeEEUm5E5gbu8JFSFudopYO7xc7n+ErPeeGu+ZWebZ+D6xk4jie147E8RuoTKU3NyATSBNjnZQ== dependencies: blockly "^10.1.3" typescript "4.3.2" From 2a91ad52deefcf6977166f19fe90024819699931 Mon Sep 17 00:00:00 2001 From: Ronald Moesbergen Date: Sat, 28 Oct 2023 13:25:13 +0200 Subject: [PATCH 6/6] fix: remove motor blocks from flitz (#75) --- src/assets/blockly/leaphy-toolbox.xml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/assets/blockly/leaphy-toolbox.xml b/src/assets/blockly/leaphy-toolbox.xml index 863291aa..d1055a8a 100644 --- a/src/assets/blockly/leaphy-toolbox.xml +++ b/src/assets/blockly/leaphy-toolbox.xml @@ -198,26 +198,6 @@ - - - - - - 100 - - - - - - - - - - 100 - - - -