diff --git a/package.json b/package.json index f2e0362d..5a86ed7e 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.5", + "@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/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', diff --git a/src/assets/blockly/leaphy-toolbox.xml b/src/assets/blockly/leaphy-toolbox.xml index 0a84c005..d1055a8a 100644 --- a/src/assets/blockly/leaphy-toolbox.xml +++ b/src/assets/blockly/leaphy-toolbox.xml @@ -140,13 +140,13 @@ - + - + - + @@ -190,6 +190,14 @@ + + + + + 90 + + + @@ -731,7 +739,7 @@ - + @@ -741,7 +749,7 @@ - + diff --git a/yarn.lock b/yarn.lock index ac75fde6..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.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.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"