18069996051/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update(boards): 格式化arduino板卡的部分生成代码

Browse Source
This commit is contained in:
王立帮
2025-02-17 21:02:43 +08:00
parent 07ce8f39ab
commit 8d155d488e
6 changed files with 71 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boards/default_src/arduino/arduino_generator.js
View File

@@ -104,7 +104,7 @@ export class ArduinoGenerator extends Blockly.Generator {
for (let name in this.loops_end_) {
loopsEnd.push(this.loops_end_[name]);
}
code = 'void loop(){\n'
code = 'void loop() {\n'
+ (loopsBegin.length ? (' ' + loopsBegin.join('\n ')) : '')
+ code
+ (loopsEnd.length ? (' ' + loopsEnd.join('\n ')) : '')
@@ -112,7 +112,7 @@ export class ArduinoGenerator extends Blockly.Generator {
var allDefs = define.join('\n') + '\n' + imports.join('\n') + '\n\n'
+ definitions_var.join('\n')
+ '\n\n' + definitions_fun.join('\n')
+ '\n\nvoid setup(){\n '
+ '\n\nvoid setup() {\n '
+ setupsBegin.join('\n ') + ((setupsBegin.length && (setupsEnd.length || setups.length)) ? '\n ' : '')
+ setups.join('\n ') + ((setupsEnd.length && setups.length) ? '\n ' : '')
+ setupsEnd.join('\n ') + '\n}' + '\n\n';

95
boards/default_src/arduino_avr/generators/actuator.js
View File

@@ -4,7 +4,7 @@ import { Variables } from 'blockly/core';
export const servo_move = function (_, generator) {
var dropdown_pin = this.getFieldValue('PIN');
var value_degree = generator.valueToCode(this, 'DEGREE', generator.ORDER_ATOMIC);
var delay_time = generator.valueToCode(this, 'DELAY_TIME', generator.ORDER_ATOMIC) || '0'
var delay_time = generator.valueToCode(this, 'DELAY_TIME', generator.ORDER_ATOMIC) || '0';
generator.definitions_['include_Servo'] = '#include <Servo.h>';
generator.definitions_['var_declare_servo' + dropdown_pin] = 'Servo servo_' + dropdown_pin + ';';
generator.setups_['setup_servo_' + dropdown_pin] = 'servo_' + dropdown_pin + '.attach(' + dropdown_pin + ');';
@@ -157,7 +157,7 @@ export const group_stepper_setup = function (_, generator) {
var steps = generator.valueToCode(this, 'steps', generator.ORDER_ATOMIC);
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ATOMIC);
generator.definitions_['include_Stepper'] = '#include <Stepper.h>';
generator.definitions_['var_declare_stepper' + varName] = 'Stepper ' + varName + '(' + steps + ',' + dropdown_pin1 + ',' + dropdown_pin2 + ');';
generator.definitions_['var_declare_stepper' + varName] = 'Stepper ' + varName + '(' + steps + ', ' + dropdown_pin1 + ', ' + dropdown_pin2 + ');';
generator.setups_['setup_stepper' + varName] = varName + '.setSpeed(' + speed + ');';
return '';
};
@@ -171,7 +171,7 @@ export const group_stepper_setup2 = function (_, generator) {
var steps = generator.valueToCode(this, 'steps', generator.ORDER_ATOMIC);
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ATOMIC);
generator.definitions_['include_Stepper'] = '#include <Stepper.h>';
generator.definitions_['var_declare_stepper' + varName] = 'Stepper ' + varName + '(' + steps + ',' + dropdown_pin1 + ',' + dropdown_pin2 + ',' + dropdown_pin3 + ',' + dropdown_pin4 + ');';
generator.definitions_['var_declare_stepper' + varName] = 'Stepper ' + varName + '(' + steps + ', ' + dropdown_pin1 + ', ' + dropdown_pin2 + ', ' + dropdown_pin3 + ', ' + dropdown_pin4 + ');';
generator.setups_['setup_stepper' + varName] = varName + '.setSpeed(' + speed + ');';
return '';
};
@@ -202,7 +202,7 @@ export const display_rgb_init = function (_, generator) {
var type = this.getFieldValue('TYPE');
var value_ledcount = generator.valueToCode(this, 'LEDCOUNT', generator.ORDER_ATOMIC);
generator.definitions_['include_Adafruit_NeoPixel'] = '#include <Adafruit_NeoPixel.h>';
generator.definitions_['var_declare_rgb_display' + dropdown_rgbpin] = 'Adafruit_NeoPixel rgb_display_' + dropdown_rgbpin + ' = Adafruit_NeoPixel(' + value_ledcount + ',' + dropdown_rgbpin + ',' + type + ' + NEO_KHZ800);';
generator.definitions_['var_declare_rgb_display' + dropdown_rgbpin] = 'Adafruit_NeoPixel rgb_display_' + dropdown_rgbpin + ' = Adafruit_NeoPixel(' + value_ledcount + ', ' + dropdown_rgbpin + ', ' + type + ' + NEO_KHZ800);';
generator.setups_['setup_rgb_display_begin_' + dropdown_rgbpin] = 'rgb_display_' + dropdown_rgbpin + '.begin();';
return '';
};
@@ -231,7 +231,7 @@ export const RGB_color_HSV = function (_, generator) {
var H = generator.valueToCode(this, 'H', generator.ORDER_ATOMIC);
var S = generator.valueToCode(this, 'S', generator.ORDER_ATOMIC);
var V = generator.valueToCode(this, 'V', generator.ORDER_ATOMIC);
var code = 'rgb_display_' + dropdown_rgbpin + '.setPixelColor(' + value_led + ' - 1, ' + 'rgb_display_' + dropdown_rgbpin + '.ColorHSV(' + H + ',' + S + ',' + V + '));\n';
var code = 'rgb_display_' + dropdown_rgbpin + '.setPixelColor(' + value_led + ' - 1, ' + 'rgb_display_' + dropdown_rgbpin + '.ColorHSV(' + H + ', ' + S + ', ' + V + '));\n';
return code;
};
@@ -250,25 +250,23 @@ export const display_rgb_rainbow1 = function (_, generator) {
var wait_time = generator.valueToCode(this, 'WAIT', generator.ORDER_ATOMIC);
generator.setups_['setup_rgb_display_begin_' + dropdown_rgbpin] = 'rgb_display_' + dropdown_rgbpin + '.begin();\n';
var funcName2 = 'Wheel';
var code2 = 'uint32_t Wheel(byte WheelPos){\n'
+ ' if(WheelPos < 85){\n'
var code2 = 'uint32_t Wheel(byte WheelPos) {\n'
+ ' if(WheelPos < 85) {\n'
+ ' return rgb_display_' + dropdown_rgbpin + '.Color(WheelPos * 3, 255 - WheelPos * 3, 0);\n'
+ ' }\n'
+ ' else if(WheelPos < 170){\n'
+ ' } else if (WheelPos < 170) {\n'
+ ' WheelPos -= 85;\n'
+ ' return rgb_display_' + dropdown_rgbpin + '.Color(255 - WheelPos * 3, 0, WheelPos * 3);\n'
+ ' }\n '
+ ' else{\n'
+ ' } else {\n'
+ ' WheelPos -= 170;\n'
+ ' return rgb_display_' + dropdown_rgbpin + '.Color(0, WheelPos * 3, 255 - WheelPos * 3);\n'
+ ' }\n'
+ '}\n';
generator.definitions_[funcName2] = code2;
var funcName3 = 'rainbow';
var code3 = 'void rainbow(uint8_t wait){\n'
var code3 = 'void rainbow(uint8_t wait) {\n'
+ ' uint16_t i, j;\n'
+ ' for(j=0; j<256; j++){\n'
+ ' for(i=0; i<rgb_display_' + dropdown_rgbpin + '.numPixels(); i++){\n'
+ ' for(j = 0; j < 256; j++) {\n'
+ ' for(i = 0; i < rgb_display_' + dropdown_rgbpin + '.numPixels(); i++){\n'
+ ' rgb_display_' + dropdown_rgbpin + '.setPixelColor(i, Wheel((i+j) & 255));\n'
+ ' }\n'
+ ' rgb_display_' + dropdown_rgbpin + '.show();\n'
@@ -284,25 +282,23 @@ export const display_rgb_rainbow2 = function (_, generator) {
var dropdown_rgbpin = this.getFieldValue('PIN');
var wait_time = generator.valueToCode(this, 'WAIT', generator.ORDER_ATOMIC);
var funcName2 = 'Wheel';
var code2 = 'uint32_t Wheel(byte WheelPos){\n'
+ ' if(WheelPos < 85){\n'
var code2 = 'uint32_t Wheel(byte WheelPos) {\n'
+ ' if (WheelPos < 85) {\n'
+ ' return rgb_display_' + dropdown_rgbpin + '.Color(WheelPos * 3, 255 - WheelPos * 3, 0);\n'
+ ' }\n'
+ ' else if(WheelPos < 170){\n'
+ ' } else if (WheelPos < 170) {\n'
+ ' WheelPos -= 85;\n'
+ ' return rgb_display_' + dropdown_rgbpin + '.Color(255 - WheelPos * 3, 0, WheelPos * 3);\n'
+ ' }\n'
+ ' else{\n'
+ ' } else {\n'
+ ' WheelPos -= 170;\n'
+ ' return rgb_display_' + dropdown_rgbpin + '.Color(0, WheelPos * 3, 255 - WheelPos * 3);\n'
+ ' }\n'
+ '}\n';
generator.definitions_[funcName2] = code2;
var funcName3 = 'rainbow';
var code3 = 'void rainbow(uint8_t wait){\n'
var code3 = 'void rainbow(uint8_t wait) {\n'
+ ' uint16_t i, j;\n'
+ ' for(j=0; j<256; j++){\n'
+ ' for(i=0; i<rgb_display_' + dropdown_rgbpin + '.numPixels(); i++){\n'
+ ' for(j = 0; j < 256; j++){\n'
+ ' for(i = 0; i < rgb_display_' + dropdown_rgbpin + '.numPixels(); i++) {\n'
+ ' rgb_display_' + dropdown_rgbpin + '.setPixelColor(i, Wheel((i+j) & 255));\n'
+ ' }\n'
+ ' rgb_display_' + dropdown_rgbpin + '.show();\n'
@@ -313,8 +309,8 @@ export const display_rgb_rainbow2 = function (_, generator) {
var funcName4 = 'rainbowCycle';
var code4 = 'void rainbowCycle(uint8_t wait){\n'
+ ' uint16_t i, j;\n'
+ ' for(j=0; j<256*5; j++){\n'
+ ' for(i=0; i< rgb_display_' + dropdown_rgbpin + '.numPixels(); i++){\n'
+ ' for(j = 0; j < 256 * 5; j++) {\n'
+ ' for(i = 0; i < rgb_display_' + dropdown_rgbpin + '.numPixels(); i++){\n'
+ ' rgb_display_' + dropdown_rgbpin + '.setPixelColor(i, Wheel(((i * 256 / rgb_display_' + dropdown_rgbpin + '.numPixels()) + j) & 255));\n'
+ ' }\n'
+ ' rgb_display_' + dropdown_rgbpin + '.show();\n'
@@ -331,26 +327,24 @@ export const display_rgb_rainbow3 = function (_, generator) {
var rainbow_color = generator.valueToCode(this, 'rainbow_color', generator.ORDER_ATOMIC);
var type = this.getFieldValue('TYPE');
var funcName2 = 'Wheel';
var code2 = 'uint32_t Wheel(byte WheelPos){\n'
+ ' if(WheelPos < 85){\n'
var code2 = 'uint32_t Wheel(byte WheelPos) {\n'
+ ' if (WheelPos < 85) {\n'
+ ' return rgb_display_' + dropdown_rgbpin + '.Color(WheelPos * 3, 255 - WheelPos * 3, 0);\n'
+ ' }\n'
+ ' else if(WheelPos < 170){\n'
+ ' } else if (WheelPos < 170) {\n'
+ ' WheelPos -= 85;\n'
+ ' return rgb_display_' + dropdown_rgbpin + '.Color(255 - WheelPos * 3, 0, WheelPos * 3);\n'
+ ' }\n'
+ ' else{\n'
+ ' } else {\n'
+ ' WheelPos -= 170;return rgb_display_' + dropdown_rgbpin + '.Color(0, WheelPos * 3, 255 - WheelPos * 3);\n'
+ ' }\n'
+ '}\n';
generator.definitions_[funcName2] = code2;
if (type == "normal")
var code3 = 'for(int RGB_RAINBOW_i = 0; RGB_RAINBOW_i < rgb_display_' + dropdown_rgbpin + '.numPixels(); RGB_RAINBOW_i++){\n'
var code3 = 'for (int RGB_RAINBOW_i = 0; RGB_RAINBOW_i < rgb_display_' + dropdown_rgbpin + '.numPixels(); RGB_RAINBOW_i++) {\n'
+ ' rgb_display_' + dropdown_rgbpin + '.setPixelColor(RGB_RAINBOW_i, Wheel(' + rainbow_color + ' & 255));\n'
+ '}\n'
+ 'rgb_display_' + dropdown_rgbpin + '.show();\n';
else
var code3 = 'for(int RGB_RAINBOW_i = 0; RGB_RAINBOW_i < rgb_display_' + dropdown_rgbpin + '.numPixels(); RGB_RAINBOW_i++){\n'
var code3 = 'for (int RGB_RAINBOW_i = 0; RGB_RAINBOW_i < rgb_display_' + dropdown_rgbpin + '.numPixels(); RGB_RAINBOW_i++) {\n'
+ ' rgb_display_' + dropdown_rgbpin + '.setPixelColor(RGB_RAINBOW_i, Wheel(((RGB_RAINBOW_i * 256 / rgb_display_' + dropdown_rgbpin + '.numPixels()) + ' + rainbow_color + ') & 255));\n'
+ '}\n'
+ 'rgb_display_' + dropdown_rgbpin + '.show();\n';
@@ -370,7 +364,7 @@ export const Mixly_motor = function (_, generator) {
generator.setups_['setup_output_' + PIN1 + PIN2 + '_D_W'] = 'digitalWrite(' + PIN2 + ', LOW);';
var funcName = 'setMotor';
var code2 = 'void ' + funcName + '(int dirpin1, int dirpin2, int speedpin, int speed) {\n'
+ ' digitalWrite(dirpin2,!digitalRead(dirpin1));\n'
+ ' digitalWrite(dirpin2, !digitalRead(dirpin1));\n'
+ ' if (speed == 0) {\n'
+ ' digitalWrite(dirpin1, LOW);\n'
+ ' analogWrite(speedpin, 0);\n'
@@ -418,24 +412,24 @@ export const voice_module = function (_, generator) {
var dropdown_voice = this.getFieldValue('VOICE');
var wait_time = generator.valueToCode(this, 'WAIT', generator.ORDER_ASSIGNMENT) || '0';
generator.setups_['setup_output_sda'] = 'pinMode(' + dropdown_pin + ', OUTPUT);';
var code = 'send_data(' + dropdown_voice + '); //volume control 0xE0-E7;\n';
var code = 'send_data(' + dropdown_voice + '); // volume control 0xE0-E7;\n';
code += 'delay(' + wait_time + ');\n'
var code2 = 'void send_data(int addr) {\n'
+ ' int i;\n'
+ ' digitalWrite(' + dropdown_pin + ', LOW);\n'
+ ' delay(3); //>2ms\n'
+ ' delay(3); // >2ms\n'
+ ' for (i = 0; i < 8; i++) {\n'
+ ' digitalWrite(' + dropdown_pin + ', HIGH);\n'
+ ' if (addr & 1) {\n'
+ ' delayMicroseconds(2400); //>2400us\n'
+ ' delayMicroseconds(2400); // >2400us\n'
+ ' digitalWrite(' + dropdown_pin + ', LOW);\n'
+ ' delayMicroseconds(800);\n'
+ ' } //>800us\n'
+ ' } // >800us\n'
+ ' else {\n'
+ ' delayMicroseconds(800); //>800us\n'
+ ' delayMicroseconds(800); // >800us\n'
+ ' digitalWrite(' + dropdown_pin + ', LOW);\n'
+ ' delayMicroseconds(2400);\n'
+ ' } //>2400us\n'
+ ' } // >2400us\n'
+ ' addr >>= 1;\n'
+ ' }\n'
+ ' digitalWrite(' + dropdown_pin + ', HIGH);\n'
@@ -523,7 +517,7 @@ export const AFMotorRun = function (_, generator) {
var speed = generator.valueToCode(this, 'speed', generator.ORDER_ATOMIC);
var code = "";
generator.definitions_['var_declare_motor_' + motorNO] = "AF_DCMotor" + ' motor' + motorNO + '(' + motorNO + ');';
code = ' motor' + motorNO + ".setSpeed(" + speed + ");\n" + ' motor' + motorNO + ".run(" + direction + ");\n";
code = 'motor' + motorNO + ".setSpeed(" + speed + ");\n" + 'motor' + motorNO + ".run(" + direction + ");\n";
return code;
};
@@ -532,7 +526,7 @@ export const AFMotorStop = function (_, generator) {
var motorNO = this.getFieldValue('motor');
var code = "";
generator.definitions_['var_declare_motor_' + motorNO] = "AF_DCMotor" + ' motor' + motorNO + '(' + motorNO + ');';
code = ' motor' + motorNO + ".setSpeed(0);\n" + ' motor' + motorNO + ".run(RELEASE);\n";
code = 'motor' + motorNO + ".setSpeed(0);\n" + 'motor' + motorNO + ".run(RELEASE);\n";
return code;
};
@@ -688,11 +682,18 @@ export const I2Cmotor = function (_, generator) {
+ 'pwm.setPWMFreq(400);\n'
+ 'Wire.setClock(400000);';
var code2;
code2 = 'void motor(int ID,int SPEED){ //0-7\n'
+ ' if(SPEED>0){pwm.setPin(ID*2, 0 );pwm.setPin(ID*2+1, (SPEED+1)*16-1);}\n'
+ ' else if(SPEED==0){pwm.setPin(ID*2, 4095 );pwm.setPin(ID*2+1, 4095);}\n'
+ ' else if(SPEED<0){pwm.setPin(ID*2, 1-(SPEED+1)*16);pwm.setPin(ID*2+1, 0);}\n'
+ ' }\n';
code2 = 'void motor(int ID, int SPEED) { // 0-7\n'
+ ' if(SPEED > 0) {\n'
+ ' pwm.setPin(ID * 2, 0);\n'
+ ' pwm.setPin(ID * 2 + 1, (SPEED + 1) * 16 - 1);\n'
+ ' } else if (SPEED == 0) {\n'
+ ' pwm.setPin(ID * 2, 4095);\n'
+ ' pwm.setPin(ID * 2 + 1, 4095);\n'
+ ' } else if (SPEED < 0) {\n'
+ ' pwm.setPin(ID * 2, 1 - (SPEED + 1) * 16);\n'
+ ' pwm.setPin(ID * 2 + 1, 0);\n'
+ ' }\n'
+ '}\n';
generator.definitions_['motor'] = code2;
var code = 'motor(' + motorNO + ',' + speed + ');\n';
return code;

32
boards/default_src/arduino_avr/generators/inout.js
View File

@@ -20,7 +20,7 @@ export const inout_digital_write2 = function (_, generator) {
var code = "";
var isVar = true;
for (var pin of Profile.default.digital) {
if (pin[0] === dropdown_pin) {
if (pin[1] === dropdown_pin) {
isVar = false;
break;
}
@@ -33,7 +33,7 @@ export const inout_digital_write2 = function (_, generator) {
}
generator.setups_['setup_output_' + dropdown_pin] = 'pinMode(' + dropdown_pin + ', OUTPUT);';
}
code += 'digitalWrite(' + dropdown_pin + ',' + dropdown_stat + ');\n'
code += 'digitalWrite(' + dropdown_pin + ', ' + dropdown_stat + ');\n'
return code;
}
@@ -47,20 +47,24 @@ export const inout_digital_read = function (_, generator) {
export const inout_digital_read2 = function (_, generator) {
var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var code = "";
if (window.isNaN(dropdown_pin) && !(new RegExp("^A([0-9]|10|11|12|13|14|15)$").test(dropdown_pin))) {
var isVar = true;
for (var pin of Profile.default.digital) {
if (pin[1] === dropdown_pin) {
isVar = false;
break;
}
}
if (isVar) {
var funcName = 'mixly_digitalRead';
var code2 = 'boolean' + ' ' + funcName + '(uint8_t pin) {\n'
generator.definitions_[funcName] = 'boolean' + ' ' + funcName + '(uint8_t pin) {\n'
+ ' pinMode(pin, INPUT);\n'
+ ' boolean _return = digitalRead(pin);\n'
+ ' pinMode(pin, OUTPUT);\n'
+ ' return _return;\n'
+ '}\n';
generator.definitions_[funcName] = code2;
code = 'mixly_digitalRead(' + dropdown_pin + ')';
} else {
if (generator.setups_['setup_output_' + dropdown_pin]) {
//存在pinMode已设为output则不再设为input
} else {
if (!generator.setups_['setup_output_' + dropdown_pin]) {
generator.setups_['setup_input_' + dropdown_pin] = 'pinMode(' + dropdown_pin + ', INPUT);';
}
if (generator.setups_['setup_setup']) { //解决pullup重复问题
@@ -115,7 +119,7 @@ export const OneButton_interrupt = function (_, generator) {
var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var dropdown_mode = this.getFieldValue('mode');
var dropdown_stat = generator.valueToCode(this, 'STAT', generator.ORDER_ATOMIC);
generator.definitions_['var_declare_button' + dropdown_pin] = 'OneButton button' + dropdown_pin + '(' + dropdown_pin + ',' + ((dropdown_stat == 'HIGH') ? 'false' : 'true') + ');';
generator.definitions_['var_declare_button' + dropdown_pin] = 'OneButton button' + dropdown_pin + '(' + dropdown_pin + ', ' + ((dropdown_stat == 'HIGH') ? 'false' : 'true') + ');';
generator.setups_['setup_onebutton_' + dropdown_pin + dropdown_mode] = 'button' + dropdown_pin + '.' + dropdown_mode + '(' + dropdown_mode + dropdown_pin + ');';
var code = 'button' + dropdown_pin + '.tick();';
var funcName = dropdown_mode + dropdown_pin;
@@ -131,7 +135,7 @@ export const controls_attachInterrupt = function (_, generator) {
generator.setups_['setup_input_' + dropdown_pin] = 'pinMode(' + dropdown_pin + ', INPUT_PULLUP);';
//var interrupt_pin=digitalPinToInterrupt(dropdown_pin).toString();
var interrupt_pin = 'digitalPinToInterrupt(' + dropdown_pin + ')';
var code = 'attachInterrupt' + '(' + interrupt_pin + ',' + 'attachInterrupt_fun_' + dropdown_mode + '_' + dropdown_pin + ',' + dropdown_mode + ');\n'
var code = 'attachInterrupt' + '(' + interrupt_pin + ',' + 'attachInterrupt_fun_' + dropdown_mode + '_' + dropdown_pin + ', ' + dropdown_mode + ');\n'
var funcName = 'attachInterrupt_fun_' + dropdown_mode + '_' + dropdown_pin;
var branch = generator.statementToCode(this, 'DO');
var code2 = 'void' + ' ' + funcName + '() {\n' + branch + '}\n';
@@ -154,7 +158,7 @@ export const controls_attachPinInterrupt = function (_, generator) {
generator.definitions_['include_PinChangeInterrupt'] = '#include <PinChangeInterrupt.h>';
generator.setups_['setup_input_' + dropdown_pin] = 'pinMode(' + dropdown_pin + ', INPUT);';
//var interrupt_pin=digitalPinToInterrupt(dropdown_pin).toString();
var code = 'attachPCINT(digitalPinToPCINT(' + dropdown_pin + '),' + 'attachPinInterrupt_fun_' + dropdown_mode + '_' + dropdown_pin + ',' + dropdown_mode + ');\n'
var code = 'attachPCINT(digitalPinToPCINT(' + dropdown_pin + '),' + 'attachPinInterrupt_fun_' + dropdown_mode + '_' + dropdown_pin + ', ' + dropdown_mode + ');\n'
var funcName = 'attachPinInterrupt_fun_' + dropdown_mode + '_' + dropdown_pin;
var branch = generator.statementToCode(this, 'DO');
var code2 = 'void' + ' ' + funcName + '() {\n' + branch + '}\n';
@@ -203,7 +207,7 @@ export const ESP32touchButton = function (_, generator) {
generator.definitions_['include_ESP32touchButton'] = '#include <ESP32touchButton.h>';
var dropdown_pin = generator.valueToCode(this, 'PIN', generator.ORDER_ATOMIC);
var dropdown_mode = this.getFieldValue('mode');
generator.definitions_['var_declare_button' + dropdown_pin] = 'ESP32touchButton button' + dropdown_pin + '(' + dropdown_pin + ',true);';
generator.definitions_['var_declare_button' + dropdown_pin] = 'ESP32touchButton button' + dropdown_pin + '(' + dropdown_pin + ', true);';
generator.setups_['setup_onebutton_' + dropdown_pin + dropdown_mode] = 'button' + dropdown_pin + '.' + dropdown_mode + '(' + dropdown_mode + dropdown_pin + ');';
var code = 'button' + dropdown_pin + '.tick();';
var funcName = dropdown_mode + dropdown_pin;
@@ -236,7 +240,7 @@ export const ADS1015_setGain = function (_, generator) {
generator.definitions_['include_Wire'] = '#include <Wire.h>';
generator.definitions_['include_Adafruit_ADS1015'] = '#include <Adafruit_ADS1015.h>';
generator.definitions_['var_declare_Adafruit_ADS1015_ads'] = 'Adafruit_ADS1015 ads;\n';
generator.setups_['setup_ads.begin()'] = 'ads.begin(); \n';
generator.setups_['setup_ads.begin()'] = 'ads.begin();\n';
generator.setups_['setup_ads.setGain'] = 'ads.setGain(' + GAIN + ');';
var code = '';
return code;
@@ -258,7 +262,7 @@ export const PCF8591T = function (_, generator) {
//generator.definitions_['include_Wire'] = '#include <Arduino.h>';
generator.definitions_['include_PCF8591_h'] = '#include <PCF8591.h>';
generator.definitions_['var_declare_PCF8591'] = 'PCF8591 pcf8591(0x48);';
generator.setups_['setup_pcf8591.begin()'] = 'pcf8591.begin(); \n';
generator.setups_['setup_pcf8591.begin()'] = 'pcf8591.begin();\n';
var dropdown_type = this.getFieldValue('PCF8591T_AIN');
var code = dropdown_type;
return [code, generator.ORDER_ATOMIC];