Skip to content

Commit 1368a82

Browse files
committed
Merge pull request #1154 from Links2004/master
fix #1151 + eclipse makefile example
2 parents f7bbea4 + d06b910 commit 1368a82

File tree

3 files changed

+41
-2
lines changed

3 files changed

+41
-2
lines changed

cores/esp8266/Updater.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class UpdaterClass {
2626
Call this to check the space needed for the update
2727
Will return false if there is not enough space
2828
*/
29-
bool begin(size_t size, int = U_FLASH);
29+
bool begin(size_t size, int command = U_FLASH);
3030

3131
/*
3232
Writes a buffer to the flash and increments the address

cores/esp8266/esp8266_peri.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ extern uint8_t esp8266_gpioToFn[16];
494494

495495
//SPI Phase Length Locations
496496
#define SPILCOMMAND 28 //4 bit in SPIxU2 default 7 (8bit)
497-
#define SPILADDR 16 //6 bit in SPIxU1 default:23 (24bit)
497+
#define SPILADDR 26 //6 bit in SPIxU1 default:23 (24bit)
498498
#define SPILDUMMY 0 //8 bit in SPIxU1 default:0 (0 cycles)
499499
#define SPILMISO 8 //9 bit in SPIxU1 default:0 (1bit)
500500
#define SPILMOSI 17 //9 bit in SPIxU1 default:0 (1bit)

doc/eclipse/makefile.init

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
vecho := @echo
2+
Q := @
3+
4+
PROJECT_NAME=project_name
5+
6+
OTA_IP=192.168.254.100
7+
OTA_PORT=8266
8+
9+
SERIAL_PORT=COM3
10+
SERIAL_BAUD=230400
11+
12+
ARDUINO_BASE = D:/Coding/avr/Programme/arduino-nightly
13+
ESP8266_BASE = $(ARDUINO_BASE)/hardware/esp8266com/esp8266
14+
ESP8266_TOOLS = $(ESP8266_BASE)/tools
15+
XTENSA_TOOLS_ROOT = $(ESP8266_TOOLS)/xtensa-lx106-elf/bin
16+
17+
PYTHON_BIN = python
18+
ESPTOOL_PY_BIN = $(ESP8266_TOOLS)/esptool.py
19+
ESPOTA_PY_BIN = $(ESP8266_TOOLS)/espota.py
20+
ESPTOOL_BIN = $(ESP8266_TOOLS)/esptool/esptool.exe
21+
22+
ota:
23+
$(vecho) ota...
24+
$(PYTHON_BIN) $(ESPOTA_PY_BIN) -i $(OTA_IP) -p $(OTA_PORT) --auth= -f ./$(PROJECT_NAME).bin
25+
26+
ota_spiffs:
27+
$(vecho) ota spiffs...
28+
$(PYTHON_BIN) $(ESPOTA_PY_BIN) -i $(OTA_IP) -p $(OTA_PORT) --auth= -s -f ./$(PROJECT_NAME)_spiffs.bin
29+
30+
erase_flash:
31+
$(vecho) "Erase Flash"
32+
$(PYTHON_BIN) $(ESPTOOL_PY_BIN) -p $(SERIAL_PORT) -b $(SERIAL_BAUD) erase_flash
33+
34+
dumpmem:
35+
$(vecho) "Read Flash need some time..."
36+
$(PYTHON_BIN) $(ESPTOOL_PY_BIN) -p $(SERIAL_PORT) -b $(SERIAL_BAUD) read_flash 0 4194304 dump.bin
37+
38+
objdump:
39+
"$(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-objdump" -S $(PROJECT_NAME).elf > $(PROJECT_NAME).dobj

0 commit comments

Comments
 (0)