Skip to content

Commit 9f6a4f2

Browse files
authored
Merge pull request #444 from sensebox/fix/bitmap-type
fix bitmap type
2 parents 44c7312 + 759f154 commit 9f6a4f2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/components/Blockly/blocks/sensebox-led.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ Blockly.Blocks["sensebox_ws2812_matrix_showBitmap"] = {
326326
"Port",
327327
);
328328
this.appendValueInput("input")
329-
.setCheck("Bitmap")
329+
.setCheck(Types.BITMAP.typeName)
330330
.appendField(Blockly.Msg.senseBox_ws2812_rgb_matrix_bitmap);
331331
this.setPreviousStatement(true, null);
332332
this.setNextStatement(true, null);
@@ -355,7 +355,7 @@ Blockly.Blocks["sensebox_ws2812_matrix_bitmap"] = {
355355
"BITMAP",
356356
);
357357

358-
this.setOutput(true, "Bitmap");
358+
this.setOutput(true, Types.BITMAP.typeName);
359359
this.setTooltip(Blockly.Msg.senseBox_ws2812_rgb_matrix_bitmap_tooltip);
360360
this.setHelpUrl(Blockly.Msg.senseBox_ws2812_rgb_matrix_helpurl);
361361

@@ -366,14 +366,14 @@ Blockly.Blocks["sensebox_ws2812_matrix_custom_bitmap"] = {
366366
init: function () {
367367
this.setHelpUrl(Blockly.Msg.senseBox_ws2812_rgb_matrix_helpurl);
368368
this.setColour(getColour().sensebox);
369-
this.appendValueInput("input")
369+
this.appendDummyInput("input")
370370
.appendField("{")
371371
.appendField(
372372
new FieldMultilineInput(
373373
Blockly.Msg.senseBox_ws2812_rgb_matrix_custom_bitmap_example,
374374
),
375375
"input",
376-
).setCheck(Types.BITMAP.getCompatibleTypes)
376+
)
377377
.appendField("}");
378378
this.setOutput(true, Types.BITMAP.typeName);
379379
this.setTooltip(
@@ -898,7 +898,7 @@ Blockly.defineBlocksWithJsonArray([
898898
colour: "#000000",
899899
},
900900
],
901-
output: "Bitmap",
901+
output: Types.BITMAP.typeName,
902902
colour: getColour().sensebox,
903903
tooltip: Blockly.Msg.senseBox_ws2812_rgb_matrix_draw_bitmap_tooltip,
904904
helpUrl: Blockly.Msg.senseBox_ws2812_rgb_matrix_helpurl,

src/components/Blockly/blocks/sensebox-sensors.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ Blockly.Blocks["sensebox_tof_imager"] = {
338338
},
339339
updateShape_(isAltitude) {
340340
if (isAltitude) {
341-
this.setOutput(true, "Bitmap");
341+
this.setOutput(true, Types.BITMAP.typeName);
342342
if (this.getInput("extraField") == null) {
343343
this.appendDummyInput("extraField")
344344
// .setAlign(Blockly.inputs.Align.RIGHT) // This doesnt work for manual data input

0 commit comments

Comments
 (0)