8 Commits

6 changed files with 58 additions and 8 deletions

4
.gitignore vendored
View File

@@ -1,3 +1,7 @@
# Wolfgangs own stuff
build
w5500.a
# Windows image file caches
Thumbs.db
ehthumbs.db

View File

@@ -80,7 +80,7 @@ void wizchip_cris_exit(void) {}
* null function is called.
*/
//void wizchip_cs_select(void) {};
void wizchip_cs_select(void) {}
__attribute__((weak)) void wizchip_cs_select(void) {}
/**
* @brief Default function to deselect chip.
@@ -88,7 +88,7 @@ void wizchip_cs_select(void) {}
* null function is called.
*/
//void wizchip_cs_deselect(void) {};
void wizchip_cs_deselect(void) {}
__attribute__((weak)) void wizchip_cs_deselect(void) {}
/**
* @brief Default function to read in direct or indirect interface.
@@ -114,7 +114,7 @@ void wizchip_bus_writedata(uint32_t AddrSel, iodata_t wb) { *((volatile iodata
* null function is called.
*/
//uint8_t wizchip_spi_readbyte(void) {return 0;};
uint8_t wizchip_spi_readbyte(void) {return 0;}
__attribute__((weak)) uint8_t wizchip_spi_readbyte(void) {return 0;}
/**
* @brief Default function to write in SPI interface.
@@ -122,7 +122,7 @@ uint8_t wizchip_spi_readbyte(void) {return 0;}
* null function is called.
*/
//void wizchip_spi_writebyte(uint8_t wb) {};
void wizchip_spi_writebyte(uint8_t wb) {}
__attribute__((weak)) void wizchip_spi_writebyte(uint8_t wb) {}
/**
* @brief Default function to burst read in SPI interface.
@@ -130,7 +130,7 @@ void wizchip_spi_writebyte(uint8_t wb) {}
* null function is called.
*/
//void wizchip_spi_readburst(uint8_t* pBuf, uint16_t len) {};
void wizchip_spi_readburst(uint8_t* pBuf, uint16_t len) {}
__attribute__((weak)) void wizchip_spi_readburst(uint8_t* pBuf, uint16_t len) {}
/**
* @brief Default function to burst write in SPI interface.
@@ -138,7 +138,7 @@ void wizchip_spi_readburst(uint8_t* pBuf, uint16_t len) {}
* null function is called.
*/
//void wizchip_spi_writeburst(uint8_t* pBuf, uint16_t len) {};
void wizchip_spi_writeburst(uint8_t* pBuf, uint16_t len) {}
__attribute__((weak)) void wizchip_spi_writeburst(uint8_t* pBuf, uint16_t len) {}
/**
* @\ref _WIZCHIP instance

View File

@@ -71,6 +71,10 @@ extern "C" {
#define W5300 5300
#define W5500 5500
#define _WIZCHIP_ W5500
#ifndef _WIZCHIP_
#define _WIZCHIP_ W5100S // W5100, W5100S, W5200, W5300, W5500
#endif

View File

@@ -601,7 +601,9 @@ int8_t parseDHCPMSG(void)
printf("DHCP message : %d.%d.%d.%d(%d) %d received. \r\n",svr_addr[0],svr_addr[1],svr_addr[2], svr_addr[3],svr_port, len);
#endif
}
else return 0;
else {
return 0;
}
if (svr_port == DHCP_SERVER_PORT) {
// compare mac address
if ( (pDHCPMSG->chaddr[0] != DHCP_CHADDR[0]) || (pDHCPMSG->chaddr[1] != DHCP_CHADDR[1]) ||

View File

@@ -539,7 +539,7 @@ int8_t DNS_run(uint8_t * dns_ip, uint8_t * name, uint8_t * ip_from_dns)
#ifdef _DNS_DEBUG_
printf("> DNS Server is not responding : %d.%d.%d.%d\r\n", dns_ip[0], dns_ip[1], dns_ip[2], dns_ip[3]);
#endif
wizchip_close(DNS_SOCKET);
close(DNS_SOCKET);
return 0; // timeout occurred
}
else if (ret_check_timeout == 0) {

40
Makefile Normal file
View File

@@ -0,0 +1,40 @@
CC=arm-none-eabi-gcc
AR=arm-none-eabi-ar
CFLAGS=-iquote Ethernet -iquote Application -iquote Internet -Wall
OBJDIR=build
VPATH=Ethernet:Ethernet/W5500
VPATH+=Internet/DHCP
VPATH+=Internet/DNS
VPATH+=Internet/MQTT:Internet/MQTT/MQTTPacket/src
VPATH+=Internet/httpServer
VPATH+=Internet/SNTP
OBJS=$(addprefix $(OBJDIR)/,wizchip_conf.o socket.o w5500.o \
dhcp.o \
dns.o \
httpParser.o httpServer.o httpUtil.o \
sntp.o \
MQTTConnectClient.o MQTTConnectServer.o MQTTDeserializePublish.o MQTTFormat.o MQTTPacket.o MQTTSerializePublish.o MQTTSubscribeClient.o MQTTSubscribeServer.o \
MQTTUnsubscribeClient.o MQTTUnsubscribeServer.o \
mqtt_interface.o MQTTClient.o \
)
all: $(OBJS)
$(AR) rcs w5500.a $^
$(OBJDIR)/%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@
$(OBJS): | $(OBJDIR)
$(OBJDIR):
mkdir $(OBJDIR)
.PHONY: clean
clean:
-rm -rf $(OBJDIR)