From 594ead703c0d6b1f48446eb7b941fba0af328810 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 26 Feb 2018 15:59:36 -0800 Subject: [PATCH] fixing mood block (#349) --- .../docs/reference/brick/show-mood.md | 0 libs/{mood => ev3}/mood.ts | 0 libs/ev3/pxt.json | 6 +++--- libs/mood/README.md | 3 --- libs/mood/pxt.json | 15 --------------- pxtarget.json | 5 ++--- 6 files changed, 5 insertions(+), 24 deletions(-) rename libs/{mood => ev3}/docs/reference/brick/show-mood.md (100%) rename libs/{mood => ev3}/mood.ts (100%) delete mode 100644 libs/mood/README.md delete mode 100644 libs/mood/pxt.json diff --git a/libs/mood/docs/reference/brick/show-mood.md b/libs/ev3/docs/reference/brick/show-mood.md similarity index 100% rename from libs/mood/docs/reference/brick/show-mood.md rename to libs/ev3/docs/reference/brick/show-mood.md diff --git a/libs/mood/mood.ts b/libs/ev3/mood.ts similarity index 100% rename from libs/mood/mood.ts rename to libs/ev3/mood.ts diff --git a/libs/ev3/pxt.json b/libs/ev3/pxt.json index 764a9871..760c241b 100644 --- a/libs/ev3/pxt.json +++ b/libs/ev3/pxt.json @@ -6,7 +6,8 @@ "ns.ts", "startup.ts", "images.jres", - "images.ts" + "images.ts", + "mood.ts" ], "dependencies": { "base": "file:../base", @@ -17,8 +18,7 @@ "touch-sensor": "file:../touch-sensor", "ultrasonic-sensor": "file:../ultrasonic-sensor", "gyro-sensor": "file:../gyro-sensor", - "infrared-sensor": "file:../infrared-sensor", - "mood": "file:../mood" + "infrared-sensor": "file:../infrared-sensor" }, "public": true } diff --git a/libs/mood/README.md b/libs/mood/README.md deleted file mode 100644 index 30472f26..00000000 --- a/libs/mood/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# mood - -A package to put the EV3 in various moods. \ No newline at end of file diff --git a/libs/mood/pxt.json b/libs/mood/pxt.json deleted file mode 100644 index 0533f738..00000000 --- a/libs/mood/pxt.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "mood", - "description": "The EV3 mood library", - "files": [ - "README.md", - "mood.ts" - ], - "testFiles": [ - ], - "public": true, - "dependencies": { - "core": "file:../core", - "music": "file:../music" - } -} \ No newline at end of file diff --git a/pxtarget.json b/pxtarget.json index 7142bc5f..fbd8f8ae 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -15,13 +15,12 @@ "libs/ultrasonic-sensor", "libs/infrared-sensor", "libs/gyro-sensor", - "libs/chassis", - "libs/mood", + "libs/screen", "libs/ev3", + "libs/chassis", "libs/storage", "libs/datalog", "libs/tests", - "libs/screen", "libs/game", "libs/automation" ],