From cd750f51a30e83f6f2b09a6ac445950ad4f42cce Mon Sep 17 00:00:00 2001
From: Peli de Halleux <pelikhan@users.noreply.github.com>
Date: Tue, 12 Mar 2019 08:25:48 -0700
Subject: [PATCH] support for hex template (#1913)

---
 libs/core/pxt.json                           | 1 +
 libs/servo/_locales/servo-jsdoc-strings.json | 8 +++++---
 libs/servo/_locales/servo-strings.json       | 2 +-
 package.json                                 | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libs/core/pxt.json b/libs/core/pxt.json
index 73eb7d6f..15d29ecb 100644
--- a/libs/core/pxt.json
+++ b/libs/core/pxt.json
@@ -47,6 +47,7 @@
         "advmath.cpp",
         "trig.cpp",
         "fixed.ts",
+        "templates.ts",
         "parts/speaker.svg",
         "parts/headphone.svg"
     ],
diff --git a/libs/servo/_locales/servo-jsdoc-strings.json b/libs/servo/_locales/servo-jsdoc-strings.json
index df01b8b9..fbd92f4a 100644
--- a/libs/servo/_locales/servo-jsdoc-strings.json
+++ b/libs/servo/_locales/servo-jsdoc-strings.json
@@ -4,9 +4,11 @@
   "servos.Servo.run": "Set the throttle on a continuous servo",
   "servos.Servo.run|param|speed": "the throttle of the motor from -100% to 100%",
   "servos.Servo.setAngle": "Set the servo angle",
-  "servos.Servo.setRange": "Configure the range support by the servo between 0 and 180",
+  "servos.Servo.setPulse": "Set the pulse width to the servo in microseconds",
+  "servos.Servo.setPulse|param|micros": "the width of the pulse in microseconds",
+  "servos.Servo.setRange": "Set the possible rotation range angles for the servo between 0 and 180",
   "servos.Servo.setRange|param|maxAngle": "the maximum angle from 90 to 180",
   "servos.Servo.setRange|param|minAngle": "the minimum angle from 0 to 90",
-  "servos.Servo.setStopOnNeutral": "Sets a mode where the servo is stopped when the angle is neutral (0%).",
-  "servos.Servo.setStopOnNeutral|param|on": "true to enable this mode"
+  "servos.Servo.setStopOnNeutral": "Set a servo stop mode so it will stop when the rotation angle is in the neutral position, 90 degrees.",
+  "servos.Servo.stop": "Stop sending commands to the servo so that its rotation will stop at the current position."
 }
\ No newline at end of file
diff --git a/libs/servo/_locales/servo-strings.json b/libs/servo/_locales/servo-strings.json
index b25e3ae5..0c0ebb0d 100644
--- a/libs/servo/_locales/servo-strings.json
+++ b/libs/servo/_locales/servo-strings.json
@@ -6,7 +6,7 @@
   "servos.Servo.setAngle|block": "set %servo angle to %degrees=protractorPicker °",
   "servos.Servo.setPulse|block": "set %servo pulse to %micros μs",
   "servos.Servo.setRange|block": "set %servo range from %minAngle to %maxAngle",
-  "servos.Servo.setStopOnNeutral|block": "set %servo stop on neutral %on",
+  "servos.Servo.setStopOnNeutral|block": "set %servo stop on neutral %enabled",
   "servos.Servo.stop|block": "stop %servo",
   "{id:category}Servos": "Servos",
   "{id:group}Configuration": "Configuration",
diff --git a/package.json b/package.json
index c015c951..59531d25 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@types/web-bluetooth": "0.0.4"
   },
   "dependencies": {
-    "pxt-common-packages": "6.4.12",
-    "pxt-core": "5.5.15"
+    "pxt-common-packages": "6.5.3",
+    "pxt-core": "5.5.24"
   }
 }