Skip to content

Commit b2d1977

Browse files
iotguptaiotgupta
committed
update Mercury Board
1 parent 5874351 commit b2d1977

36 files changed

+11451
-240
lines changed

Diff for: ‎boards.txt

+221-221
Large diffs are not rendered by default.

Diff for: ‎boards.txt.orig

+9,538
Large diffs are not rendered by default.

Diff for: ‎doc/boards.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,11 @@ ESPresso Lite 2.0
271271

272272
ESPresso Lite 2.0 is an Arduino-compatible Wi-Fi development board based on an earlier V1 (beta version). Re-designed together with Cytron Technologies, the newly-revised ESPresso Lite V2.0 features the auto-load/auto-program function, eliminating the previous need to reset the board manually before flashing a new program. It also feature two user programmable side buttons and a reset button. The special distinctive features of on-board pads for I2C sensor and actuator is retained.
273273

274-
Mercury 1.0
275-
-----------
276-
277-
Based on ESP8266, Mercury is board developed by Ralio Technologies. Board supports on motor drivers and direct-connect feature for various endpoints.
274+
Mercury
275+
-------
278276

277+
ESP8266 based development board supercharged with onboard motor driver, RGB LED, support for servo motors and etc.
278+
Git: https://github.com/raliotech/products/tree/master
279279
Product page: https://www.raliotech.com
280280

281281
Phoenix 1.0

Diff for: ‎doc/boards.rst.orig

+525
Large diffs are not rendered by default.

Diff for: ‎package/package_esp8266com_index.template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"name": "ESPresso Lite 2.0"
4949
},
5050
{
51-
"name": "Mercury 1.0"
51+
"name": "Mercury"
5252
},
5353
{
5454
"name": "Phoenix 1.0"

Diff for: ‎package/package_esp8266com_index.template.json.orig

+389
Large diffs are not rendered by default.

Diff for: ‎tools/boards.txt.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -445,20 +445,20 @@
445445
],
446446
'desc': [ 'ESPresso Lite 2.0 is an Arduino-compatible Wi-Fi development board based on an earlier V1 (beta version). Re-designed together with Cytron Technologies, the newly-revised ESPresso Lite V2.0 features the auto-load/auto-program function, eliminating the previous need to reset the board manually before flashing a new program. It also feature two user programmable side buttons and a reset button. The special distinctive features of on-board pads for I2C sensor and actuator is retained.', ]
447447
}),
448-
( 'mercury1', {
449-
'name': 'Mercury 1.0',
448+
( 'mercury', {
449+
'name': 'Mercury',
450450
'opts': {
451451
'.build.board': 'mercury',
452-
'.build.variant': 'mercury_v1',
452+
'.build.variant': 'mercury',
453453
},
454454
'macro': [
455455
'resetmethod_nodemcu',
456456
'flashmode_dio',
457457
'flashfreq_40',
458458
'4M',
459459
],
460-
'desc': [ 'Based on ESP8266, Mercury is board developed by Ralio Technologies. Board supports on motor drivers and direct-connect feature for various endpoints.',
461-
'',
460+
'desc': [ 'ESP8266 based development board supercharged with onboard motor driver, RGB LED, support for servo motors and etc.',
461+
'Git: https://github.com/raliotech/products/tree/master',
462462
'Product page: https://www.raliotech.com',
463463
],
464464
}),

Diff for: ‎tools/sdk/ld/backup/eagle.flash.16m14m.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 16M chips */
2+
/* sketch @0x40200000 (~1019KB) (1044464B) */
3+
/* empty @0x402FEFF0 (~1028KB) (1052688B) */
4+
/* spiffs @0x40400000 (~14312KB) (14655488B) */
5+
/* eeprom @0x411FB000 (4KB) */
6+
/* rfcal @0x411FC000 (4KB) */
7+
/* wifi @0x411FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0xfeff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x40400000 );
17+
PROVIDE ( _FS_end = 0x411FA000 );
18+
PROVIDE ( _FS_page = 0x100 );
19+
PROVIDE ( _FS_block = 0x2000 );
20+
PROVIDE ( _EEPROM_start = 0x411fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x40400000 );
23+
PROVIDE ( _SPIFFS_end = 0x411FA000 );
24+
PROVIDE ( _SPIFFS_page = 0x100 );
25+
PROVIDE ( _SPIFFS_block = 0x2000 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

Diff for: ‎tools/sdk/ld/backup/eagle.flash.16m15m.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 16M chips */
2+
/* sketch @0x40200000 (~1019KB) (1044464B) */
3+
/* empty @0x402FEFF0 (~4KB) (4112B) */
4+
/* spiffs @0x40300000 (~15336KB) (15704064B) */
5+
/* eeprom @0x411FB000 (4KB) */
6+
/* rfcal @0x411FC000 (4KB) */
7+
/* wifi @0x411FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0xfeff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x40300000 );
17+
PROVIDE ( _FS_end = 0x411FA000 );
18+
PROVIDE ( _FS_page = 0x100 );
19+
PROVIDE ( _FS_block = 0x2000 );
20+
PROVIDE ( _EEPROM_start = 0x411fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x40300000 );
23+
PROVIDE ( _SPIFFS_end = 0x411FA000 );
24+
PROVIDE ( _SPIFFS_page = 0x100 );
25+
PROVIDE ( _SPIFFS_block = 0x2000 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

Diff for: ‎tools/sdk/ld/backup/eagle.flash.1m.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 1M chips */
2+
/* sketch @0x40200000 (~999KB) (1023984B) */
3+
/* empty @0x402F9FF0 (~4KB) (4112B) */
4+
/* spiffs @0x402FB000 (~0KB) (0B) */
5+
/* eeprom @0x402FB000 (4KB) */
6+
/* rfcal @0x402FC000 (4KB) */
7+
/* wifi @0x402FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0xf9ff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x402FB000 );
17+
PROVIDE ( _FS_end = 0x402FB000 );
18+
PROVIDE ( _FS_page = 0x0 );
19+
PROVIDE ( _FS_block = 0x0 );
20+
PROVIDE ( _EEPROM_start = 0x402fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x402FB000 );
23+
PROVIDE ( _SPIFFS_end = 0x402FB000 );
24+
PROVIDE ( _SPIFFS_page = 0x0 );
25+
PROVIDE ( _SPIFFS_block = 0x0 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

Diff for: ‎tools/sdk/ld/backup/eagle.flash.1m128.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 1M chips */
2+
/* sketch @0x40200000 (~871KB) (892912B) */
3+
/* empty @0x402D9FF0 (~4KB) (4112B) */
4+
/* spiffs @0x402DB000 (~128KB) (131072B) */
5+
/* eeprom @0x402FB000 (4KB) */
6+
/* rfcal @0x402FC000 (4KB) */
7+
/* wifi @0x402FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0xd9ff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x402DB000 );
17+
PROVIDE ( _FS_end = 0x402FB000 );
18+
PROVIDE ( _FS_page = 0x100 );
19+
PROVIDE ( _FS_block = 0x1000 );
20+
PROVIDE ( _EEPROM_start = 0x402fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x402DB000 );
23+
PROVIDE ( _SPIFFS_end = 0x402FB000 );
24+
PROVIDE ( _SPIFFS_page = 0x100 );
25+
PROVIDE ( _SPIFFS_block = 0x1000 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

Diff for: ‎tools/sdk/ld/backup/eagle.flash.1m144.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 1M chips */
2+
/* sketch @0x40200000 (~855KB) (876528B) */
3+
/* empty @0x402D5FF0 (~4KB) (4112B) */
4+
/* spiffs @0x402D7000 (~144KB) (147456B) */
5+
/* eeprom @0x402FB000 (4KB) */
6+
/* rfcal @0x402FC000 (4KB) */
7+
/* wifi @0x402FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0xd5ff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x402D7000 );
17+
PROVIDE ( _FS_end = 0x402FB000 );
18+
PROVIDE ( _FS_page = 0x100 );
19+
PROVIDE ( _FS_block = 0x1000 );
20+
PROVIDE ( _EEPROM_start = 0x402fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x402D7000 );
23+
PROVIDE ( _SPIFFS_end = 0x402FB000 );
24+
PROVIDE ( _SPIFFS_page = 0x100 );
25+
PROVIDE ( _SPIFFS_block = 0x1000 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

Diff for: ‎tools/sdk/ld/backup/eagle.flash.1m160.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 1M chips */
2+
/* sketch @0x40200000 (~839KB) (860144B) */
3+
/* empty @0x402D1FF0 (~4KB) (4112B) */
4+
/* spiffs @0x402D3000 (~160KB) (163840B) */
5+
/* eeprom @0x402FB000 (4KB) */
6+
/* rfcal @0x402FC000 (4KB) */
7+
/* wifi @0x402FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0xd1ff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x402D3000 );
17+
PROVIDE ( _FS_end = 0x402FB000 );
18+
PROVIDE ( _FS_page = 0x100 );
19+
PROVIDE ( _FS_block = 0x1000 );
20+
PROVIDE ( _EEPROM_start = 0x402fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x402D3000 );
23+
PROVIDE ( _SPIFFS_end = 0x402FB000 );
24+
PROVIDE ( _SPIFFS_page = 0x100 );
25+
PROVIDE ( _SPIFFS_block = 0x1000 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

Diff for: ‎tools/sdk/ld/backup/eagle.flash.1m192.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 1M chips */
2+
/* sketch @0x40200000 (~807KB) (827376B) */
3+
/* empty @0x402C9FF0 (~4KB) (4112B) */
4+
/* spiffs @0x402CB000 (~192KB) (196608B) */
5+
/* eeprom @0x402FB000 (4KB) */
6+
/* rfcal @0x402FC000 (4KB) */
7+
/* wifi @0x402FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0xc9ff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x402CB000 );
17+
PROVIDE ( _FS_end = 0x402FB000 );
18+
PROVIDE ( _FS_page = 0x100 );
19+
PROVIDE ( _FS_block = 0x1000 );
20+
PROVIDE ( _EEPROM_start = 0x402fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x402CB000 );
23+
PROVIDE ( _SPIFFS_end = 0x402FB000 );
24+
PROVIDE ( _SPIFFS_page = 0x100 );
25+
PROVIDE ( _SPIFFS_block = 0x1000 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

Diff for: ‎tools/sdk/ld/backup/eagle.flash.1m256.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 1M chips */
2+
/* sketch @0x40200000 (~743KB) (761840B) */
3+
/* empty @0x402B9FF0 (~4KB) (4112B) */
4+
/* spiffs @0x402BB000 (~256KB) (262144B) */
5+
/* eeprom @0x402FB000 (4KB) */
6+
/* rfcal @0x402FC000 (4KB) */
7+
/* wifi @0x402FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0xb9ff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x402BB000 );
17+
PROVIDE ( _FS_end = 0x402FB000 );
18+
PROVIDE ( _FS_page = 0x100 );
19+
PROVIDE ( _FS_block = 0x1000 );
20+
PROVIDE ( _EEPROM_start = 0x402fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x402BB000 );
23+
PROVIDE ( _SPIFFS_end = 0x402FB000 );
24+
PROVIDE ( _SPIFFS_page = 0x100 );
25+
PROVIDE ( _SPIFFS_block = 0x1000 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

Diff for: ‎tools/sdk/ld/backup/eagle.flash.1m512.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 1M chips */
2+
/* sketch @0x40200000 (~487KB) (499696B) */
3+
/* empty @0x40279FF0 (~4KB) (4112B) */
4+
/* spiffs @0x4027B000 (~512KB) (524288B) */
5+
/* eeprom @0x402FB000 (4KB) */
6+
/* rfcal @0x402FC000 (4KB) */
7+
/* wifi @0x402FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0x79ff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x4027B000 );
17+
PROVIDE ( _FS_end = 0x402FB000 );
18+
PROVIDE ( _FS_page = 0x100 );
19+
PROVIDE ( _FS_block = 0x2000 );
20+
PROVIDE ( _EEPROM_start = 0x402fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x4027B000 );
23+
PROVIDE ( _SPIFFS_end = 0x402FB000 );
24+
PROVIDE ( _SPIFFS_page = 0x100 );
25+
PROVIDE ( _SPIFFS_block = 0x2000 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

Diff for: ‎tools/sdk/ld/backup/eagle.flash.1m64.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 1M chips */
2+
/* sketch @0x40200000 (~935KB) (958448B) */
3+
/* empty @0x402E9FF0 (~4KB) (4112B) */
4+
/* spiffs @0x402EB000 (~64KB) (65536B) */
5+
/* eeprom @0x402FB000 (4KB) */
6+
/* rfcal @0x402FC000 (4KB) */
7+
/* wifi @0x402FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0xe9ff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x402EB000 );
17+
PROVIDE ( _FS_end = 0x402FB000 );
18+
PROVIDE ( _FS_page = 0x100 );
19+
PROVIDE ( _FS_block = 0x1000 );
20+
PROVIDE ( _EEPROM_start = 0x402fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x402EB000 );
23+
PROVIDE ( _SPIFFS_end = 0x402FB000 );
24+
PROVIDE ( _SPIFFS_page = 0x100 );
25+
PROVIDE ( _SPIFFS_block = 0x1000 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

Diff for: ‎tools/sdk/ld/backup/eagle.flash.2m.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 2M chips */
2+
/* sketch @0x40200000 (~1019KB) (1044464B) */
3+
/* empty @0x402FEFF0 (~1008KB) (1032208B) */
4+
/* spiffs @0x403FB000 (~0KB) (0B) */
5+
/* eeprom @0x403FB000 (4KB) */
6+
/* rfcal @0x403FC000 (4KB) */
7+
/* wifi @0x403FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0xfeff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x403FB000 );
17+
PROVIDE ( _FS_end = 0x403FB000 );
18+
PROVIDE ( _FS_page = 0x0 );
19+
PROVIDE ( _FS_block = 0x0 );
20+
PROVIDE ( _EEPROM_start = 0x403fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x403FB000 );
23+
PROVIDE ( _SPIFFS_end = 0x403FB000 );
24+
PROVIDE ( _SPIFFS_page = 0x0 );
25+
PROVIDE ( _SPIFFS_block = 0x0 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

Diff for: ‎tools/sdk/ld/backup/eagle.flash.2m128.ld

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/* Flash Split for 2M chips */
2+
/* sketch @0x40200000 (~1019KB) (1044464B) */
3+
/* empty @0x402FEFF0 (~900KB) (921616B) */
4+
/* spiffs @0x403E0000 (~108KB) (110592B) */
5+
/* eeprom @0x403FB000 (4KB) */
6+
/* rfcal @0x403FC000 (4KB) */
7+
/* wifi @0x403FD000 (12KB) */
8+
9+
MEMORY
10+
{
11+
dport0_0_seg : org = 0x3FF00000, len = 0x10
12+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
13+
irom0_0_seg : org = 0x40201010, len = 0xfeff0
14+
}
15+
16+
PROVIDE ( _FS_start = 0x403E0000 );
17+
PROVIDE ( _FS_end = 0x403FB000 );
18+
PROVIDE ( _FS_page = 0x100 );
19+
PROVIDE ( _FS_block = 0x1000 );
20+
PROVIDE ( _EEPROM_start = 0x403fb000 );
21+
/* The following symbols are DEPRECATED and will be REMOVED in a future release */
22+
PROVIDE ( _SPIFFS_start = 0x403E0000 );
23+
PROVIDE ( _SPIFFS_end = 0x403FB000 );
24+
PROVIDE ( _SPIFFS_page = 0x100 );
25+
PROVIDE ( _SPIFFS_block = 0x1000 );
26+
27+
INCLUDE "local.eagle.app.v6.common.ld"

0 commit comments

Comments
 (0)