Skip to content

Commit ace393e

Browse files
author
David Betz
committed
Remove the libesphttpd submodule to prepare to move it to the Parallax github account.
1 parent 0e29004 commit ace393e

File tree

6 files changed

+4
-6
lines changed

6 files changed

+4
-6
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "libesphttpd"]
2-
path = libesphttpd
3-
url = https://github.com/parallaxinc/libesphttpd.git

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ $(info VERSION $(VERSION))
1515

1616
#SPI flash size, in K
1717
ESP_SPI_FLASH_SIZE_K=4096
18+
#pretend we only have 1MB of flash so we can use the rest as a flash filesystem
19+
#ESP_SPI_FLASH_SIZE_K=1024
1820
#Amount of the flash to use for the image(s)
1921
ESP_SPI_IMAGE_SIZE_K=1024
2022
#0: QIO, 1: QOUT, 2: DIO, 3: DOUT

Makefile.ota

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ BLANKPOS="$$(printf "0x%X" $$(($(ESP_SPI_FLASH_SIZE_K)*512-0x2000)))"
2525
INITDATAPOS="$$(printf "0x%X" $$(($(ESP_SPI_FLASH_SIZE_K)*512-0x4000)))"
2626

2727
#Convert SPI size into arg for appgen. Format: no=size
28-
FLASH_MAP_CONV:=0:512 2:1024 5:2048 6:4096
29-
ESP_FLASH_SIZE_IX:=$(maplookup $(ESP_SPI_IMAGE_SIZE_K),,$(FLASH_MAP_CONV))
28+
FLASH_MAP_CONV:=512:0 1024:2 2048:5 4096:6
29+
ESP_FLASH_SIZE_IX:=$(call maplookup,$(ESP_SPI_IMAGE_SIZE_K),$(FLASH_MAP_CONV))
3030

3131
CFLAGS += -DOTA_TAGNAME=\"$(TAGNAME)\"
3232

libesphttpd

Lines changed: 0 additions & 1 deletion
This file was deleted.

release/flash-all.sh

100644100755
File mode changed.

release/update-fw.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)