Compare commits

..

2 Commits

Author SHA1 Message Date
e0c8f65a65 1.4.3 2019-10-09 09:57:53 -07:00
a4e02dcd03 add block to stop program (#943)
* add block to stop program

* renaming
2019-10-09 09:30:42 -07:00
11 changed files with 39 additions and 18 deletions

View File

@ -0,0 +1,18 @@
# exit Program
Stops the program and returns to the brick menu
```sig
brick.exitProgram();
```
## Example
Do a sequence of motor commands and stop the program.
```blocks
motors.largeA.run(50)
pause(500)
motors.stopAll()
brick.exitProgram();
```

View File

@ -26,6 +26,7 @@ namespace brick {
*/ */
//% blockId=brickBatteryProperty block="battery %property" //% blockId=brickBatteryProperty block="battery %property"
//% group="Battery" //% group="Battery"
//% blockGap=8
//% help=brick/battery-property //% help=brick/battery-property
export function batteryInfo(property: BatteryProperty): number { export function batteryInfo(property: BatteryProperty): number {
const info = sensors.internal.getBatteryInfo(); const info = sensors.internal.getBatteryInfo();

View File

@ -85,7 +85,7 @@ namespace brick {
//% blockId=buttonIsPressed //% blockId=buttonIsPressed
//% parts="brick" //% parts="brick"
//% blockNamespace=brick //% blockNamespace=brick
//% weight=81 blockGap=8 //% weight=81
//% group="Buttons" //% group="Buttons"
//% button.fieldEditor="brickbuttons" //% button.fieldEditor="brickbuttons"
isPressed() { isPressed() {

View File

@ -1,9 +1,6 @@
#include "pxt.h" #include "pxt.h"
#include "ev3const.h" #include "ev3const.h"
#include <sys/stat.h>
#include <sys/types.h>
namespace output { namespace output {
/** /**
@ -20,7 +17,6 @@ Buffer createBuffer(int size) {
namespace pxt { namespace pxt {
void target_init() { void target_init() {
mkdir(SETTINGSDIR, 0777);
} }
} }

View File

@ -1,5 +1,3 @@
#define PXT_GC_THREAD_LIST 1 #define PXT_GC_THREAD_LIST 1
#define PXT_IN_ISR() false #define PXT_IN_ISR() false
#define SETTINGSDIR "/mnt/ramdisk/settings"

13
libs/ev3/brick.ts Normal file
View File

@ -0,0 +1,13 @@
namespace brick {
/**
* Exits the program to the main menu. (in the simulator restarts it)
*/
//% blockId=loopstop block="exit program"
//% help=reference/brick/exit-program
//% weight=10
//% blockGap=8
//% group="Buttons"
export function exitProgram() {
control.reset();
}
}

View File

@ -1,6 +1,6 @@
//% color="#68C3E2" weight=100 icon="\uf106" //% color="#68C3E2" weight=100 icon="\uf106"
//% groups='["Buttons", "Screen", "Battery"]' //% groups='["Buttons", "Screen", "Power"]'
//% labelLineWidth=60 //% labelLineWidth=60
namespace brick { namespace brick {
} }

View File

@ -2,8 +2,9 @@
"name": "ev3", "name": "ev3",
"description": "The EV3 library", "description": "The EV3 library",
"files": [ "files": [
"README.md", "README.md",
"ns.ts", "ns.ts",
"brick.ts",
"startup.ts", "startup.ts",
"images.jres", "images.jres",
"images.ts", "images.ts",
@ -23,8 +24,7 @@
"touch-sensor": "file:../touch-sensor", "touch-sensor": "file:../touch-sensor",
"ultrasonic-sensor": "file:../ultrasonic-sensor", "ultrasonic-sensor": "file:../ultrasonic-sensor",
"gyro-sensor": "file:../gyro-sensor", "gyro-sensor": "file:../gyro-sensor",
"infrared-sensor": "file:../infrared-sensor", "infrared-sensor": "file:../infrared-sensor"
"settings": "file:../settings"
}, },
"palette": [ "palette": [
"#ffffff", "#ffffff",

View File

@ -1,4 +0,0 @@
{
"name": "settings",
"additionalFilePath": "../../node_modules/pxt-common-packages/libs/settings---files"
}

View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-ev3", "name": "pxt-ev3",
"version": "1.4.2", "version": "1.4.3",
"description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode", "description": "LEGO MINDSTORMS EV3 for Microsoft MakeCode",
"private": false, "private": false,
"keywords": [ "keywords": [

View File

@ -18,8 +18,7 @@
"libs/screen", "libs/screen",
"libs/ev3", "libs/ev3",
"libs/storage", "libs/storage",
"libs/broadcast", "libs/broadcast"
"libs/settings"
], ],
"simulator": { "simulator": {
"autoRun": true, "autoRun": true,