Skip to content

Commit 4af8c93

Browse files
rikutonsrikutons
committed
Some refactoring and fix minor bugs
1 parent acb51bc commit 4af8c93

File tree

1 file changed

+38
-38
lines changed

1 file changed

+38
-38
lines changed

‎src/lib/ruby-generator/microbit_more.js

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,162 +7,162 @@ export default function (Generator) {
77
Generator.microbitMore_whenButtonPressed = function (block) {
88
block.isStatement = true;
99
const btn = Generator.valueToCode(block, 'BTN', Generator.ORDER_NONE) || null;
10-
return `${Generator.spriteName()}.when(:microbit_more_button_pressed, ${btn}) do\n`;
10+
return `${Generator.spriteName()}.when(:mbit_more_button_pressed, ${btn}) do\n`;
1111
};
1212

1313
Generator.microbitMore_isButtonPressed = function (block) {
1414
const btn = Generator.valueToCode(block, 'BTN', Generator.ORDER_NONE) || null;
15-
return `microbit_more.button_pressed?(${btn})\n`;
15+
return `mbit_more.button_pressed?(${btn})\n`;
1616
};
1717

1818
Generator.microbitMore_whenGesture = function (block) {
1919
block.isStatement = true;
2020
const gesture = Generator.valueToCode(block, 'GESTURE', Generator.ORDER_NONE) || null;
21-
return `${Generator.spriteName()}.when(:microbit_more_gesture, ${gesture}) do\n`;
21+
return `${Generator.spriteName()}.when(:mbit_more_gesture, ${gesture}) do\n`;
2222
};
2323

2424
Generator.microbitMore_displaySymbol = function (block) {
2525
let matrix = Generator.valueToCode(block, 'MATRIX', Generator.ORDER_NONE) || null;
2626
matrix = Generator.prefixLines(matrix, Generator.INDENT);
27-
return `microbit_more.display(\n${matrix}\n)\n`;
27+
return `mbit_more.display(\n${matrix}\n)\n`;
2828
};
2929

3030
Generator.microbitMore_displayText = function (block) {
3131
const text = Generator.valueToCode(block, 'TEXT', Generator.ORDER_NONE) || null;
32-
return `microbit_more.display_text(${text})\n`;
32+
return `mbit_more.display_text(${text})\n`;
3333
};
3434

3535
Generator.microbitMore_displayClear = function () {
36-
return `microbit_more.clear_display\n`;
36+
return `mbit_more.clear_display\n`;
3737
};
3838

3939
Generator.microbitMore_whenTilted = function (block) {
4040
block.isStatement = true;
4141
const direction = Generator.valueToCode(block, 'DIRECTION', Generator.ORDER_NONE) || null;
42-
return `${Generator.spriteName()}.when(:microbit_more_tilted, ${direction}) do\n`;
42+
return `${Generator.spriteName()}.when(:mbit_more_tilted, ${direction}) do\n`;
4343
};
4444

4545
Generator.microbitMore_isTilted = function (block) {
4646
const direction = Generator.valueToCode(block, 'DIRECTION', Generator.ORDER_NONE) || null;
47-
return [`microbit_more.tilted?(${direction})`, Generator.ORDER_ATOMIC];
47+
return [`mbit_more.tilted?(${direction})`, Generator.ORDER_ATOMIC];
4848
};
4949

5050
Generator.microbitMore_getTiltAngle = function (block) {
5151
const direction = Generator.valueToCode(block, 'DIRECTION', Generator.ORDER_NONE) || null;
52-
return [`microbit_more.tilt_angle(${direction})`, Generator.ORDER_ATOMIC];
52+
return [`mbit_more.tilt_angle(${direction})`, Generator.ORDER_ATOMIC];
5353
};
5454

5555
Generator.microbitMore_whenPinConnected = function (block) {
5656
block.isStatement = true;
5757
const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
58-
return `${Generator.spriteName()}.when(:microbit_more_pin_connected, ${pin}) do\n`;
58+
return `${Generator.spriteName()}.when(:mbit_more_pin_connected, ${pin}) do\n`;
5959
};
6060

6161
Generator.microbitMore_isPinConnected = function (block) {
6262
const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
63-
return `microbit_more.pin_connected?(${pin})\n`;
63+
return `mbit_more.pin_connected?(${pin})\n`;
6464
};
6565

6666
Generator.microbitMore_getLightLevel = function () {
67-
return `microbit_more.light_level\n`;
67+
return `mbit_more.light_level\n`;
6868
};
6969

7070
Generator.microbitMore_getTemperature = function () {
71-
return `microbit_more.temperature\n`;
71+
return `mbit_more.temperature\n`;
7272
};
7373

7474
Generator.microbitMore_getCompassHeading = function () {
75-
return `microbit_more.compass_heading\n`;
75+
return `mbit_more.compass_heading\n`;
7676
};
7777

7878
Generator.microbitMore_getPitch = function () {
79-
return `microbit_more.pitch\n`;
79+
return `mbit_more.pitch\n`;
8080
};
8181

8282
Generator.microbitMore_getRoll = function () {
83-
return `microbit_more.roll\n`;
83+
return `mbit_more.roll\n`;
8484
};
8585

8686
Generator.microbitMore_getMagneticForce = function (block) {
8787
const axis = Generator.valueToCode(block, 'AXIS', Generator.ORDER_NONE) || null;
88-
return `microbit_more.get_magnetic_force(${axis})\n`;
88+
return `mbit_more.get_magnetic_force(${axis})\n`;
8989
};
9090

9191
Generator.microbitMore_getAcceleration = function (block) {
9292
const axis = Generator.valueToCode(block, 'AXIS', Generator.ORDER_NONE) || null;
93-
return `microbit_more.get_acceleration(${axis})\n`;
93+
return `mbit_more.get_acceleration(${axis})\n`;
9494
};
9595

9696
Generator.microbitMore_getAnalogValue = function (block) {
9797
const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
98-
return `microbit_more.get_analog_value(${pin})\n`;
98+
return `mbit_more.get_analog_value(${pin})\n`;
9999
};
100100

101101
Generator.microbitMore_getDigitalValue = function (block) {
102102
const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
103-
return `microbit_more.get_digital_value(${pin})\n`;
103+
return `mbit_more.get_digital_value(${pin})\n`;
104104
};
105105

106106
Generator.microbitMore_setPinMode = function (block) {
107107
const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
108-
const mode = Generator.getFieldValue(block, 'MODE') || null;
109-
return `microbit_more.set_pin_mode(${pin}, ${mode})\n`;
108+
const mode = Generator.quote_(Generator.getFieldValue(block, 'MODE')) || null;
109+
return `mbit_more.set_pin_mode(${pin}, ${mode})\n`;
110110
};
111111

112112
Generator.microbitMore_setOutput = function (block) {
113113
const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
114114
const level = Generator.valueToCode(block, 'LEVEL', Generator.ORDER_NONE) || null;
115-
return `microbit_more.set_output(${pin}, ${level})\n`;
115+
return `mbit_more.set_output(${pin}, ${level})\n`;
116116
};
117117

118118
Generator.microbitMore_setPWM = function (block) {
119119
const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
120120
const level = Generator.valueToCode(block, 'LEVEL', Generator.ORDER_NONE) || null;
121-
return `microbit_more.set_pwm(${pin}, ${level})\n`;
121+
return `mbit_more.set_pwm(${pin}, ${level})\n`;
122122
};
123123

124124
Generator.microbitMore_setServo = function (block) {
125125
const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
126126
const angle = Generator.valueToCode(block, 'ANGLE', Generator.ORDER_NONE) || null;
127127
const range = Generator.valueToCode(block, 'RANGE', Generator.ORDER_NONE) || 2000;
128128
const center = Generator.valueToCode(block, 'CENTER', Generator.ORDER_NONE) || 1500;
129-
return `microbit_more.set_servo(${pin}, ${angle}, ${range}, ${center})\n`;
129+
return `mbit_more.set_servo(${pin}, ${angle}, ${range}, ${center})\n`;
130130
};
131131

132132
Generator.microbitMore_setPinEventType = function (block) {
133133
const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
134134
const eventType = Generator.getFieldValue(block, 'EVENT_TYPE') || null;
135-
return `microbit_more.set_pin_event_type(${pin}, ${eventType})\n`;
135+
return `mbit_more.set_pin_event_type(${pin}, ${eventType})\n`;
136136
};
137137

138138
Generator.microbitMore_whenPinEvent = function (block) {
139139
block.isStatement = true;
140140
const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
141141
const event = Generator.getFieldValue(block, 'EVENT') || null;
142-
return `${Generator.spriteName()}.when(:microbit_more_pin_event, ${pin}, ${event}) do\n`;
142+
return `${Generator.spriteName()}.when(:mbit_more_pin_event, ${pin}, ${event}) do\n`;
143143
};
144144

145145
Generator.microbitMore_getPinEventTimestamp = function (block) {
146146
const pin = Generator.valueToCode(block, 'PIN', Generator.ORDER_NONE) || null;
147147
const event = Generator.getFieldValue(block, 'EVENT') || null;
148-
return `microbit_more.get_pin_event_timestamp(${pin}, ${event})\n`;
148+
return `mbit_more.get_pin_event_timestamp(${pin}, ${event})\n`;
149149
};
150150

151151
Generator.microbitMore_getSharedData = function (block) {
152152
const index = Generator.valueToCode(block, 'INDEX', Generator.ORDER_NONE) || null;
153-
return `microbit_more.get_shared_data(${index})\n`;
153+
return `mbit_more.get_shared_data(${index})\n`;
154154
};
155155

156156
Generator.microbitMore_setSharedData = function (block) {
157157
const index = Generator.valueToCode(block, 'INDEX', Generator.ORDER_NONE) || null;
158158
const value = Generator.valueToCode(block, 'VALUE', Generator.ORDER_NONE) || null;
159-
return `microbit_more.get_shared_data(${index}, ${value})\n`;
159+
return `mbit_more.set_shared_data(${index}, ${value})\n`;
160160
};
161161

162162
Generator.microbitMore_whenConnectionChanged = function (block) {
163163
block.isStatement = true;
164164
const state = Generator.getFieldValue(block, 'STATE') || null;
165-
return `${Generator.spriteName()}.when(:microbit_more_connection_changed, ${state}) do\n`;
165+
return `${Generator.spriteName()}.when(:mbit_more_connection_changed, ${state}) do\n`;
166166
};
167167

168168
Generator.microbitMore_menu_buttons = function (block) {
@@ -186,12 +186,12 @@ export default function (Generator) {
186186
};
187187

188188
Generator.microbitMore_menu_touchPins = function (block) {
189-
const touchPins = Generator.quote_(Generator.getFieldValue(block, 'touchPins') || '0');
189+
const touchPins = Generator.getFieldValue(block, 'touchPins') || 0;
190190
return [touchPins, Generator.ORDER_ATOMIC];
191191
};
192192

193193
Generator.microbitMore_menu_gpio = function (block) {
194-
const gpio = Generator.quote_(Generator.getFieldValue(block, 'gpio') || '0');
194+
const gpio = Generator.getFieldValue(block, 'gpio') || 0;
195195
return [gpio, Generator.ORDER_ATOMIC];
196196
};
197197

@@ -201,7 +201,7 @@ export default function (Generator) {
201201
};
202202

203203
Generator.microbitMore_menu_analogIn = function (block) {
204-
const analogIn = Generator.quote_(Generator.getFieldValue(block, 'analogIn') || '0');
204+
const analogIn = Generator.getFieldValue(block, 'analogIn') || 0;
205205
return [analogIn, Generator.ORDER_ATOMIC];
206206
};
207207

@@ -211,12 +211,12 @@ export default function (Generator) {
211211
};
212212

213213
Generator.microbitMore_menu_digitalValue = function (block) {
214-
const digitalValue = Generator.quote_(Generator.getFieldValue(block, 'digitalValue') || '0');
214+
const digitalValue = Generator.getFieldValue(block, 'digitalValue') || 0;
215215
return [digitalValue, Generator.ORDER_ATOMIC];
216216
};
217217

218218
Generator.microbitMore_menu_pinEventTypeMenu = function (block) {
219-
const pinEventTypeMenu = Generator.quote_(Generator.getFieldValue(block, 'pinEventTypeMenu') || 0);
219+
const pinEventTypeMenu = Generator.getFieldValue(block, 'pinEventTypeMenu') || 0;
220220
return [pinEventTypeMenu, Generator.ORDER_ATOMIC];
221221
};
222222

@@ -226,12 +226,12 @@ export default function (Generator) {
226226
};
227227

228228
Generator.microbitMore_menu_sharedDataIndex = function (block) {
229-
const sharedDataIndex = Generator.getFieldValue(block, 'sharedDataIndex') || 'absolute';
229+
const sharedDataIndex = Generator.quote_(Generator.getFieldValue(block, 'sharedDataIndex') || 'absolute');
230230
return [sharedDataIndex, Generator.ORDER_ATOMIC];
231231
};
232232

233233
Generator.microbitMore_menu_connectionStateMenu = function (block) {
234-
const connectionStateMenu = Generator.getFieldValue(block, 'connectionStateMenu') || 'connected';
234+
const connectionStateMenu = Generator.quote_(Generator.getFieldValue(block, 'connectionStateMenu') || 'connected');
235235
return [connectionStateMenu, Generator.ORDER_ATOMIC];
236236
};
237237

0 commit comments

Comments
 (0)