Skip to content

Commit 8f99861

Browse files
igrrigrr
committed
Merge pull request #1198 from hallard/master
WifInfo boards, more custom SPIFFS Size for 1M modules
2 parents 7cb2cb5 + 027b5af commit 8f99861

File tree

7 files changed

+301
-0
lines changed

7 files changed

+301
-0
lines changed

‎boards.txt‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ menu.FlashMode=Flash Mode
55
menu.FlashFreq=Flash Frequency
66
menu.UploadTool=Upload Using
77
menu.ResetMethod=Reset Method
8+
menu.ESPModule=Module
89

910
##############################################################
1011
generic.name=Generic ESP8266 Module
@@ -95,6 +96,30 @@ generic.menu.FlashSize.1M256.build.spiffs_end=0xFB000
9596
generic.menu.FlashSize.1M256.build.spiffs_blocksize=4096
9697
generic.menu.FlashSize.1M256.upload.maximum_size=761840
9798

99+
generic.menu.FlashSize.1M192=1M (192K SPIFFS)
100+
generic.menu.FlashSize.1M192.build.flash_size=1M
101+
generic.menu.FlashSize.1M192.build.flash_ld=eagle.flash.1m192.ld
102+
generic.menu.FlashSize.1M192.build.spiffs_start=0xCB000
103+
generic.menu.FlashSize.1M192.build.spiffs_end=0xFB000
104+
generic.menu.FlashSize.1M192.build.spiffs_blocksize=4096
105+
generic.menu.FlashSize.1M192.upload.maximum_size=827376
106+
107+
generic.menu.FlashSize.1M160=1M (160K SPIFFS)
108+
generic.menu.FlashSize.1M160.build.flash_size=1M
109+
generic.menu.FlashSize.1M160.build.flash_ld=eagle.flash.1m160.ld
110+
generic.menu.FlashSize.1M160.build.spiffs_start=0xD3000
111+
generic.menu.FlashSize.1M160.build.spiffs_end=0xFB000
112+
generic.menu.FlashSize.1M160.build.spiffs_blocksize=4096
113+
generic.menu.FlashSize.1M160.upload.maximum_size=860144
114+
115+
generic.menu.FlashSize.1M144=1M (144K SPIFFS)
116+
generic.menu.FlashSize.1M144.build.flash_size=1M
117+
generic.menu.FlashSize.1M144.build.flash_ld=eagle.flash.1m144.ld
118+
generic.menu.FlashSize.1M144.build.spiffs_start=0xD7000
119+
generic.menu.FlashSize.1M144.build.spiffs_end=0xFB000
120+
generic.menu.FlashSize.1M144.build.spiffs_blocksize=4096
121+
generic.menu.FlashSize.1M144.upload.maximum_size=876528
122+
98123
generic.menu.FlashSize.1M128=1M (128K SPIFFS)
99124
generic.menu.FlashSize.1M128.build.flash_size=1M
100125
generic.menu.FlashSize.1M128.build.flash_ld=eagle.flash.1m128.ld
@@ -771,3 +796,126 @@ espino.menu.ResetMethod.ck=ck
771796
espino.menu.ResetMethod.ck.upload.resetmethod=ck
772797
espino.menu.ResetMethod.nodemcu=nodemcu
773798
espino.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
799+
800+
##############################################################
801+
wifinfo.name=WifInfo
802+
803+
wifinfo.upload.tool=esptool
804+
wifinfo.upload.speed=115200
805+
wifinfo.upload.resetmethod=nodemcu
806+
wifinfo.upload.maximum_size=434160
807+
wifinfo.upload.maximum_data_size=81920
808+
wifinfo.upload.wait_for_upload_port=true
809+
wifinfo.serial.disableDTR=true
810+
wifinfo.serial.disableRTS=true
811+
812+
wifinfo.build.mcu=esp8266
813+
wifinfo.build.f_cpu=80000000L
814+
wifinfo.build.core=esp8266
815+
wifinfo.build.variant=wifinfo
816+
wifinfo.build.flash_mode=qio
817+
wifinfo.build.spiffs_pagesize=256
818+
819+
#wifinfo.menu.ESPModule.ESP07512=ESP07 (1M/512K SPIFFS)
820+
#wifinfo.menu.ESPModule.ESP07512.build.board=ESP8266_ESP07
821+
#wifinfo.menu.ESPModule.ESP07512.build.flash_size=1M
822+
#wifinfo.menu.ESPModule.ESP07512.build.flash_ld=eagle.flash.1m512.ld
823+
#wifinfo.menu.ESPModule.ESP07512.build.spiffs_start=0x7B000
824+
#wifinfo.menu.ESPModule.ESP07512.build.spiffs_end=0xFB000
825+
#wifinfo.menu.ESPModule.ESP07512.build.spiffs_blocksize=8192
826+
#wifinfo.menu.ESPModule.ESP07512.upload.maximum_size=499696
827+
828+
#wifinfo.menu.ESPModule.ESP07256=ESP07 (1M/256K SPIFFS)
829+
#wifinfo.menu.ESPModule.ESP07256.build.board=ESP8266_ESP07
830+
#wifinfo.menu.ESPModule.ESP07256.build.flash_size=1M
831+
#wifinfo.menu.ESPModule.ESP07256.build.flash_ld=eagle.flash.1m256.ld
832+
#wifinfo.menu.ESPModule.ESP07256.build.spiffs_start=0xBB000
833+
#wifinfo.menu.ESPModule.ESP07256.build.spiffs_end=0xFB000
834+
##wifinfo.menu.ESPModule.ESP07256.build.spiffs_blocksize=4096
835+
#wifinfo.menu.ESPModule.ESP07256.upload.maximum_size=761840
836+
837+
wifinfo.menu.ESPModule.ESP07192=ESP07 (1M/192K SPIFFS)
838+
wifinfo.menu.ESPModule.ESP07192.build.board=ESP8266_ESP07
839+
wifinfo.menu.ESPModule.ESP07192.build.flash_size=1M
840+
wifinfo.menu.ESPModule.ESP07192.build.flash_ld=eagle.flash.1m192.ld
841+
wifinfo.menu.ESPModule.ESP07192.build.spiffs_start=0xCB000
842+
wifinfo.menu.ESPModule.ESP07192.build.spiffs_end=0xFB000
843+
wifinfo.menu.ESPModule.ESP07192.build.spiffs_blocksize=4096
844+
wifinfo.menu.ESPModule.ESP07192.upload.maximum_size=827376
845+
846+
#wifinfo.menu.ESPModule.ESP07160=ESP07 (1M/160K SPIFFS)
847+
#wifinfo.menu.ESPModule.ESP07160.build.board=ESP8266_ESP07
848+
#wifinfo.menu.ESPModule.ESP07160.build.flash_size=1M
849+
#wifinfo.menu.ESPModule.ESP07160.build.flash_ld=eagle.flash.1m160.ld
850+
#wifinfo.menu.ESPModule.ESP07160.build.spiffs_start=0xD3000
851+
#wifinfo.menu.ESPModule.ESP07160.build.spiffs_end=0xFB000
852+
#wifinfo.menu.ESPModule.ESP07160.build.spiffs_blocksize=4096
853+
#wifinfo.menu.ESPModule.ESP07160.upload.maximum_size=860144
854+
#
855+
#wifinfo.menu.ESPModule.ESP07144=ESP07 (1M/144K SPIFFS)
856+
#wifinfo.menu.ESPModule.ESP07144.build.board=ESP8266_ESP07
857+
#wifinfo.menu.ESPModule.ESP07144.build.flash_size=1M
858+
#wifinfo.menu.ESPModule.ESP07144.build.flash_ld=eagle.flash.1m144.ld
859+
#wifinfo.menu.ESPModule.ESP07144.build.spiffs_start=0xD7000
860+
#wifinfo.menu.ESPModule.ESP07144.build.spiffs_end=0xFB000
861+
#wifinfo.menu.ESPModule.ESP07144.build.spiffs_blocksize=4096
862+
#wifinfo.menu.ESPModule.ESP07144.upload.maximum_size=876528
863+
#
864+
#wifinfo.menu.ESPModule.ESP07=ESP07 (1M/64K SPIFFS)
865+
#wifinfo.menu.ESPModule.ESP07.build.board=ESP8266_ESP07
866+
#wifinfo.menu.ESPModule.ESP07.build.flash_size=1M
867+
#wifinfo.menu.ESPModule.ESP07.build.flash_ld=eagle.flash.1m64.ld
868+
#wifinfo.menu.ESPModule.ESP07.build.spiffs_start=0xEB000
869+
#wifinfo.menu.ESPModule.ESP07.build.spiffs_end=0xFB000
870+
#wifinfo.menu.ESPModule.ESP07.build.spiffs_blocksize=4096
871+
#wifinfo.menu.ESPModule.ESP07.upload.maximum_size=958448
872+
873+
wifinfo.menu.ESPModule.ESP12=ESP12 (4M/1M SPIFFS)
874+
wifinfo.menu.ESPModule.ESP12.build.board=ESP8266_ESP12
875+
wifinfo.menu.ESPModule.ESP12.build.flash_size=4M
876+
wifinfo.menu.ESPModule.ESP12.build.flash_ld=eagle.flash.4m1m.ld
877+
wifinfo.menu.ESPModule.ESP12.build.spiffs_start=0x300000
878+
wifinfo.menu.ESPModule.ESP12.build.spiffs_end=0x3FB000
879+
wifinfo.menu.ESPModule.ESP12.build.spiffs_blocksize=8192
880+
wifinfo.menu.ESPModule.ESP12.build.spiffs_pagesize=256
881+
wifinfo.menu.ESPModule.ESP12.upload.maximum_size=1044464
882+
883+
wifinfo.menu.UploadTool.esptool=Serial
884+
wifinfo.menu.UploadTool.esptool.upload.tool=esptool
885+
wifinfo.menu.UploadTool.esptool.upload.verbose=-vv
886+
wifinfo.menu.UploadTool.espota=OTA
887+
wifinfo.menu.UploadTool.espota.upload.tool=espota
888+
889+
wifinfo.menu.CpuFrequency.80=80 MHz
890+
wifinfo.menu.CpuFrequency.80.build.f_cpu=80000000L
891+
wifinfo.menu.CpuFrequency.160=160 MHz
892+
wifinfo.menu.CpuFrequency.160.build.f_cpu=160000000L
893+
894+
wifinfo.menu.FlashFreq.40=40MHz
895+
wifinfo.menu.FlashFreq.40.build.flash_freq=40
896+
wifinfo.menu.FlashFreq.80=80MHz
897+
wifinfo.menu.FlashFreq.80.build.flash_freq=80
898+
899+
wifinfo.menu.FlashMode.dio=DIO
900+
wifinfo.menu.FlashMode.dio.build.flash_mode=dio
901+
wifinfo.menu.FlashMode.qio=QIO
902+
wifinfo.menu.FlashMode.qio.build.flash_mode=qio
903+
904+
wifinfo.menu.UploadSpeed.115200=115200
905+
wifinfo.menu.UploadSpeed.115200.upload.speed=115200
906+
wifinfo.menu.UploadSpeed.9600=9600
907+
wifinfo.menu.UploadSpeed.9600.upload.speed=9600
908+
wifinfo.menu.UploadSpeed.57600=57600
909+
wifinfo.menu.UploadSpeed.57600.upload.speed=57600
910+
wifinfo.menu.UploadSpeed.256000.windows=256000
911+
wifinfo.menu.UploadSpeed.256000.upload.speed=256000
912+
wifinfo.menu.UploadSpeed.230400.linux=230400
913+
wifinfo.menu.UploadSpeed.230400.macosx=230400
914+
wifinfo.menu.UploadSpeed.230400.upload.speed=230400
915+
wifinfo.menu.UploadSpeed.460800.linux=460800
916+
wifinfo.menu.UploadSpeed.460800.macosx=460800
917+
wifinfo.menu.UploadSpeed.460800.upload.speed=460800
918+
wifinfo.menu.UploadSpeed.512000.windows=512000
919+
wifinfo.menu.UploadSpeed.512000.upload.speed=512000
920+
wifinfo.menu.UploadSpeed.921600=921600
921+
wifinfo.menu.UploadSpeed.921600.upload.speed=921600

‎doc/boards.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ title: Supported Hardware
1212
* [SparkFun ESP8266 Thing](#sparkfun-esp8266-thing)
1313
* [SweetPea ESP\-210](#sweetpea-esp-210)
1414
* [ESPino](#espino)
15+
* [WifInfo](#WifInfo)
1516
* [Generic ESP8266 modules](#generic-esp8266-modules)
1617
* [Serial Adapter](#serial-adapter)
1718
* [Minimal Hardware Setup for Bootloading and Usage](#minimal-hardware-setup-for-bootloading-and-usage)
@@ -100,6 +101,12 @@ For more information about the hardware, pinout diagram and programming procedur
100101

101102
Product page: http://www.espino.io/en
102103

104+
## WifInfo
105+
106+
WifInfo integrates the ESP-12 or ESP-07+Ext antenna module with a 3.3v regulator and the hardware to be able to measure French telemetry issue from ERDF powering meter serial output. It has a USB connector for powering, an RGB WS2812 Led, 4 pins I2C connector to fit OLED or sensor, and two buttons + FTDI connector and auto reset feature.
107+
108+
For more information, please see WifInfo related [blog](http://hallard.me/category/wifinfo/) entries, [github](https://github.com/hallard/WifInfo) and [community](https://community.hallard.me/category/16/wifinfo) forum.
109+
103110
## Generic ESP8266 modules
104111

105112
These modules come in different form factors and pinouts. See the page at ESP8266 community wiki for more info:

‎package/package_esp8266com_index.template.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
},
5252
{
5353
"name": "ESPino"
54+
},
55+
{
56+
"name": "WifInfo"
5457
}
5558
],
5659
"toolsDependencies": [

‎tools/sdk/ld/eagle.flash.1m144.ld‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* Flash Split for 1M chips */
2+
/* sketch 855KB */
3+
/* spiffs 144KB */
4+
/* eeprom 20KB */
5+
6+
MEMORY
7+
{
8+
dport0_0_seg : org = 0x3FF00000, len = 0x10
9+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
10+
iram1_0_seg : org = 0x40100000, len = 0x8000
11+
irom0_0_seg : org = 0x40201010, len = 0xd5ff0
12+
}
13+
14+
PROVIDE ( _SPIFFS_start = 0x402D7000 );
15+
PROVIDE ( _SPIFFS_end = 0x402FB000 );
16+
PROVIDE ( _SPIFFS_page = 0x100 );
17+
PROVIDE ( _SPIFFS_block = 0x1000 );
18+
19+
INCLUDE "../ld/eagle.app.v6.common.ld"

‎tools/sdk/ld/eagle.flash.1m160.ld‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* Flash Split for 1M chips */
2+
/* sketch 839KB */
3+
/* spiffs 160KB */
4+
/* eeprom 20KB */
5+
6+
MEMORY
7+
{
8+
dport0_0_seg : org = 0x3FF00000, len = 0x10
9+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
10+
iram1_0_seg : org = 0x40100000, len = 0x8000
11+
irom0_0_seg : org = 0x40201010, len = 0xd1ff0
12+
}
13+
14+
PROVIDE ( _SPIFFS_start = 0x402D3000 );
15+
PROVIDE ( _SPIFFS_end = 0x402FB000 );
16+
PROVIDE ( _SPIFFS_page = 0x100 );
17+
PROVIDE ( _SPIFFS_block = 0x1000 );
18+
19+
INCLUDE "../ld/eagle.app.v6.common.ld"

‎tools/sdk/ld/eagle.flash.1m192.ld‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* Flash Split for 1M chips */
2+
/* sketch 807KB */
3+
/* spiffs 192KB */
4+
/* eeprom 20KB */
5+
6+
MEMORY
7+
{
8+
dport0_0_seg : org = 0x3FF00000, len = 0x10
9+
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
10+
iram1_0_seg : org = 0x40100000, len = 0x8000
11+
irom0_0_seg : org = 0x40201010, len = 0xc9ff0
12+
}
13+
14+
PROVIDE ( _SPIFFS_start = 0x402CB000 );
15+
PROVIDE ( _SPIFFS_end = 0x402FB000 );
16+
PROVIDE ( _SPIFFS_page = 0x100 );
17+
PROVIDE ( _SPIFFS_block = 0x1000 );
18+
19+
INCLUDE "../ld/eagle.app.v6.common.ld"

‎variants/wifinfo/pins_arduino.h‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
/*
2+
pins_arduino.h - Pin definition functions for Arduino
3+
Part of Arduino - http://www.arduino.cc/
4+
5+
Copyright (c) 2007 David A. Mellis
6+
Modified for ESP8266 platform by Ivan Grokhotkov, 2014-2015.
7+
8+
This library is free software; you can redistribute it and/or
9+
modify it under the terms of the GNU Lesser General Public
10+
License as published by the Free Software Foundation; either
11+
version 2.1 of the License, or (at your option) any later version.
12+
13+
This library is distributed in the hope that it will be useful,
14+
but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
Lesser General Public License for more details.
17+
18+
You should have received a copy of the GNU Lesser General
19+
Public License along with this library; if not, write to the
20+
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
21+
Boston, MA 02111-1307 USA
22+
23+
Changed : 20 Nov 2015 Charles-Henri Hallard
24+
Definition for WifInfo boards
25+
see https://github.com/hallard/LibTeleinfo/tree/master/examples/ESP8266_WifInfo
26+
see https://hallard.me/wifinfo/
27+
28+
$Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
29+
*/
30+
31+
#ifndef Pins_Arduino_h
32+
#define Pins_Arduino_h
33+
34+
#define EXTERNAL_NUM_INTERRUPTS 16
35+
#define NUM_DIGITAL_PINS 17
36+
#define NUM_ANALOG_INPUTS 1
37+
38+
#define analogInputToDigitalPin(p) ((p > 0)?NOT_A_PIN:0)
39+
#define digitalPinToInterrupt(p) (((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
40+
#define digitalPinHasPWM(p) (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
41+
42+
static const uint8_t SDA = 4;
43+
static const uint8_t SCL = 5;
44+
45+
static const uint8_t SS = 15;
46+
static const uint8_t MOSI = 13;
47+
static const uint8_t MISO = 12;
48+
static const uint8_t SCK = 14;
49+
50+
static const uint8_t BUILTIN_LED = 12;
51+
52+
static const uint8_t A0 = 17;
53+
54+
static const uint8_t D0 = 16;
55+
static const uint8_t D1 = 5;
56+
static const uint8_t D2 = 4;
57+
static const uint8_t D3 = 0;
58+
static const uint8_t D4 = 2;
59+
static const uint8_t D5 = 14;
60+
static const uint8_t D6 = 12;
61+
static const uint8_t D7 = 13;
62+
static const uint8_t D8 = 15;
63+
static const uint8_t D9 = 3;
64+
static const uint8_t D10 = 1;
65+
66+
// These serial port names are intended to allow libraries and architecture-neutral
67+
// sketches to automatically default to the correct port name for a particular type
68+
// of use. For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
69+
// the first hardware serial port whose RX/TX pins are not dedicated to another use.
70+
//
71+
// SERIAL_PORT_MONITOR Port which normally prints to the Arduino Serial Monitor
72+
//
73+
// SERIAL_PORT_USBVIRTUAL Port which is USB virtual serial
74+
//
75+
// SERIAL_PORT_LINUXBRIDGE Port which connects to a Linux system via Bridge library
76+
//
77+
// SERIAL_PORT_HARDWARE Hardware serial port, physical RX & TX pins.
78+
//
79+
// SERIAL_PORT_HARDWARE_OPEN Hardware serial ports which are open for use. Their RX & TX
80+
// pins are NOT connected to anything by default.
81+
#define SERIAL_PORT_MONITOR Serial1
82+
#define SERIAL_PORT_USBVIRTUAL Serial
83+
#define SERIAL_PORT_HARDWARE Serial
84+
#define SERIAL_PORT_HARDWARE_OPEN Serial
85+
86+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)