Skip to content

Commit fe57ae3

Browse files
committed
OLED blockly text working
1 parent c36e5fd commit fe57ae3

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

vue-frontend/locales/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"SET_MOTOR_CONTROL": "%1 motor control",
101101
"STOP_MOTOR": "stop motor %1",
102102
"SET_SERVO_ANGLE": "set servo %1 to angle %2",
103-
"SET_OLED": "show the %2 %3 on screen %1",
103+
"SET_OLED": "show %2 on screen %1",
104104
"GET_ANALOG_PIN_VALUE": "analog value of pin %1",
105105
"GET_DIGITAL_PIN_VALUE": "digital value of pin %1",
106106
"WAIT": "wait %1 second(s)",

vue-frontend/locales/nl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"SET_MOTOR_CONTROL": "%1 motor control",
101101
"STOP_MOTOR": "stop motor %1",
102102
"SET_SERVO_ANGLE": "zet servo %1 op hoek %2",
103-
"SET_OLED": "laat de %2 %3 op scherm %1 zien",
103+
"SET_OLED": "laat %2 op scherm %1 zien",
104104
"GET_ANALOG_PIN_VALUE": "analoge waarde van pin %1",
105105
"GET_DIGITAL_PIN_VALUE": "digitale waarde van pin %1",
106106
"WAIT": "wacht %1 seconde(n)",

vue-frontend/src/assets/blockly/oled.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export function load (Blockly, instances) {
2020
"type": "input_dummy",
2121
"name": "INSTANCE",
2222
},
23-
{
23+
/* {
2424
"type": "field_dropdown",
2525
"name": "TYPE",
2626
"options": [
@@ -37,7 +37,7 @@ export function load (Blockly, instances) {
3737
"ANIMATION"
3838
]
3939
]
40-
},
40+
},*/
4141
{
4242
"type": "input_value",
4343
"name": "VALUE",
@@ -60,15 +60,16 @@ export function load (Blockly, instances) {
6060
let type = block.getFieldValue('TYPE');
6161
let instance = block.getFieldValue('INSTANCE');
6262
let code = '';
63-
if (type == "TEXT"){
63+
code = `mirte.setOLEDText('${instance}', ${value})\n`;
64+
/* if (type == "TEXT"){
6465
code = `mirte.setOLEDText('${instance}', ${value})\n`;
6566
}
6667
if (type == "IMAGE"){
6768
code = `mirte.setOLEDImage('${instance}', ${value})\n`;
6869
}
6970
if (type == "ANIMATION"){
7071
code = `mirte.setOLEDAnimation('${instance}', ${value})\n`;
71-
}
72+
}*/
7273
return code;
7374
};
7475

0 commit comments

Comments
 (0)