diff --git a/simpleExpression_blocks.js b/simpleExpression_blocks.js index 91a1cdd..8c3bf98 100644 --- a/simpleExpression_blocks.js +++ b/simpleExpression_blocks.js @@ -1,26 +1,40 @@ +Facilino.LANG_COLOUR_SCREEN_LEDSTRIP = '#8EAC32'; +Facilino.locales.defaultLanguage["LANG_SUBCATERGORY_WS2812"]="LED Strip"; +Facilino.locales.defaultLanguage["LANG_SIMPLEEXPRESSIONS_PIN"]="PIN"; +Facilino.locales.defaultLanguage["LANG_SIMPLEEXPRESSIONS_SHOWMOUTH_TOOLTIP"]="Draw an expression on the WS2812 led strip (ring-7)"; + Blockly.Blocks['show_mouth'] = { - category: 'SimpleExpressions', - colour: '#fbb117', - helpUrl: Facilino.getHelpUrl('show_mouth'), - tags: [], - examples: [], - init: function() { - this.appendDummyInput() - .appendField("showMouth"); - this.appendValueInput("Color") - .setCheck(null) - .appendField("Color"); - this.setColour("#fbb117"); - this.setTooltip(""); - } + category: Facilino.locales.getKey('LANG_CATEGORY_SCREEN'), + subcategory: Facilino.locales.getKey('LANG_SUBCATERGORY_WS2812'), + category_colour: Facilino.LANG_COLOUR_SCREEN, + colour: Facilino.LANG_COLOUR_SCREEN_LEDSTRIP, + helpUrl: Facilino.getHelpUrl('show_mouth'), + tags: [], + examples: [], + init: function() { + this.appendDummyInput('').appendField("WS2812 7-Ring").appendField(new Blockly.FieldImage('img/blocks/led_strip.svg', 40*options.zoom, 40*options.zoom)); + this.appendValueInput('PIN').appendField(Facilino.locales.getKey('LANG_SIMPLEEXPRESSIONS_PIN')).setAlign(Blockly.ALIGN_RIGHT).setCheck(Number); + this.appendDummyInput('').appendField('Expression').appendField(new Blockly.FieldDropdown([['Zeros','zeros'],['Happy Small','happySmall'],['Happy Full','happyFull'],['Sad Small','sadSmall'],['Sad Full','sadFull'],['Neutral','neutral'],['Circle','circle'],['Center','center'],['Hook','hook'],['Upsidedown Hook','upsidedownhook'],['Kooh','kooh'],['Upsidedown Kooh','upsidedownkooh'],['Cross','cross'],['Rect','rect'],['Left Arrow','leftarrow'],['Right Arrow','rightarrow'],['Left Half','lefthalf'],['Right Half','righthalf']]),'EXPRESSION').setAlign(Blockly.ALIGN_RIGHT); + var colour = new Blockly.FieldColour('#000000'); + colour.setColours(['#000000','#808080','#C0C0C0','#FFFFFF','#800000','#FF0000','#808000','#FFFF00','#008000','#00FF00','#008080','#00FFFF','#000080','#0000FF','#800080','#FF00FF']).setColumns(4); + this.appendDummyInput('').appendField('Color').appendField(colour,'COLOR').setAlign(Blockly.ALIGN_RIGHT); + this.setPreviousStatement(true,'code'); + this.setNextStatement(true,'code'); + this.setColour(Facilino.LANG_COLOUR_SCREEN_LEDSTRIP); + this.setTooltip(""); +} }; - - + Blockly.Arduino['show_mouth'] = function(block) { - var input_color = Blockly.Arduino.valueToCode(block, 'Color', Blockly.Arduino.ORDER_ATOMIC); - var code='SimpleExpressions.showMouth("'+'mouth_name'+'", ' + color + ')' ; - code+= '\n'; - return code; +var input_expression = this.getFieldValue('EXPRESSION'); +var input_color = this.getFieldValue('COLOR'); +var input_pin = Blockly.Arduino.valueToCode(this,'PIN',Blockly.Arduino.ORDER_ATOMIC) || ''; +Blockly.Arduino.definitions_['define_simpleexpressions_h'] = '#include '; +Blockly.Arduino.setups_['setup_simpleexpressions_mouth'] = 'SimpleExpressions.initMouth('+input_pin+');\n'; +var color_rgb=Facilino.hexToRgb(input_color); +var code='SimpleExpressions.writeMouth("'+input_expression+'",'+color_rgb.r +','+color_rgb.g+','+color_rgb.b+');\n' ; +code+= '\n'; +return code; }; Blockly.Blocks['play_sound'] = { diff --git a/src/SimpleExpressions.cpp b/src/SimpleExpressions.cpp index 0b13ebe..14a9790 100755 --- a/src/SimpleExpressions.cpp +++ b/src/SimpleExpressions.cpp @@ -18,6 +18,21 @@ void SimpleExpressionsClass::init(int aMouthPin, int aBuzzerPin) { clearMouth(); } +void SimpleExpressionsClass::init(int aMouthPin, int aBuzzerPin) { + mouth = Adafruit_NeoPixel(7, aMouthPin, NEO_GRB + NEO_KHZ800); + mouth.begin(); + clearMouth(); +} + +void SimpleExpressionsClass::initBuzzer(int aBuzzerPin) { + buzzerPin = aBuzzerPin; + + #if defined(ESP32) + ledcSetup(ledc_channel, 2000, 8); // channel, max frequency, resolution + ledcAttachPin(aBuzzerPin, ledc_channel); + #endif +} + /////////////////////////////////////////////////////////////////// //-- MOUTHS ----------------------------------------// /////////////////////////////////////////////////////////////////// diff --git a/src/SimpleExpressions.h b/src/SimpleExpressions.h index 0b7fd6c..ca77e94 100755 --- a/src/SimpleExpressions.h +++ b/src/SimpleExpressions.h @@ -16,6 +16,8 @@ class SimpleExpressionsClass public: // General void init(int mouthPin, int buzzerPin); + void initMouth(int mouthPin); + void initBuzzer(int buzzerPin); // Mouths void printMouth(int number, int r, int g, int b);