From: asterix Date: Thu, 22 Sep 2011 08:55:48 +0000 (+0000) Subject: Comply to new betos module. Add comments. X-Git-Url: https://codewiz.org/gitweb?p=bertos.git;a=commitdiff_plain;h=c7b292d40e485609749c2c05400ae8b79991452d Comply to new betos module. Add comments. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@5087 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/boards/sam3x-ek/examples/sam3x-ek_http_server/main.c b/boards/sam3x-ek/examples/sam3x-ek_http_server/main.c index d7b37706..78cf8d09 100644 --- a/boards/sam3x-ek/examples/sam3x-ek_http_server/main.c +++ b/boards/sam3x-ek/examples/sam3x-ek_http_server/main.c @@ -26,16 +26,21 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. * - * Copyright 2010,2011 Develer S.r.l. (http://www.develer.com/) + * Copyright 2011 Develer S.r.l. (http://www.develer.com/) * * --> * * \author Andrea Righi + * \author Daniele Basile * - * \brief lwIP TCP/IP echo server listening on port 80. + * \brief Simple Http server. + * + * This simple web server read the site's pages from SD card, and manage + * the cases where SD is not present or page not found, using embedded pages. + * Quering from browser the /status page, the server return a json dictionary where are store + * some board status info, like board temperature, up-time, etc. */ -#include "bertos.c" #include "hw/hw_sd.h" #include "hw/hw_adc.h" @@ -65,6 +70,8 @@ #include +#include + #include #include @@ -152,7 +159,7 @@ static const char http_html_hdr_404[] = "HTTP/1.1 404 Not Found\r\nContent-type: static const char http_file_not_found[] = "\ \ \ -404 Not Found

404 Not Found

\ +404 Not Found

404 Not Found

The requested URL was not found on this server.

BeRTOS simple HTTP server

"; @@ -160,7 +167,7 @@ static const char http_file_not_found[] = "\ static const char http_sd_not_present[] = " \ \ \ -BeRTOS simple HTTP Server

\ +BeRTOS simple HTTP Server

BeRTOS simple HTTP Server

Simple Http server, the site's pages are stored on SD card, check it if is present.

\ www.BeRTOS.org \ "; @@ -225,9 +232,9 @@ int main(void) if (strlen(file_name) == 0) strcpy(file_name, "index.htm"); - if (!strcmp("bertos_jpg.jpg", file_name)) + if (!strcmp("bertos_logo_jpg.jpg", file_name)) { - netconn_write(client, bertos_jpg, sizeof(bertos_jpg), NETCONN_NOCOPY); + netconn_write(client, bertos_logo_jpg, bertos_logo_jpg_len, NETCONN_NOCOPY); } else if (!strcmp("status", file_name)) { diff --git a/boards/sam3x-ek/examples/sam3x-ek_http_server/project.bertos b/boards/sam3x-ek/examples/sam3x-ek_http_server/project.bertos index 26e0bc80..2a18650d 100644 --- a/boards/sam3x-ek/examples/sam3x-ek_http_server/project.bertos +++ b/boards/sam3x-ek/examples/sam3x-ek_http_server/project.bertos @@ -30,62 +30,64 @@ p14 (lp15 S'adc' p16 -aS'debug' +aS'bertos' p17 -aS'eth' +aS'debug' p18 -aS'fat' +aS'eth' p19 -aS'formatwr' +aS'fat' p20 -aS'heap' +aS'formatwr' p21 -aS'i2s' +aS'heap' p22 -aS'kblock' +aS'i2s' p23 -aS'kernel' +aS'kblock' p24 -aS'kfile' +aS'kernel' p25 -aS'lcd_hx8347' +aS'kfile' p26 -aS'lwip' +aS'lcd_hx8347' p27 -aS'monitor' +aS'lwip' p28 -aS'msg' +aS'monitor' p29 -aS'sd' +aS'msg' p30 -aS'signal' +aS'sd' p31 -aS'sprintf' +aS'signal' p32 -aS'timer' +aS'sprintf' p33 -asS'CPU_NAME' +aS'timer' p34 -VSAM3X8 +asS'CPU_NAME' p35 -sS'PROJECT_HW_PATH' +VSAM3X8 p36 -S'../..' +sS'PROJECT_HW_PATH' p37 -sS'PROJECT_SRC_PATH' +S'../..' p38 -S'.' +sS'PROJECT_SRC_PATH' p39 -sS'PRESET' +S'.' p40 +sS'PRESET' +p41 I01 sS'PROJECT_SRC_PATH_FROM_MAKEFILE' -p41 -Vboards/sam3x-ek/examples/sam3x-ek_http_server p42 -sS'OUTPUT' +Vboards/sam3x-ek/examples/sam3x-ek_http_server p43 -(lp44 +sS'OUTPUT' +p44 +(lp45 S'codelite' -p45 +p46 as. \ No newline at end of file diff --git a/boards/sam3x-ek/examples/sam3x-ek_http_server/sam3x-ek_http_server.mk b/boards/sam3x-ek/examples/sam3x-ek_http_server/sam3x-ek_http_server.mk index e1a4102d..2dcfd7b1 100644 --- a/boards/sam3x-ek/examples/sam3x-ek_http_server/sam3x-ek_http_server.mk +++ b/boards/sam3x-ek/examples/sam3x-ek_http_server/sam3x-ek_http_server.mk @@ -33,6 +33,7 @@ sam3x-ek_http_server_WIZARD_CSRC = \ bertos/fs/fat.c \ bertos/fs/fatfs/diskio.c \ bertos/fs/fatfs/ff.c \ + bertos/icons/bertos.c \ bertos/io/kblock.c \ bertos/io/kfile.c \ bertos/kern/monitor.c \