Update: 合并master分支提交记录
This commit is contained in:
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -196,6 +196,10 @@
|
||||
"__file__": true,
|
||||
"__name__": "22-2-射频识别-持续写卡(MIG2).mix"
|
||||
},
|
||||
"22-2射频识别-模拟公交卡.mix": {
|
||||
"__file__": true,
|
||||
"__name__": "22-2射频识别-模拟公交卡.mix"
|
||||
},
|
||||
"23-1-蓝牙通讯-主机模式.mix": {
|
||||
"__file__": true,
|
||||
"__name__": "23-1-蓝牙通讯-主机模式.mix"
|
||||
|
||||
@@ -221,7 +221,7 @@ export const display_rgb = function (_, generator) {
|
||||
var value_led = generator.valueToCode(this, '_LED_', generator.ORDER_ATOMIC);
|
||||
var COLOR = generator.valueToCode(this, 'COLOR', generator.ORDER_ATOMIC);
|
||||
COLOR = COLOR.replace(/#/g, "0x");
|
||||
var code = 'rgb_display_' + dropdown_rgbpin + '.setPixelColor((' + value_led + ')-1, ' + COLOR + ');\n';
|
||||
var code = 'rgb_display_' + dropdown_rgbpin + '.setPixelColor(' + value_led + ' - 1, ' + COLOR + ');\n';
|
||||
return code;
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ export const handbit_rgb = function (_, generator) {
|
||||
generator.definitions_['include_Adafruit_NeoPixel'] = '#include <Adafruit_NeoPixel.h>';
|
||||
generator.definitions_['var_declare_rgb_display17'] = 'Adafruit_NeoPixel rgb_display_17= Adafruit_NeoPixel(3,17,NEO_GRB + NEO_KHZ800);';
|
||||
generator.setups_['setup_rgb_display_begin_17'] = 'rgb_display_17.begin();';
|
||||
var code = 'rgb_display_17.setPixelColor(' + value_led + '-1,' + COLOR + ');\n';
|
||||
var code = 'rgb_display_17.setPixelColor(' + value_led + ' - 1,' + COLOR + ');\n';
|
||||
return code;
|
||||
}
|
||||
|
||||
@@ -177,6 +177,6 @@ export const handbit_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;
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -196,6 +196,10 @@
|
||||
"__file__": true,
|
||||
"__name__": "22-2-射频识别-持续写卡(MIG2).mix"
|
||||
},
|
||||
"22-2射频识别-模拟公交卡.mix": {
|
||||
"__file__": true,
|
||||
"__name__": "22-2射频识别-模拟公交卡.mix"
|
||||
},
|
||||
"23-1-蓝牙通讯-主机模式.mix": {
|
||||
"__file__": true,
|
||||
"__name__": "23-1-蓝牙通讯-主机模式.mix"
|
||||
|
||||
Reference in New Issue
Block a user