Skip to content

Commit 33e9228

Browse files
hznupeterhznupeter
committed
add hall and temp in esp32
1 parent c705e5a commit 33e9228

11 files changed

Lines changed: 140 additions & 144 deletions

File tree

‎mixly_arduino/CHANGELOG.md‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,4 +192,21 @@
192192
* 修改ESP8266 Flash默认空间
193193
* 新增BME280 温度 气压传感器
194194
* 新增PS2手柄 模块,包括初始化、按钮识别、摇杆
195-
* 调整ESP32 ESP8266，只保留高级试图，不再区分普通试图和高级试图
195+
* 调整ESP32 ESP8266，只保留高级视图，不再区分普通试图和高级试图
196+
* ESP32 新增NTP获取时间模块，方便获取标准时间
197+
* 新增Blynk Table控制模块
198+
* 新增Blynk 服务器连接状态反馈
199+
* 修改OLED 刷新页面 模块文字说明
200+
* 修复ESP32 视图图表错误
201+
202+
#### 1.0Beta 2019-08-10
203+
* 新增小MU图像识别模块，arduino esp8266 esp32板卡
204+
* 修复MAX7219 点阵序号不能用变量的问题
205+
* 修复BME280输出气压单位值
206+
* 掌控板独立一个板载资源分类，将板载传感器的使用统一到一起
207+
* 掌控板新增msa300三轴加速度传感器模块 读取数据
208+
* 新增判断掌控板姿态，前倾，后倾，左倾，右倾，正面朝上，反面朝上
209+
* 优化blockly目录结构，归类js文件
210+
* 优化掌控板接口编号，统一采用掌控编法，采用P编号
211+
* mixGo独立一个板载资源分类
212+
* ESP32 新增片内霍尔，温度数据

‎mixly_arduino/blockly/apps/mixly/index_board_ESP32_Arduino.html‎

Lines changed: 10 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,6 @@
217217
<shadow type="pins_digital"></shadow>
218218
</value>
219219
</block>
220-
<block type="inout_touchRead">
221-
<value name="PIN">
222-
<shadow type="pins_touch">
223-
</shadow>
224-
</value>
225-
</block>
226220
<block type="inout_pwm_analog_write">
227221
<value name="PIN">
228222
<shadow type="pins_pwm"></shadow>
@@ -924,70 +918,6 @@
924918
<block type="ADXL345">
925919
</block>
926920
<!--DS302-->
927-
<block type="DS1302_init">
928-
<value name="RST">
929-
<shadow type="pins_digital">
930-
<field name="NUM">2</field>
931-
</shadow>
932-
</value>
933-
<value name="DAT">
934-
<shadow type="pins_digital">
935-
<field name="NUM">3</field>
936-
</shadow>
937-
</value>
938-
<value name="CLK">
939-
<shadow type="pins_digital">
940-
<field name="NUM">4</field>
941-
</shadow>
942-
</value>
943-
</block>
944-
<block type="DS1307_init">
945-
<value name="SDA">
946-
<shadow type="pins_digital">
947-
<field name="PIN">2</field>
948-
</shadow>
949-
</value>
950-
<value name="SCL">
951-
<shadow type="pins_digital">
952-
<field name="PIN">3</field>
953-
</shadow>
954-
</value>
955-
</block>
956-
<block type="RTC_get_time"></block>
957-
<block type="RTC_set_time">
958-
<value name="hour">
959-
<shadow type="math_number">
960-
<field name="NUM">8</field>
961-
</shadow>
962-
</value>
963-
<value name="minute">
964-
<shadow type="math_number">
965-
<field name="NUM">0</field>
966-
</shadow>
967-
</value>
968-
<value name="second">
969-
<shadow type="math_number">
970-
<field name="NUM">0</field>
971-
</shadow>
972-
</value>
973-
</block>
974-
<block type="RTC_set_date">
975-
<value name="year">
976-
<shadow type="math_number">
977-
<field name="NUM">2000</field>
978-
</shadow>
979-
</value>
980-
<value name="month">
981-
<shadow type="math_number">
982-
<field name="NUM">1</field>
983-
</shadow>
984-
</value>
985-
<value name="day">
986-
<shadow type="math_number">
987-
<field name="NUM">1</field>
988-
</shadow>
989-
</value>
990-
</block>
991921
<block type="BME280_READ">
992922
</block>
993923
<block type="PS2_init">
@@ -2254,6 +2184,16 @@
22542184
<field name="Vpin">V0</field>
22552185
</block>
22562186
</category>
2187+
<category id="catInner" name="catInner" colour="65">
2188+
<block type="inout_touchRead">
2189+
<value name="PIN">
2190+
<shadow type="pins_touch">
2191+
</shadow>
2192+
</value>
2193+
</block>
2194+
<block type="ESP32_hallRead"></block>
2195+
<block type="ESP32_temprature"></block>
2196+
</category>
22572197
<category id="catMorpxVS2" colour="#EF5411">
22582198
<block type="Vs2MuInit"></block>
22592199
<block type="Vs2Setup"></block>

‎mixly_arduino/blockly/blocks/arduino/pins.js‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,64 +3,64 @@ goog.provide('Blockly.Blocks.pins');
33
goog.require('Blockly.Blocks');
44
Blockly.Blocks.pins.HUE = 230;
55

6-
//profile["default"] = profile["Arduino/Genuino Uno"] ;
6+
profile["default"] = profile["Arduino/Genuino Uno"] ;
77

88
Blockly.Blocks['pins_digital'] = {
9-
init: function() {
10-
this.setColour(Blockly.Blocks.pins.HUE);
11-
this.appendDummyInput("")
12-
.appendField(new Blockly.FieldDropdown(profile.default.digital), 'PIN');
13-
this.setOutput(true, Number);
14-
}
9+
init: function() {
10+
this.setColour(Blockly.Blocks.pins.HUE);
11+
this.appendDummyInput("")
12+
.appendField(new Blockly.FieldDropdown(profile.default.digital), 'PIN');
13+
this.setOutput(true, Number);
14+
}
1515
};
1616

1717
Blockly.Blocks['pins_analog'] = {
18-
init: function() {
19-
this.setColour(Blockly.Blocks.pins.HUE);
20-
this.appendDummyInput("")
21-
.appendField(new Blockly.FieldDropdown(profile.default.analog), 'PIN');
22-
this.setOutput(true, Number);
23-
}
18+
init: function() {
19+
this.setColour(Blockly.Blocks.pins.HUE);
20+
this.appendDummyInput("")
21+
.appendField(new Blockly.FieldDropdown(profile.default.analog), 'PIN');
22+
this.setOutput(true, Number);
23+
}
2424
};
2525

2626
Blockly.Blocks['pins_pwm'] = {
27-
init: function() {
28-
this.setColour(Blockly.Blocks.pins.HUE);
29-
this.appendDummyInput("")
30-
.appendField(new Blockly.FieldDropdown(profile.default.pwm), 'PIN');
31-
this.setOutput(true, Number);
32-
}
27+
init: function() {
28+
this.setColour(Blockly.Blocks.pins.HUE);
29+
this.appendDummyInput("")
30+
.appendField(new Blockly.FieldDropdown(profile.default.pwm), 'PIN');
31+
this.setOutput(true, Number);
32+
}
3333
};
3434

3535
Blockly.Blocks['pins_interrupt'] = {
36-
init: function() {
37-
this.setColour(Blockly.Blocks.pins.HUE);
38-
this.appendDummyInput("")
39-
.appendField(new Blockly.FieldDropdown(profile.default.interrupt), 'PIN');
40-
this.setOutput(true, Number);
41-
}
36+
init: function() {
37+
this.setColour(Blockly.Blocks.pins.HUE);
38+
this.appendDummyInput("")
39+
.appendField(new Blockly.FieldDropdown(profile.default.interrupt), 'PIN');
40+
this.setOutput(true, Number);
41+
}
4242
};
4343
Blockly.Blocks['pins_MOSI'] = {
44-
init: function() {
45-
this.setColour(Blockly.Blocks.pins.HUE);
46-
this.appendDummyInput("")
47-
.appendField(new Blockly.FieldDropdown(profile.default.MOSI), 'PIN');
48-
this.setOutput(true, Number);
49-
}
44+
init: function() {
45+
this.setColour(Blockly.Blocks.pins.HUE);
46+
this.appendDummyInput("")
47+
.appendField(new Blockly.FieldDropdown(profile.default.MOSI), 'PIN');
48+
this.setOutput(true, Number);
49+
}
5050
};
5151
Blockly.Blocks['pins_MISO'] = {
52-
init: function() {
53-
this.setColour(Blockly.Blocks.pins.HUE);
54-
this.appendDummyInput("")
55-
.appendField(new Blockly.FieldDropdown(profile.default.MISO), 'PIN');
56-
this.setOutput(true, Number);
57-
}
52+
init: function() {
53+
this.setColour(Blockly.Blocks.pins.HUE);
54+
this.appendDummyInput("")
55+
.appendField(new Blockly.FieldDropdown(profile.default.MISO), 'PIN');
56+
this.setOutput(true, Number);
57+
}
5858
};
5959
Blockly.Blocks['pins_SCK'] = {
60-
init: function() {
61-
this.setColour(Blockly.Blocks.pins.HUE);
62-
this.appendDummyInput("")
63-
.appendField(new Blockly.FieldDropdown(profile.default.SCK), 'PIN');
64-
this.setOutput(true, Number);
65-
}
60+
init: function() {
61+
this.setColour(Blockly.Blocks.pins.HUE);
62+
this.appendDummyInput("")
63+
.appendField(new Blockly.FieldDropdown(profile.default.SCK), 'PIN');
64+
this.setOutput(true, Number);
65+
}
6666
};

‎mixly_arduino/blockly/blocks/arduino/sensor.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ Blockly.Blocks['BME280_READ'] = {
447447
init: function() {
448448
this.setColour(Blockly.Blocks.sensor.HUE);
449449
this.appendDummyInput()
450-
.appendField("读取BME280")
450+
.appendField(Blockly.BME280)
451451
.appendField(new Blockly.FieldDropdown([[Blockly.blynk_IOT_IR_TEMP,"bme.readTemperature()"], [Blockly.MIXLY_Humidity,"bme.readHumidity()"], [Blockly.MIXLY_Altitude,"bme.readPressure()"],[ Blockly.MIXLY_HEIGHT ,"bme.readAltitude(SEALEVELPRESSURE_HPA)"] ]), "BME_TYPE")
452452
this.setOutput(true, null);
453453
this.setTooltip("");

‎mixly_arduino/blockly/blocks/esp32_Arduino/pins.js‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,39 @@
22
goog.provide('Blockly.Blocks.pins');
33
goog.require('Blockly.Blocks');
44
Blockly.Blocks.pins.HUE = 230;
5-
profile["default"] = profile["esp32_arduino"];
65

76
Blockly.Blocks['pins_dac'] = {
8-
init: function() {
7+
init: function() {
98
this.setColour(Blockly.Blocks.pins.HUE);
109
this.appendDummyInput("")
11-
.appendField(new Blockly.FieldDropdown(profile.default.dac), 'PIN');
10+
.appendField(new Blockly.FieldDropdown(profile.default.dac), 'PIN');
1211
this.setOutput(true);
13-
}
12+
}
1413
};
1514

1615
Blockly.Blocks['pins_button'] = {
17-
init: function() {
16+
init: function() {
1817
this.setColour(Blockly.Blocks.pins.HUE);
1918
this.appendDummyInput("")
20-
.appendField(new Blockly.FieldDropdown(profile.default.button), 'PIN');
19+
.appendField(new Blockly.FieldDropdown(profile.default.button), 'PIN');
2120
this.setOutput(true, Number);
22-
}
21+
}
2322
};
2423

2524
Blockly.Blocks['pins_touch'] = {
26-
init: function() {
25+
init: function() {
2726
this.setColour(Blockly.Blocks.pins.HUE);
2827
this.appendDummyInput("")
29-
.appendField(new Blockly.FieldDropdown(profile.default.touch), 'PIN');
28+
.appendField(new Blockly.FieldDropdown(profile.default.touch), 'PIN');
3029
this.setOutput(true);
31-
}
30+
}
3231
};
3332

3433
Blockly.Blocks['pins_serial'] = {
3534
init: function() {
3635
this.setColour(Blockly.Blocks.pins.HUE);
3736
this.appendDummyInput("")
38-
.appendField(new Blockly.FieldDropdown(profile.default.serial_pin), 'PIN');
37+
.appendField(new Blockly.FieldDropdown(profile.default.serial_pin), 'PIN');
3938
this.setOutput(true, Number);
4039
}
4140
};
@@ -44,7 +43,7 @@ Blockly.Blocks['pins_playlist'] = {
4443
init: function() {
4544
this.setColour(Blockly.Blocks.pins.HUE);
4645
this.appendDummyInput("")
47-
.appendField(new Blockly.FieldDropdown(profile.default.playlist), 'PIN');
46+
.appendField(new Blockly.FieldDropdown(profile.default.playlist), 'PIN');
4847
this.setOutput(true);
4948
}
5049
};
@@ -53,7 +52,7 @@ Blockly.Blocks['pins_exlcdh'] = {
5352
init: function() {
5453
this.setColour(Blockly.Blocks.pins.HUE);
5554
this.appendDummyInput("")
56-
.appendField(new Blockly.FieldDropdown(profile.default.exlcdh), 'PIN');
55+
.appendField(new Blockly.FieldDropdown(profile.default.exlcdh), 'PIN');
5756
this.setOutput(true, Number);
5857
}
5958
};
@@ -62,7 +61,7 @@ Blockly.Blocks['pins_exlcdv'] = {
6261
init: function() {
6362
this.setColour(Blockly.Blocks.pins.HUE);
6463
this.appendDummyInput("")
65-
.appendField(new Blockly.FieldDropdown(profile.default.exlcdv), 'PIN');
64+
.appendField(new Blockly.FieldDropdown(profile.default.exlcdv), 'PIN');
6665
this.setOutput(true, Number);
6766
}
6867
};
@@ -71,15 +70,15 @@ Blockly.Blocks['pins_axis'] = {
7170
init: function() {
7271
this.setColour(Blockly.Blocks.pins.HUE);
7372
this.appendDummyInput("")
74-
.appendField(new Blockly.FieldDropdown(profile.default.axis), 'PIN');
73+
.appendField(new Blockly.FieldDropdown(profile.default.axis), 'PIN');
7574
this.setOutput(true, Number);
7675
}
7776
};
7877
Blockly.Blocks['pins_brightness'] = {
7978
init: function() {
8079
this.setColour(Blockly.Blocks.pins.HUE);
8180
this.appendDummyInput("")
82-
.appendField(new Blockly.FieldDropdown(profile.default.brightness), 'PIN');
81+
.appendField(new Blockly.FieldDropdown(profile.default.brightness), 'PIN');
8382
this.setOutput(true, Number);
8483
}
8584
};
@@ -88,7 +87,7 @@ Blockly.Blocks['pins_tone_notes'] = {
8887
init: function() {
8988
this.setColour(Blockly.Blocks.pins.HUE);
9089
this.appendDummyInput("")
91-
.appendField(new Blockly.FieldDropdown(profile.default.tone_notes), 'PIN');
90+
.appendField(new Blockly.FieldDropdown(profile.default.tone_notes), 'PIN');
9291
this.setOutput(true, Number);
9392
}
9493
};
@@ -97,7 +96,7 @@ Blockly.Blocks['pins_radio_power'] = {
9796
init: function() {
9897
this.setColour(Blockly.Blocks.pins.HUE);
9998
this.appendDummyInput("")
100-
.appendField(new Blockly.FieldDropdown(profile.default.radio_power), 'PIN');
99+
.appendField(new Blockly.FieldDropdown(profile.default.radio_power), 'PIN');
101100
this.setOutput(true, Number);
102101
}
103102
};
@@ -106,7 +105,7 @@ Blockly.Blocks['pins_radio_datarate'] = {
106105
init: function() {
107106
this.setColour(Blockly.Blocks.pins.HUE);
108107
this.appendDummyInput("")
109-
.appendField(new Blockly.FieldDropdown(profile.default.radio_datarate), 'PIN');
108+
.appendField(new Blockly.FieldDropdown(profile.default.radio_datarate), 'PIN');
110109
this.setOutput(true, Number);
111110
}
112111
};
@@ -115,7 +114,7 @@ Blockly.Blocks['pins_one_more'] = {
115114
init: function() {
116115
this.setColour(Blockly.Blocks.pins.HUE);
117116
this.appendDummyInput("")
118-
.appendField(new Blockly.FieldDropdown(profile.default.one_more), 'PIN');
117+
.appendField(new Blockly.FieldDropdown(profile.default.one_more), 'PIN');
119118
this.setOutput(true);
120119
}
121120
};
@@ -124,7 +123,7 @@ Blockly.Blocks['serial_select'] = {
124123
init: function() {
125124
this.setColour(Blockly.Blocks.pins.HUE);
126125
this.appendDummyInput("")
127-
.appendField(new Blockly.FieldDropdown(profile.default.serial_select), 'PIN');
126+
.appendField(new Blockly.FieldDropdown(profile.default.serial_select), 'PIN');
128127
this.setOutput(true);
129128
}
130129
};

0 commit comments

Comments
 (0)