diff --git a/www/blocs&generateurs/actionneur.js b/www/blocs&generateurs/actionneur.js index 2157befae..5888fbaa3 100644 --- a/www/blocs&generateurs/actionneur.js +++ b/www/blocs&generateurs/actionneur.js @@ -105,8 +105,8 @@ Blockly.Python["notone"]=function(block){ Blockly.Blocks["lp2i_mp3_init"]={init:function(){ var card=window.localStorage.card; this.appendDummyInput().appendField(new Blockly.FieldImage('media/dfplayer.png', 33, 33, "*")).appendField("DFMini Pins") - this.appendDummyInput() .appendField(Blockly.Msg.MP3OS_TX).appendField(new Blockly.FieldDropdown(profile[card].dropdownPWM), "PIN_TX"); - this.appendDummyInput() .appendField(Blockly.Msg.MP3OS_RX).appendField(new Blockly.FieldDropdown(profile[card].dropdownPWM), "PIN_RX"); + this.appendDummyInput() .appendField(Blockly.Msg.MP3OS_TX).appendField(new Blockly.FieldDropdown(profile[card].dropdownAllPins), "PIN_TX"); + this.appendDummyInput() .appendField(Blockly.Msg.MP3OS_RX).appendField(new Blockly.FieldDropdown(profile[card].dropdownAllPins), "PIN_RX"); this.appendValueInput("Volume", "Number").setAlign(Blockly.ALIGN_RIGHT).appendField(Blockly.Msg.lp2i_mp3_Volume); this.appendDummyInput().setAlign(Blockly.ALIGN_RIGHT).appendField(Blockly.Msg.lp2i_mp3_autoplay).appendField(new Blockly.FieldCheckbox("FALSE"), "play"); this.setInputsInline(true); diff --git a/www/blocs&generateurs/ottoesp.js b/www/blocs&generateurs/ottoesp.js index 1c60be547..123dfbdd1 100644 --- a/www/blocs&generateurs/ottoesp.js +++ b/www/blocs&generateurs/ottoesp.js @@ -72,11 +72,12 @@ Blockly.Arduino['otto_home'] = function(block) { }; Blockly.Blocks['otto_calibration']={init:function(){ - this.appendDummyInput() .appendField(Blockly.Msg.OTTO9_CALIBRATION + Blockly.Msg.OTTO9_CALIBRATION_LEG + Blockly.Msg.left) - .appendField(new Blockly.FieldNumber("0"), "LL") .appendField(Blockly.Msg.right) .appendField(new Blockly.FieldNumber("0"), "RL") - this.appendDummyInput() .setAlign(Blockly.ALIGN_RIGHT) .appendField(Blockly.Msg.OTTO9_CALIBRATION_FOOT+ Blockly.Msg.left) - .appendField(new Blockly.FieldNumber("0"), "LF") .appendField(Blockly.Msg.right).appendField(new Blockly.FieldNumber("0"), "RF"); - this.setInputsInline(false); + +this.appendValueInput("LL") .setCheck("Number").appendField(Blockly.Msg.OTTO9_CALIBRATION + Blockly.Msg.OTTO9_CALIBRATION_LEG + Blockly.Msg.left).setAlign(Blockly.ALIGN_RIGHT) +this.appendValueInput("RL") .setCheck("Number").appendField(Blockly.Msg.right) .setAlign(Blockly.ALIGN_RIGHT) +this.appendValueInput("LF") .setCheck("Number").appendField(Blockly.Msg.OTTO9_CALIBRATION_FOOT+ Blockly.Msg.left).setAlign(Blockly.ALIGN_RIGHT) +this.appendValueInput("RF") .setCheck("Number").appendField(Blockly.Msg.right).setAlign(Blockly.ALIGN_RIGHT) + this.setInputsInline(true); this.setPreviousStatement(true); this.setNextStatement(true); this.setColour("#32D900"); @@ -85,13 +86,12 @@ Blockly.Blocks['otto_calibration']={init:function(){ }; Blockly.Arduino['otto_calibration']=function(block){ - var valuell = block.getFieldValue('LL'); - var valuerl = block.getFieldValue('RL'); - var valuelf = block.getFieldValue('LF'); - var valuerf = block.getFieldValue('RF'); - - Blockly.Arduino.setups_['otto_cal']= 'Otto.setTrims('+ valuell +','+ valuerl +',' +valuelf +','+ valuerf+');'; - var code = ''; +var valuell= Blockly.Arduino.valueToCode(block, 'LL', Blockly.Arduino.ORDER_ATOMIC); +var valuerl= Blockly.Arduino.valueToCode(block, 'RL', Blockly.Arduino.ORDER_ATOMIC); +var valuelf= Blockly.Arduino.valueToCode(block, 'LF', Blockly.Arduino.ORDER_ATOMIC); +var valuerf= Blockly.Arduino.valueToCode(block, 'RF', Blockly.Arduino.ORDER_ATOMIC); + + var code = 'Otto.setTrims('+ valuell +','+ valuerl +',' +valuelf +','+ valuerf+');\n'; return code; }; @@ -140,6 +140,24 @@ var code = 'Otto_moveLegs('+TEMPO+','+PIN_YL+','+PIN_YR+','+PIN_RL+','+PIN_RR+') return code; }; +Blockly.Blocks['otto_moveservos'] = {init: function() { + this.appendDummyInput("") .appendField(Blockly.Msg.OTTO9_MOVE_TEXT); + this.appendValueInput("Period") .setCheck("Number").appendField(Blockly.Msg.OTTO9_MOVE_SPEED_TEXT) + this.appendValueInput("Pos") .setCheck("Number").appendField("Positions") + this.setInputsInline(true); + this.setPreviousStatement(true); + this.setNextStatement(true); + this.setColour("#32D900"); + this.setHelpUrl(Blockly.Msg.OTTO9_DIY_URL); } + }; + + Blockly.Arduino['otto_moveservos'] = function(block) { + var Period= Blockly.Arduino.valueToCode(block, 'Period', Blockly.Arduino.ORDER_ATOMIC); + var Pos= Blockly.Arduino.valueToCode(block, 'Pos', Blockly.Arduino.ORDER_ATOMIC); + var code = ' Otto._moveServos('+Period+', '+Pos+');'; + return code; + }; + Blockly.Blocks['otto_move'] = {init: function() { this.appendDummyInput() .appendField(new Blockly.FieldImage('media/otto_bend.png', 33, 33, "*")) .appendField(Blockly.Msg.OTTO9_MOVE_TEXT) .appendField(new Blockly.FieldDropdown(Blockly.Msg.OTTO9_MOVE_CHOICE), "otto_move_sens"); diff --git a/www/css/blocklino.css b/www/css/blocklino.css index 20ca67d01..f0ad4e8c5 100644 --- a/www/css/blocklino.css +++ b/www/css/blocklino.css @@ -7,7 +7,7 @@ html,body { } body { background-color: #2d2d64; - font-family: 'Nunito', sans-serif; + font-family: 'Poppins', sans-serif; margin: 0 } diff --git a/www/examples/Laser_Theremin.xml b/www/examples/Laser_Theremin.xml index 7f9656772..137626670 100644 --- a/www/examples/Laser_Theremin.xml +++ b/www/examples/Laser_Theremin.xml @@ -2,42 +2,12 @@ toolbox_arduino_all - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 8 - - - - - 9 - - - - - 13 - - + + 2 + 3 + 4 + 5 + 13 diff --git a/www/examples/Ottoavoid.xml b/www/examples/Ottoavoid.xml index 072b99204..c87b81506 100644 --- a/www/examples/Ottoavoid.xml +++ b/www/examples/Ottoavoid.xml @@ -1,68 +1,64 @@ toolbox_arduino_all - + - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 8 - - - - - 9 - - - - - 13 - - + + 2 + 3 + 4 + 5 + 13 + + + 1 + 8 + 9 + + - + - - 10 + + LT + + + 1 + + + + + 15 + + - + OttoConfused - - BACKWARD - 1000 + + + + 2 + + + + + BACKWARD + 1000 + + - + - - 3 - + + 4 + - + LEFT 1000 @@ -74,7 +70,7 @@ - + FORWARD 1000 diff --git a/www/examples/Ottobuzzer.xml b/www/examples/Ottobuzzer.xml index f7a705f1d..fcd433ed6 100644 --- a/www/examples/Ottobuzzer.xml +++ b/www/examples/Ottobuzzer.xml @@ -2,92 +2,55 @@ toolbox_arduino_all - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 8 - - - - - 9 - - - - - 13 - - + + 2 + 3 + 4 + 5 + 13 - - 349 - 125 + + S_connection + + + + + + + S_superHappy + + + S_happy - - 349 - 125 + + S_happy_short - - 349 - 125 + + S_sad - - 262 - 125 + + S_confused - - 294 - 125 + + S_cuddly - - 294 - 125 + + S_OhOoh - - 262 - 125 + + S_surprise - - 440 - 125 + + S_buttonPushed - - 440 - 125 + + S_fart1 - - 392 - 125 + + S_sleeping - - 392 - 125 - - - 349 - 125 - - + + S_disconnection diff --git a/www/examples/Ottocalibration.xml b/www/examples/Ottocalibration.xml index aa2ea33fd..c3af3774a 100644 --- a/www/examples/Ottocalibration.xml +++ b/www/examples/Ottocalibration.xml @@ -9,17 +9,35 @@ 5 13 - - 0 - 0 - 0 - 0 - Change the legs and feet values gradually with small values and increments(+5 or - 5 degrees) + + Change the legs and feet values gradually with small values and increments(+1 or - 1 degrees) Iteratively you have to check/upload the code multiple times, until Otto legs and feet looks completely straight. + + + 0 + + + + + 0 + + + + + 0 + + + + + 0 + + - + + Right click Activate this block when you are ready to save the calibration + diff --git a/www/examples/Ottocalibrationapp.xml b/www/examples/Ottocalibrationapp.xml new file mode 100644 index 000000000..e0d9a7a82 --- /dev/null +++ b/www/examples/Ottocalibrationapp.xml @@ -0,0 +1,381 @@ + + toolbox_arduino_all + + You have carefully followed the instructions on how to build Otto and have made sure that all the servos are centralised (set at 90 degrees) before you attach the horns. You are now at the very exciting moment where you check to see how Otto moves and dances and so you upload your first simple Blockly code. + +:( What happened? Why did the legs and feet move out of position? Otto doesnโ€™t look right and doesnโ€™t move smoothly. + +Do not be disappointed and do not worry! This is completely normal and happens in every Otto build. This is the stage where you need to adjust the central positions of the servos using a simple process called calibration. This will only need to be done once and then the correct positions will be remembered every time you turn on your Otto. + + + + int positions[] = {90, 90, 90, 90}; + + + int8_t trims[4] = {0,0,0,0}; + + + + + + + + + 2 + 3 + 4 + 5 + 13 + To calibrate Otto, you will first need to upload this code to Otto. Once the uploading is complete, unplug the USB connection to Otto. + +Servo Calibration GUI +You will now need to run the Servo Calibration software from ottodiy.com. Make sure that the USB is unplugged. Depending on your Windows platform, you will need to run either the 32- or 64- bit executable file contained in its relevant folder. Please leave the file in its folder - the program will not run if it does not have access to the data files.On start up you should see a red cross by the USB label at the top of the interface. Plug the USB into Otto and the red cross should turn into a green tick when the program has recognised that the USB connection has been made (this might take a second or two). If you forgot to unplug the USB, you will need to close the program, unplug the USB and start the program again. Then plug in the USB. You can now calibrate the servo positions so the the legs and feet are correctly aligned. The slider allows for large changes in the angle and the +/- buttons much finer control on the position of each servo. + +When the servos on Otto are correctly aligned, click on 'Walk Test' to see how Otto moves. If further fine adjustments are required, they should be done now and the walk test repeated. Be careful that the USB cable does not interfere with Otto's movement. + +When you are happy that everything is aligned, click 'Save'. A tick and properly aligned Otto will appear on the interface. Your Otto will produce a happy sound (if you have connected the buzzer) and dance. + +CONGRATULATIONS!! You have successfully calibrated Otto's servos. The positions have been saved to Otto and will not need to be calibrated again unless you change the Nano or any of the servos. + + + + v + + + 0 + + + + + 9600 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + readChar + + + + ch + + + 0'...'9 + + + + + v + + + MINUS + + + ADD + + + MULTIPLY + + + v + + + + + 10 + + + + + + + ch + + + + + + + 48 + + + + + + + + + 'a' + + + + + trims[0] = v-90; + + + + + + v + + + 0 + + + + + + + + + + + 'b' + + + + + trims[1] = v-90; + + + + + + v + + + 0 + + + + + + + + + + + 'c' + + + + + trims[2] = v-90; + + + + + + v + + + 0 + + + + + + + + + + + 'd' + + + + + trims[3] = v-90; + + + + + + v + + + 0 + + + + + + + + + + + 'w' + + + + + + + 4 + + + + + FORWARD + 1000 + + + + + + + 's' + + + + + i + + + 0 + + + + + 3 + + + + + 1 + + + + + + + trims[i] + + + + + i + + + + + + + m + + + 500 + + + + + S_superHappy + + + crusaitoRIGHT + 1000 + 25 + + + crusaitoLEFT + 1000 + 25 + + + S_happy_short + + + + + + + + + + + + + + + + + setTrims + + + + + 0 + + + trims[1] + + + + + 0 + + + trims[2] + + + + + 0 + + + trims[3] + + + + + 0 + + + trims[3] + + + + + + + 10 + + + + + 90 + + + positions + + + + + + + + \ No newline at end of file diff --git a/www/examples/Ottodance.xml b/www/examples/Ottodance.xml index 10b54fdf2..38d212255 100644 --- a/www/examples/Ottodance.xml +++ b/www/examples/Ottodance.xml @@ -2,42 +2,12 @@ toolbox_arduino_all - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 8 - - - - - 9 - - - - - 13 - - + + 2 + 3 + 4 + 5 + 13 diff --git a/www/examples/Ottowalk.xml b/www/examples/Ottowalk.xml index 8e39d8229..bb6fd8f9a 100644 --- a/www/examples/Ottowalk.xml +++ b/www/examples/Ottowalk.xml @@ -2,43 +2,13 @@ toolbox_arduino_all - - Here is where your robot is configured, servo pins , sensor and buzzer - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 8 - - - - - 9 - - - - - 13 - - + + 2 + 3 + 4 + 5 + 13 + Here is where your robot is configured, the servo pins connections and buzzer diff --git a/www/examples/RTTL.xml b/www/examples/RTTL.xml index 23b0c5a5e..b672091bc 100644 --- a/www/examples/RTTL.xml +++ b/www/examples/RTTL.xml @@ -1,9 +1,9 @@ - toolbox_arduino_all-esp8266 + toolbox_arduino_all - 14 + 13 Popcorn:d=4,o=5,b=160:8c6,8a#,8c6,8g,8d#,8g,c,8c6,8a#,8c6,8g,8d#,8g,c,8c6,8d6,8d#6,16c6,8d#6,16c6,8d#6,8d6,16a#,8d6,16a#,8d6,8c6,8a#,8g,8a#,c6 @@ -11,7 +11,7 @@ - 14 + 13 countdown:d=4,o=5,b=125:p,8p,16b,16a,b,e,p,8p,16c6,16b,8c6,8b,a,p,8p,16c6,16b,c6,e,p,8p,16a,16g,8a,8g,8f#,8a,g.,16f#,16g,a.,16g,16a,8b,8a,8g,8f#,e,c6,2b.,16b,16c6,16b,16a,1b @@ -19,11 +19,11 @@ - 14 + 13 A_Team - 14 + 13 Indiana diff --git a/www/examples/bluetooth.xml b/www/examples/bluetooth.xml index 11701d583..413281a08 100644 --- a/www/examples/bluetooth.xml +++ b/www/examples/bluetooth.xml @@ -3,18 +3,10 @@ + 11 + 12 9600 1. Initialize as a serial port but to use Bluetooth, in this case using the serial software library to simulate serial port on other pins, PLEASE NOTE THE TX & RX PINS ARE INVERTED FOR THE BLUETOOTH MODULE - - - 12 - - - - - 11 - - Dato diff --git a/www/examples/bobsong.xml b/www/examples/bobsong.xml deleted file mode 100644 index 3cbaab217..000000000 --- a/www/examples/bobsong.xml +++ /dev/null @@ -1,461 +0,0 @@ - - toolbox_arduino_all - - - - black - NUMBER - - - 400 - - - - - white - NUMBER - - - 800 - - - - - quaver - NUMBER - - - 200 - - - - - - - - - - - - - - - - - m - - - 400 - - - - - - - - m - - - 3000 - - - - - - - - - - - - - - - compass2 - - - - - 587 - - - - - 1400 - - - quaver - - - - - 1 - - - - - - - 659 - - - - - 1400 - - - quaver - - - - - 1 - - - - - - - 587 - - - - - 1400 - - - quaver - - - - - 1 - - - - - - - 494 - - - - - 1400 - - - quaver - - - - - 1 - - - - - - - 392 - - - - - 1400 - - - quaver - - - - - 1 - - - - - - - 494 - - - - - 1400 - - - quaver - - - - - 1 - - - - - - - 587 - - - - - 1400 - - - quaver - - - - - 1 - - - - - - - 659 - - - - - 1400 - - - quaver - - - - - 1 - - - - - - - 587 - - - - - 1400 - - - quaver - - - - - 1 - - - - - - - 494 - - - - - 1400 - - - black - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - compass3 - - - - - 587 - - - - - 1400 - - - black - - - - - 1 - - - - - m - - - 150 - - - - - - - 587 - - - - - 1400 - - - black - - - - - 1 - - - - - m - - - 150 - - - - - - - 587 - - - - - 1400 - - - black - - - - - 1 - - - - - m - - - 150 - - - - - - - 587 - - - - - 1400 - - - black - - - - - 1 - - - - - - - - - - - - - - - - - - - compass1 - - - - - 622 - - - - - 1400 - - - - - 1 - - - - - - - 587 - - - - - 1400 - - - quaver - - - - - 1 - - - - - - - - \ No newline at end of file diff --git a/www/examples/dfmini.xml b/www/examples/dfmini.xml index e4e9f8fea..00f03ac32 100644 --- a/www/examples/dfmini.xml +++ b/www/examples/dfmini.xml @@ -3,22 +3,14 @@ + 11 + 12 FALSE 27 - - - 12 - - - - - 11 - - 64 diff --git a/www/examples/dfminitriggers.xml b/www/examples/dfminitriggers.xml index 805e5c376..d0a81ffda 100644 --- a/www/examples/dfminitriggers.xml +++ b/www/examples/dfminitriggers.xml @@ -3,26 +3,25 @@ + 11 + 12 FALSE 27 - - - 12 - - - - - 11 - - 64 0x3C + + + 1 + 8 + 9 + + @@ -43,7 +42,7 @@ - + check @@ -52,17 +51,8 @@ LTE - - - - 8 - - - - - 9 - - + + 1 @@ -121,17 +111,8 @@ LTE - - - - 8 - - - - - 9 - - + + 1 @@ -190,17 +171,8 @@ LTE - - - - 8 - - - - - 9 - - + + 1 @@ -258,17 +230,8 @@ GT - - - - 8 - - - - - 9 - - + + 1 diff --git a/www/examples/examples.json b/www/examples/examples.json index 84929a4d3..c9ceaff8e 100644 --- a/www/examples/examples.json +++ b/www/examples/examples.json @@ -1,9 +1,10 @@ [ {"source_url": "servo.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐Ÿฆฟ Servo centering | Otto DIY Starter","visible": true}, - {"source_url": "Ottocalibration.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐Ÿค– Legs calibration | Otto DIY Starter","visible": true }, - {"source_url": "Ottobuzzer.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐Ÿ”ˆ Buzzer | Otto DIY Starter ","visible": true}, - {"source_url": "bobsong.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐ŸŽผ Melody | Otto DIY Starter ","visible": true}, - {"source_url": "RTTL.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐ŸŽผ RTTL | Otto DIY Starter ","visible": true}, + {"source_url": "Ottocalibration.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐Ÿค– Basic calibration | Otto DIY Starter","visible": true }, + {"source_url": "Ottocalibrationapp.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐Ÿค– Proper calibration with App | Otto DIY Starter","visible": true }, + {"source_url": "Ottobuzzer.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐Ÿ”ˆ Otto sounds | Otto DIY Starter ","visible": true}, + {"source_url": "melody.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐ŸŽผ Melody | Otto DIY Starter ","visible": true}, + {"source_url": "RTTL.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐ŸŽผ Ring Tone sounds | Otto DIY Starter ","visible": true}, {"source_url": "Ottowalk.xml", "source_text": "๐Ÿ‘ถLevel 1 | ๐Ÿค– Walk | Otto DIY Starter", "visible": true }, {"source_url": "Ottodance.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐Ÿค– Dance | Otto DIY Starter","visible": true}, {"source_url": "Ottoavoid.xml","source_text": "๐Ÿ‘ถLevel 1 | ๐Ÿค– Avoid obstacles | Otto DIY Starter","visible": true}, @@ -11,7 +12,6 @@ {"source_url": "touch.xml","source_text": "๐Ÿ‘จโ€๐Ÿ’ปLevel 2 | ๐Ÿ‘‡ Touch interaction | +sensor","visible": true}, {"source_url": "noise.xml","source_text": "๐Ÿ‘จโ€๐Ÿ’ปLevel 2 | ๐Ÿ‘ Sound interaction | +sensor","visible": true}, {"source_url": "serialnoise.xml","source_text": "๐Ÿ‘จโ€๐Ÿ’ปLevel 2 | ๐Ÿ‘ Serial noise readings | +sensor","visible": true }, - {"source_url": "serialpot.xml","source_text": "๐Ÿ‘จโ€๐Ÿ’ปLevel 2 | ๐ŸŽ›๏ธ Serial Potentiometer | +sensor","visible": true }, {"source_url": "touchsoundultra.xml","source_text": "๐Ÿ‘จโ€๐Ÿ’ปLevel 2 | ๐Ÿ‘‡ Avoid, touch & noise | +sensor","visible": true}, {"source_url": "matrixtest.xml","source_text": "๐Ÿ‘จโ€๐Ÿ’ปLevel 2 | ๐Ÿ‘„ 8x8 LED Matrix Test | +mouth","visible": true }, {"source_url": "matrixmouths.xml","source_text": "๐Ÿ‘จโ€๐Ÿ’ปLevel 2 | ๐Ÿ‘„ Mouths Emotions | +mouth","visible": true }, @@ -30,7 +30,6 @@ {"source_url": "dfmini.xml","source_text": "๐Ÿ‘จโ€๐Ÿš€Level 3 | ๐Ÿ”Š MP3 basic | +dfmini","visible": true }, {"source_url": "dfminitriggers.xml","source_text": "๐Ÿ‘จโ€๐Ÿš€Level 3 | ๐Ÿ”Š MP3 Triggers | +dfmini","visible": true }, {"source_url": "Laser_Theremin.xml","source_text": "๐Ÿ‘จโ€๐Ÿš€Level 3 | โšก Laser_Theremin | +sensor","visible": true }, - {"source_url": "gyro.xml","source_text": "๐Ÿ‘จโ€๐Ÿš€Level 3 | โš–๏ธ Gyro | +sensor","visible": true }, {"source_url": "oled.xml","source_text": "๐Ÿ‘จโ€๐Ÿš€Level 3 | ๐Ÿ–ฅ๏ธ OLED Display | +screen","visible": true}, {"source_url": "oledframe.xml","source_text": "๐Ÿ‘จโ€๐Ÿš€Level 3 | ๐Ÿ–ฅ๏ธ OLED Frame | +screen","visible": true}, {"source_url": "oledicon.xml","source_text": "๐Ÿ‘จโ€๐Ÿš€Level 3 | ๐Ÿ–ฅ๏ธ OLED Icon | +screen","visible": true}, diff --git a/www/examples/gyro.xml b/www/examples/gyro.xml deleted file mode 100644 index 7e8e6f789..000000000 --- a/www/examples/gyro.xml +++ /dev/null @@ -1,1588 +0,0 @@ - - toolbox_arduino_all - - - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 8 - - - - - 9 - - - - - 13 - - - - - HELLO - - - lineMouth - - - - - - - - - - - - - ax - - - - - - - Hi Otto - - - ax - - - - - - - ay - - - - - - - Hi Otto - - - ax - - - - - - - az - - - - - - - Hi Otto - - - ax - - - - - - - 10 - - - - - OttoConfused - - - BACKWARD - 1000 - - - - - 3 - - - - - RIGHT - 1000 - - - - - FORWARD - 1000 - - - smile - - - - - - - - - - - - - - - - - - - - - swing - 1000 - 25 - - - S_fart2 - - - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - FALSE - - - m - - - 200 - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - FALSE - - - SHAKERIGHT - 1000 - - - s - - - 2 - - - - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - - smile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LT - - - - - - 250 - - - - - - - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - - - S_cuddly - - - flappingFRONT - 1000 - 25 - - - - - 2 - - - - - smile - - - moonwalkerLEFT - 1000 - 40 - - - happyClosed - - - moonwalkerRIGHT - 1000 - 40 - - - happyOpen - - - crusaitoRIGHT - 1000 - 40 - - - crusaitoLEFT - 1000 - 40 - - - - - - - - - - - - - - - - - smile - - - - - - - - - - - - - - - - - - GT - - - ax - - - - - 13000 - - - - - - - OttoSleeping - - - - - - - GT - - - ax - - - - - 13000 - - - - - - - heart - - - s - - - 1 - - - - - S_cuddly - - - s - - - 1 - - - - - - - - - - - - - - - LT - - - ax - - - - - -13000 - - - - - - - heart - - - s - - - 1 - - - - - S_cuddly - - - s - - - 1 - - - - - - - - - - - - - - - GT - - - ax - - - - - 13000 - - - - - - - OttoAngry - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/www/examples/matrixcounter.xml b/www/examples/matrixcounter.xml index 09c501bd7..51a6a92fa 100644 --- a/www/examples/matrixcounter.xml +++ b/www/examples/matrixcounter.xml @@ -2,37 +2,45 @@ toolbox_arduino_all - - FALSE - TRUE - FALSE - FALSE - TRUE - FALSE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE + + A1 + A2 + A3 + 0 + + + FALSE + TRUE + FALSE + FALSE + TRUE + FALSE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + TRUE + TRUE + FALSE + FALSE + + diff --git a/www/examples/matrixeyes.xml b/www/examples/matrixeyes.xml index 4fb0f41e6..02fcccf96 100644 --- a/www/examples/matrixeyes.xml +++ b/www/examples/matrixeyes.xml @@ -1,49 +1,18 @@ toolbox_arduino_all - + - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 8 - - - - - 9 - - - - - 13 - - + - - logo_bmp + + + + 15 + + - - Hi! I am Otto + + I am Otto @@ -51,161 +20,330 @@ - + happy_bmp - - BENDRIGHT - 1000 + + s + + + 1 + + - - OttoSuperHappy + + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + TRUE + FALSE + FALSE + FALSE + FALSE + TRUE + FALSE + FALSE + TRUE + FALSE + FALSE + FALSE + FALSE + TRUE + FALSE + FALSE + TRUE + FALSE + FALSE + FALSE + FALSE + TRUE + FALSE + FALSE + TRUE + FALSE + FALSE + FALSE + FALSE + TRUE + FALSE + FALSE + TRUE + FALSE + TRUE + TRUE + FALSE + TRUE + FALSE + FALSE + TRUE + FALSE + TRUE + TRUE + FALSE + TRUE + FALSE + FALSE + TRUE + FALSE + TRUE + TRUE + FALSE + TRUE + FALSE + FALSE + TRUE + FALSE + TRUE + TRUE + FALSE + TRUE + FALSE + FALSE + FALSE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE + FALSE - + s - - 2 - + + 1 + - - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - FALSE - FALSE - TRUE - FALSE - TRUE - TRUE - FALSE - TRUE - FALSE - FALSE - TRUE - FALSE - TRUE - TRUE - FALSE - TRUE - FALSE - FALSE - TRUE - FALSE - TRUE - TRUE - FALSE - TRUE - FALSE - FALSE - TRUE - FALSE - TRUE - TRUE - FALSE - TRUE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE - FALSE + + eyes_bmp - + s - - 2 - + + 1 + + + + angry_bmp + + + s + + + 1 + + + + + angry2_bmp + + + s + + + 1 + + + + + freetful_bmp + + + s + + + 1 + + + + + confused_bmp + + + s + + + 1 + + + + + sleep_bmp + + + s + + + 1 + + + + + love_bmp + + + s + + + 1 + + + + + wave_bmp + + + s + + + 1 + + + + + magic_bmp + + + s + + + 1 + + + + + fail_bmp + + + s + + + 1 + + + + + logo_bmp + + + s + + + 1 + + + + + XX_bmp + + + s + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -219,4 +357,7 @@ + + sad_bmp + \ No newline at end of file diff --git a/www/examples/matrixeyestest.xml b/www/examples/matrixeyestest.xml index 5ab5a2825..7c0857f7a 100644 --- a/www/examples/matrixeyestest.xml +++ b/www/examples/matrixeyestest.xml @@ -1,41 +1,39 @@ toolbox_arduino_all - + - - happy_bmp - + - + - + GTE - - pix + + X - + 16 - - pix + + X - + 0 - - piy + + Y - + 1 @@ -44,73 +42,86 @@ - + TRUE - + 0 - - piy + + Y - - 5 + + 0 - - pix + + X - - pix - - - 1 - - + - - - - EQ - - - piy - - - - - 8 - - + + X + + + 1 - - + + + m + + + 100 + + - - pix - - - 0 + + + + EQ + + + Y + + + + + 8 + + - - - piy + + + X - + 0 + + + Y + + + 0 + + + + + + + - + - + diff --git a/www/examples/matrixhands.xml b/www/examples/matrixhands.xml index 8f4701b3a..72215a0fc 100644 --- a/www/examples/matrixhands.xml +++ b/www/examples/matrixhands.xml @@ -2,8 +2,16 @@ toolbox_arduino_all - - WASH HANDS + + A1 + A2 + A3 + 0 + + + WASH HANDS + + diff --git a/www/examples/matrixmouths.xml b/www/examples/matrixmouths.xml index 45bad526f..308c0413f 100644 --- a/www/examples/matrixmouths.xml +++ b/www/examples/matrixmouths.xml @@ -2,61 +2,69 @@ toolbox_arduino_all - + + A1 + A2 + A3 + 0 - - HI + - - FALSE - TRUE - FALSE - FALSE - TRUE - FALSE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - TRUE - FALSE - TRUE - TRUE - TRUE - TRUE - FALSE - FALSE - FALSE - TRUE - TRUE - FALSE - FALSE + + HI - - s - - - 1 - - + + FALSE + TRUE + FALSE + FALSE + TRUE + FALSE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + TRUE + FALSE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + FALSE + TRUE + TRUE + FALSE + FALSE - - I AM OTTO + + s + + + 1 + + - - s - - - 1 + + I AM OTTO + + + s + + + 1 + + - + diff --git a/www/examples/matrixsing.xml b/www/examples/matrixsing.xml index 1d1520b3a..0fb8cf42e 100644 --- a/www/examples/matrixsing.xml +++ b/www/examples/matrixsing.xml @@ -2,14 +2,22 @@ toolbox_arduino_all - - frame - SHORT_NUMBER - - - 100 + + A1 + A2 + A3 + 0 + + + frame + SHORT_NUMBER + + + 100 + + - + diff --git a/www/examples/matrixtest.xml b/www/examples/matrixtest.xml index f088010ac..80be4cc0c 100644 --- a/www/examples/matrixtest.xml +++ b/www/examples/matrixtest.xml @@ -2,8 +2,16 @@ toolbox_arduino_all - - 27 + + A1 + A2 + A3 + 0 + + + 27 + + @@ -62,34 +70,13 @@ - - TRUE - - - 0 - - - i - - - - - 0 + + m + + + 30 - - j - - - - m - - - 30 - - - - diff --git a/www/examples/melody.xml b/www/examples/melody.xml new file mode 100644 index 000000000..26dba7a8a --- /dev/null +++ b/www/examples/melody.xml @@ -0,0 +1,184 @@ + + toolbox_arduino_all + + + + buzzpin + NUMBER + + + 13 + + + + + + + 349 + 125 + + + 13 + + + buzzpin + + + + + 349 + 125 + + + 13 + + + buzzpin + + + + + 349 + 125 + + + 13 + + + buzzpin + + + + + 261 + 125 + + + 13 + + + buzzpin + + + + + 293 + 125 + + + 13 + + + buzzpin + + + + + 293 + 125 + + + 13 + + + buzzpin + + + + + 261 + 125 + + + 13 + + + buzzpin + + + + + 440 + 125 + + + 13 + + + buzzpin + + + + + 440 + 125 + + + 13 + + + buzzpin + + + + + 392 + 125 + + + 13 + + + buzzpin + + + + + 392 + 125 + + + 13 + + + buzzpin + + + + + 349 + 125 + + + 13 + + + buzzpin + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/www/examples/noise.xml b/www/examples/noise.xml index 1b849d28f..11983e6a3 100644 --- a/www/examples/noise.xml +++ b/www/examples/noise.xml @@ -1,68 +1,30 @@ toolbox_arduino_all - + - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 8 - - - - - 9 - - - - - 13 - - + + 2 + 3 + 4 + 5 + 13 - + - - GT - - - - - - 500 - - + + A6 - + BENDLEFT 1000 - + diff --git a/www/examples/serialdistance.xml b/www/examples/serialdistance.xml index 936f12518..b7c1ae382 100644 --- a/www/examples/serialdistance.xml +++ b/www/examples/serialdistance.xml @@ -4,6 +4,13 @@ 9600 + + + 1 + 8 + 9 + + @@ -19,17 +26,8 @@ text - - - - 8 - - - - - 9 - - + + 1 diff --git a/www/examples/serialnoise.xml b/www/examples/serialnoise.xml index 69a4e596b..5d286abe6 100644 --- a/www/examples/serialnoise.xml +++ b/www/examples/serialnoise.xml @@ -19,13 +19,9 @@ text - - 0 - - - A6 - - + + A6 + 1 diff --git a/www/examples/serialpot.xml b/www/examples/serialpot.xml deleted file mode 100644 index 47c1d5778..000000000 --- a/www/examples/serialpot.xml +++ /dev/null @@ -1,45 +0,0 @@ - - toolbox_arduino_all - - - - 9600 - - - - - - - Potentiometer value: - - - - - - - text - - - 0 - - - A6 - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/www/examples/touch.xml b/www/examples/touch.xml index c4dc8ef14..43a0fede5 100644 --- a/www/examples/touch.xml +++ b/www/examples/touch.xml @@ -1,52 +1,25 @@ toolbox_arduino_all - + - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 8 - - - - - 9 - - - - - 13 - - + + 2 + 3 + 4 + 5 + 13 - + - + + A0 + FALSE + - + updown 1000 25 diff --git a/www/examples/touchsoundultra.xml b/www/examples/touchsoundultra.xml index 4c9b959e1..a2dc60006 100644 --- a/www/examples/touchsoundultra.xml +++ b/www/examples/touchsoundultra.xml @@ -1,108 +1,90 @@ toolbox_arduino_all - + - - - - 2 - - - - - 3 - - - - - 4 - - - - - 5 - - - - - 8 - - - - - 9 - - - - - 13 - - + + 2 + 3 + 4 + 5 + 13 + + + 1 + 8 + 9 + + - + - + + A0 + FALSE + - + updown 1000 25 - + S_superHappy - + - - GTE - - - - - - 700 - - + + A6 - + OttoSleeping - + S_sleeping - + - - 10 + + LT + + + 1 + + + + + 15 + + - + BACKWARD 1000 - - 262 - 125 + + 13 + StarWars - + diff --git a/www/lang/Arduino_cn.js b/www/lang/Arduino_cn.js index 1cf2e92f3..3d9cce7a0 100644 --- a/www/lang/Arduino_cn.js +++ b/www/lang/Arduino_cn.js @@ -69,6 +69,7 @@ Blockly.Msg.CAT_SOUND ="๐ŸŽค Noise" Blockly.Msg.CAT_GAS = "โ›ฝ Gas" Blockly.Msg.CAT_OLED_U8G = "๐Ÿ–ฅ๏ธ OLED ๆ˜พ็คบๅฑ"; Blockly.Msg.CAT_NEOPIXEL = "๐ŸŒˆ Neopixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_CCS811 = "Sensor CO2"; Blockly.Msg.CAT_Displays = "๐Ÿ’ป Displays"; Blockly.Msg.CAT_AUDIO = "โ™ซ Audio"; diff --git a/www/lang/Arduino_cz.js b/www/lang/Arduino_cz.js index 3aa0f6918..24c3985bf 100644 --- a/www/lang/Arduino_cz.js +++ b/www/lang/Arduino_cz.js @@ -64,6 +64,7 @@ Blockly.Msg.CAT_SOUND ="๐ŸŽค Noise" Blockly.Msg.CAT_GAS = "โ›ฝ Gas" Blockly.Msg.CAT_OLED_U8G = "๐Ÿ–ฅ๏ธ OLED"; Blockly.Msg.CAT_NEOPIXEL = "๐ŸŒˆ Neopixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_CCS811 = "โ›… CO2"; Blockly.Msg.CAT_Displays = "๐Ÿ’ป Displays"; Blockly.Msg.CAT_AUDIO = "๐Ÿ”‰ Audio Sound"; diff --git a/www/lang/Arduino_de.js b/www/lang/Arduino_de.js index d4af59f71..27ea8a27e 100644 --- a/www/lang/Arduino_de.js +++ b/www/lang/Arduino_de.js @@ -70,6 +70,7 @@ Blockly.Msg.CAT_SOUND ="๐ŸŽค Noise" Blockly.Msg.CAT_GAS = "โ›ฝ Gas" Blockly.Msg.CAT_OLED_U8G = "โ–€ OLED"; Blockly.Msg.CAT_NEOPIXEL = "โ˜„ Neopixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_CCS811 = "Sensor CO2"; Blockly.Msg.CAT_Displays = "๐Ÿ–ฅ Displays"; Blockly.Msg.CAT_AUDIO = "โ™ซ Audio"; diff --git a/www/lang/Arduino_en.js b/www/lang/Arduino_en.js index fe2de4bf9..d80191ca9 100644 --- a/www/lang/Arduino_en.js +++ b/www/lang/Arduino_en.js @@ -80,9 +80,10 @@ Blockly.Msg.CAT_del = "๐Ÿ’ก LED Single"; Blockly.Msg.CAT_LED = "๐Ÿ’ก LED"; Blockly.Msg.CAT_LEDRGB = "๐Ÿšฅ LED RGB"; Blockly.Msg.CAT_NEOPIXEL = "๐ŸŒˆ NeoPixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_MAX7219 = "๐Ÿ’ก Matrix 8x8"; Blockly.Msg.CAT_MAX1640 = "๐Ÿ’ก Matrix 16x8"; -Blockly.Msg.CAT_BARGRAPH = "๐Ÿ’ก LED Bar Graph"; +Blockly.Msg.CAT_BARGRAPH = "๐Ÿ’ก LED Bars"; Blockly.Msg.CAT_LCDI2C = "๐Ÿ“Ÿ LCD"; Blockly.Msg.CAT_BUZZER="๐ŸŽผ Buzzer"; Blockly.Msg.CAT_AUDIO = "๐Ÿ”‰ Audio Sound"; diff --git a/www/lang/Arduino_es.js b/www/lang/Arduino_es.js index a8ab10dc8..4f56f2a03 100644 --- a/www/lang/Arduino_es.js +++ b/www/lang/Arduino_es.js @@ -77,6 +77,7 @@ Blockly.Msg.CAT_del = "๐Ÿ’ก LED"; Blockly.Msg.CAT_LED = "๐Ÿ’ก LED"; Blockly.Msg.CAT_LEDRGB = "๐Ÿšฅ RGB LED"; Blockly.Msg.CAT_NEOPIXEL = "๐ŸŒˆ NeoPixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_MAX7219 = "๐Ÿ’ก Matriz 8x8"; Blockly.Msg.CAT_MAX1640 = "๐Ÿ’ก Matriz 16x8"; Blockly.Msg.CAT_BARGRAPH = "๐Ÿ’ก Barra LED"; diff --git a/www/lang/Arduino_fr.js b/www/lang/Arduino_fr.js index 83ceda792..40a9ed5f7 100644 --- a/www/lang/Arduino_fr.js +++ b/www/lang/Arduino_fr.js @@ -70,6 +70,7 @@ Blockly.Msg.CAT_SOUND ="๐ŸŽค Noise" Blockly.Msg.CAT_GAS = "โ›ฝ Gas" Blockly.Msg.CAT_OLED_U8G = "โ–€ OLED"; Blockly.Msg.CAT_NEOPIXEL = "โ˜„ Neopixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_CCS811 = "Sensor CO2"; Blockly.Msg.CAT_Displays = "๐Ÿ–ฅ Displays"; Blockly.Msg.CAT_AUDIO = "โ™ซ Audio"; diff --git a/www/lang/Arduino_heb.js b/www/lang/Arduino_heb.js index 0e9b838d4..0849d2c5f 100644 --- a/www/lang/Arduino_heb.js +++ b/www/lang/Arduino_heb.js @@ -70,6 +70,7 @@ Blockly.Msg.CAT_SOUND ="๐ŸŽค Noise" Blockly.Msg.CAT_GAS = "โ›ฝ Gas" Blockly.Msg.CAT_OLED_U8G = "โ–€ OLED"; Blockly.Msg.CAT_NEOPIXEL = "โ˜„ Neopixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_CCS811 = "Sensor CO2"; Blockly.Msg.CAT_Displays = "๐Ÿ–ฅ Displays"; Blockly.Msg.CAT_AUDIO = "โ™ซ Audio"; diff --git a/www/lang/Arduino_hu.js b/www/lang/Arduino_hu.js index d1f2b986d..77138358e 100644 --- a/www/lang/Arduino_hu.js +++ b/www/lang/Arduino_hu.js @@ -68,6 +68,7 @@ Blockly.Msg.CAT_SOUND ="๐ŸŽค Noise" Blockly.Msg.CAT_GAS = "โ›ฝ Gas" Blockly.Msg.CAT_OLED_U8G = "โ–€ OLED"; Blockly.Msg.CAT_NEOPIXEL = "โ˜„ Neopixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_CCS811 = "Sensor CO2"; Blockly.Msg.CAT_Displays = "๐Ÿ–ฅ Displays"; Blockly.Msg.CAT_AUDIO = "โ™ซ Audio"; diff --git a/www/lang/Arduino_it.js b/www/lang/Arduino_it.js index eb46c07aa..5cd2c569a 100644 --- a/www/lang/Arduino_it.js +++ b/www/lang/Arduino_it.js @@ -71,6 +71,7 @@ Blockly.Msg.CAT_SOUND ="๐ŸŽค Noise" Blockly.Msg.CAT_GAS = "โ›ฝ Gas" Blockly.Msg.CAT_OLED_U8G = "OLED"; Blockly.Msg.CAT_NEOPIXEL = "NeoPixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_CCS811 = "CO2 CCS811"; Blockly.Msg.CAT_Displays = "๐Ÿ“บ Display"; Blockly.Msg.CAT_AUDIO = "โ™ซ Audio"; diff --git a/www/lang/Arduino_pl.js b/www/lang/Arduino_pl.js index c620faf4f..94261f4f4 100644 --- a/www/lang/Arduino_pl.js +++ b/www/lang/Arduino_pl.js @@ -70,6 +70,7 @@ Blockly.Msg.CAT_SOUND ="๐ŸŽค Noise" Blockly.Msg.CAT_GAS = "โ›ฝ Gas" Blockly.Msg.CAT_OLED_U8G = "โ–€ OLED"; Blockly.Msg.CAT_NEOPIXEL = "โ˜„ Neopixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_CCS811 = "Sensor CO2"; Blockly.Msg.CAT_Displays = "๐Ÿ–ฅ Displays"; Blockly.Msg.CAT_AUDIO = "โ™ซ Audio"; diff --git a/www/lang/Arduino_pt.js b/www/lang/Arduino_pt.js index 5eb45c992..c55a4f28b 100644 --- a/www/lang/Arduino_pt.js +++ b/www/lang/Arduino_pt.js @@ -70,6 +70,7 @@ Blockly.Msg.CAT_SOUND ="๐ŸŽค Noise" Blockly.Msg.CAT_GAS = "โ›ฝ Gas" Blockly.Msg.CAT_OLED_U8G = "โ–€ OLED"; Blockly.Msg.CAT_NEOPIXEL = "โ˜„ Neopixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_CCS811 = "Sensor CO2"; Blockly.Msg.CAT_Displays = "๐Ÿ–ฅ Displays"; Blockly.Msg.CAT_AUDIO = "โ™ซ Audio"; diff --git a/www/lang/Arduino_ru.js b/www/lang/Arduino_ru.js index e2489ae9d..134bca262 100644 --- a/www/lang/Arduino_ru.js +++ b/www/lang/Arduino_ru.js @@ -70,6 +70,7 @@ Blockly.Msg.CAT_SOUND ="๐ŸŽค Noise" Blockly.Msg.CAT_GAS = "โ›ฝ Gas" Blockly.Msg.CAT_OLED_U8G = "โ–€ OLED"; Blockly.Msg.CAT_NEOPIXEL = "โ˜„ Neopixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_CCS811 = "Sensor CO2"; Blockly.Msg.CAT_Displays = "๐Ÿ–ฅ Displays"; Blockly.Msg.CAT_AUDIO = "โ™ซ Audio"; diff --git a/www/lang/Arduino_tr.js b/www/lang/Arduino_tr.js index c873113cb..b49b6fb1f 100644 --- a/www/lang/Arduino_tr.js +++ b/www/lang/Arduino_tr.js @@ -70,6 +70,7 @@ Blockly.Msg.CAT_SOUND ="๐ŸŽค Noise" Blockly.Msg.CAT_GAS = "โ›ฝ Gas" Blockly.Msg.CAT_OLED_U8G = "โ–€ OLED"; Blockly.Msg.CAT_NEOPIXEL = "โ˜„ Neopixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; Blockly.Msg.CAT_CCS811 = "Sensor CO2"; Blockly.Msg.CAT_Displays = "๐Ÿ–ฅ Displays"; Blockly.Msg.CAT_AUDIO = "โ™ซ Audio"; diff --git a/www/lang/Arduino_zh.js b/www/lang/Arduino_zh.js index e40d7f342..ad213f6c5 100644 --- a/www/lang/Arduino_zh.js +++ b/www/lang/Arduino_zh.js @@ -64,6 +64,7 @@ Blockly.Msg.CAT_OTTO = "โŠŸ Otto"; Blockly.Msg.CAT_OTTOH = "โŠŸ Humanoid"; Blockly.Msg.CAT_OLED_U8G = "โ–€ OLED ่žขๅน•"; Blockly.Msg.CAT_NEOPIXEL = "โ˜„ Neopixel"; +Blockly.Msg.CAT_NEOMATRIX = "๐ŸŒˆ NeoMatrix"; //Wireless Blockly.Msg.esp8266_init_tooltip = "่จญๅฎšwifi็š„็ถฒ่ทฏ้€ฃ็ทšๆจกๅผ"; diff --git a/www/lang/msg_en.js b/www/lang/msg_en.js index e363c793b..4c454d453 100644 --- a/www/lang/msg_en.js +++ b/www/lang/msg_en.js @@ -49,6 +49,6 @@ var MSG = { ย ย badXml: "XML parsing error: \n %1 \n\nSelect 'OK' to abort your changes or 'Cancel' to continue editing the XML.", ย ย arduino_card: "Load the settings for the board ", ย ย aboutModalLabel: "About", -ย ย aboutBody: "This is a free and open source visual programming software based on Blockly from Google, code is generated by just combining blocks taht then you can quickly upload to any Otto robot or Arduino project", +ย ย aboutBody: "A free and open source visual programming software based on Blockly from Google, code is generated by just combining graphical blocks, that then can be quickly uploaded to Otto robot or any other Arduino project", nano:"

Microcontroller:  ATmega328
Operating voltage: 5 V
Input voltage (VIN): 6-20 V
Power consumption: 19 mA
Flash memory: 32 KB of which 2 KB is used by bootloader
SRAM: 2 KB
Clock speed: 16 Mhz
EEPROM: 1 KB
DC current per I/O pin: 40 mA (20 mA recommended)
Digital I/O: pins 22
PWM outputs: 6 (D3, D5, D6, D9, D10, D11)
Analog input: pins 8 (ADC 10 bit)
I2C: A4 (SDA), A5 (SCL)
SPI: D10 (SS), D11 (MOSI), D12 (MISO), D13 (SCK)
LED_BUILTIN: D13

" }; \ No newline at end of file diff --git a/www/toolbox/toolbox_arduino_all.xml b/www/toolbox/toolbox_arduino_all.xml index dff7be3ad..7275de201 100644 --- a/www/toolbox/toolbox_arduino_all.xml +++ b/www/toolbox/toolbox_arduino_all.xml @@ -49,7 +49,16 @@ - + + 0 + 0 + 0 + 0 + + + 10 + 90 + @@ -539,7 +548,7 @@ 255 - + 13 1