Fix a handlers.c error I missed because of missing include file dependencies.

Also revert a Makefile change (lwip library) accidentally committed.
Add a "make depend" target to avoid missing dependencies.
pull/289/head
dannybackx 8 years ago
parent dfd156b079
commit 50688ed5d9
  1. 12
      Makefile
  2. 6
      cmd/handlers.c

@ -253,7 +253,7 @@ MODULES += $(foreach sdir,$(LIBRARIES_DIR),$(wildcard $(sdir)/*))
EXTRA_INCDIR = include . EXTRA_INCDIR = include .
# libraries used in this project, mainly provided by the SDK # libraries used in this project, mainly provided by the SDK
LIBS = c gcc hal phy pp net80211 wpa main lwip crypto LIBS = c gcc hal phy pp net80211 wpa main lwip_536 crypto
# compiler flags using during compilation of source files # compiler flags using during compilation of source files
CFLAGS += -Os -ggdb -std=c99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions \ CFLAGS += -Os -ggdb -std=c99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions \
@ -519,3 +519,13 @@ ifeq ("$(COMPRESS_W_HTMLCOMPRESSOR)","yes")
endif endif
$(foreach bdir,$(BUILD_DIR),$(eval $(call compile-objects,$(bdir)))) $(foreach bdir,$(BUILD_DIR),$(eval $(call compile-objects,$(bdir))))
depend:
makedepend -p${BUILD_BASE}/ -Y -- $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) -I${XTENSA_TOOLS_ROOT}../xtensa-lx106-elf/include -I${XTENSA_TOOLS_ROOT}../lib/gcc/xtensa-lx106-elf/4.8.2/include -- */*.c
# Rebuild version at least at every Makefile change
${BUILD_BASE}/esp-link/main.o: Makefile
# DO NOT DELETE

@ -40,6 +40,8 @@ static void cmdWifiGetApCount(CmdPacket *cmd);
static void cmdWifiGetApName(CmdPacket *cmd); static void cmdWifiGetApName(CmdPacket *cmd);
static void cmdWifiSelectSSID(CmdPacket *cmd); static void cmdWifiSelectSSID(CmdPacket *cmd);
static void cmdWifiSignalStrength(CmdPacket *cmd); static void cmdWifiSignalStrength(CmdPacket *cmd);
static void cmdWifiQuerySSID(CmdPacket *cmd);
static void cmdWifiStartScan(CmdPacket *cmd);
void cmdMqttGetClientId(CmdPacket *cmd); void cmdMqttGetClientId(CmdPacket *cmd);
@ -361,7 +363,7 @@ static void ICACHE_FLASH_ATTR cmdWifiSignalStrength(CmdPacket *cmd) {
} }
// //
void ICACHE_FLASH_ATTR cmdWifiQuerySSID(CmdPacket *cmd) { static void ICACHE_FLASH_ATTR cmdWifiQuerySSID(CmdPacket *cmd) {
CmdRequest req; CmdRequest req;
cmdRequest(&req, cmd); cmdRequest(&req, cmd);
uint32_t callback = req.cmd->value; uint32_t callback = req.cmd->value;
@ -381,7 +383,7 @@ void ICACHE_FLASH_ATTR cmdWifiQuerySSID(CmdPacket *cmd) {
} }
// Start scanning, API interface // Start scanning, API interface
void ICACHE_FLASH_ATTR cmdWifiStartScan(CmdPacket *cmd) { static void ICACHE_FLASH_ATTR cmdWifiStartScan(CmdPacket *cmd) {
// call a function that belongs in esp-link/cgiwifi.c due to variable access // call a function that belongs in esp-link/cgiwifi.c due to variable access
wifiStartScan(); wifiStartScan();
} }

Loading…
Cancel
Save