Merge pull request #78 from leaphy-robotics/main

Main pull to stability
leaphy-robotics · Oct 28, 2023 · 62efe15 · 62efe15
2 parents 3be8095 + 2c9cb29
commit 62efe15
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -140,13 +140,13 @@
 		</block>
 	</category>
   <category id="l_flitz_nano" toolboxitemid="l_flitz" name="%{BKY_LEAPHY_FLITZ_CATEGORY}" categorystyle="leaphy_category">
-    <block type="leaphy_flitz_read_stomach_sensor">
+    <block type="leaphy_flitz_nano_read_stomach_sensor">
     </block>
     <sep gap="8"></sep>
-    <block type="leaphy_flitz_read_hand_sensor">
+    <block type="leaphy_flitz_nano_read_hand_sensor">
     </block>
     <sep gap="8"></sep>
-    <block type="leaphy_flitz_led">
+    <block type="leaphy_flitz_nano_led">
       <value name="FLITZ_LED_R">
         <shadow type="math_number">
           <field name="NUM">
@@ -190,6 +190,14 @@
         </shadow>
       </value>
     </block>
+    <sep gap="8"></sep>
+	<block type="leaphy_servo_write">
+		<value name="SERVO_ANGLE">
+			<shadow type="math_number">
+				<field name="NUM">90</field>
+			</shadow>
+		</value>
+	</block>
   </category>
 	<category id="l_click" toolboxitemid="l_click" name="%{BKY_LEAPHY_CLICK_CATEGORY}" categorystyle="leaphy_category">
 		<block type="leaphy_io_digitalwrite">
@@ -731,7 +739,7 @@
 			</value>
 		</block>
 		<sep gap="8"></sep>
-		<block type="leaphy_original_set_motor">
+		<block type="leaphy_nano_set_motor">
 			<value name="MOTOR_SPEED">
 				<shadow type="math_number">
 					<field name="NUM">
@@ -741,7 +749,7 @@
 			</value>
 		</block>
 		<sep gap="8"></sep>
-		<block type="leaphy_original_move_motors">
+		<block type="leaphy_nano_move_motors">
 			<value name="MOTOR_SPEED">
 				<shadow type="math_number">
 					<field name="NUM">

diff --git 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"