X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=boards%2Fsam3x-ek%2Fexamples%2Fsam3x-ek_http_server%2Fmain.c;h=fcce73575d6ec9e0a76f225e53a3f99b42a6b4b5;hb=397b786cf067438239bb1cdbf90d91e3fe2062ee;hp=fdf90de5092a44f42e44b871ce25a1f176ca2c96;hpb=f1700213ce77cc08371c77ba3da1f6e8cf60e4f3;p=bertos.git 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 fdf90de5..fcce7357 100644 --- a/boards/sam3x-ek/examples/sam3x-ek_http_server/main.c +++ b/boards/sam3x-ek/examples/sam3x-ek_http_server/main.c @@ -41,10 +41,14 @@ */ +#include "bitmaps.h" + #include "hw/hw_http.h" #include "hw/hw_sd.h" #include "hw/hw_adc.h" #include "hw/hw_sdram.h" +#include "hw/hw_led.h" +#include "hw/hw_lcd.h" // Define logging setting (for cfg/log.h module). #define LOG_LEVEL 3 @@ -60,9 +64,11 @@ #include #include #include +#include #include #include +#include #include @@ -74,27 +80,50 @@ #include #include +#include +#include +#include + #include #include +#include #include #include +/* Macro to unpack the ip addres from lwip format in 4 int*/ +#define IP_ADDR_TO_INT_TUPLE(addr) \ + (int)((addr) >> 0 & 0xff), \ + (int)((addr) >> 8 & 0xff), \ + (int)((addr) >> 16 & 0xff), \ + (int)((addr) >> 24 & 0xff) + /* Network interface global variables */ static struct ip_addr ipaddr, netmask, gw; static struct netif netif; + +#define GET_LED_STATUS(status, led_id) (((status) & BV((led_id))) >> (led_id)) +#define CLEAR_LED_STATUS(status, led_id) ((status) &= ~BV((led_id))) +#define SET_LED_STATUS(status, led_id) ((status) |= BV((led_id))) + typedef struct BoardStatus { char local_ip[sizeof("123.123.123.123")]; char last_connected_ip[sizeof("123.123.123.123")]; + uint8_t led_status; uint16_t internal_temp; uint32_t up_time; size_t tot_req; } BoardStatus; static BoardStatus status; +static uint8_t raster[RAST_SIZE(LCD_WIDTH, LCD_HEIGHT)]; +static Bitmap *lcd_bitmap; +extern Font font_gohu; +static int lcd_brightness = LCD_BACKLIGHT_MAX; +static struct Heap heap; static void init(void) @@ -113,6 +142,28 @@ static void init(void) */ proc_init(); sdram_init(); + dmac_init(); + adc_init(); + + /* Enable the adc to read internal temperature sensor */ + hw_enableTempRead(); + LED_INIT(); + + heap_init(&heap, (void *)SDRAM_BASE, SDRAM_SIZE); + lcd_bitmap = heap_allocmem(&heap, RAST_SIZE(LCD_WIDTH, LCD_HEIGHT)); + if (lcd_bitmap) + kprintf("Allocated memory for display raster, addr 0x%x\n", (unsigned)lcd_bitmap); + else + { + kprintf("Error allocating memory for LCD raster!\n"); + } + + lcd_hx8347_init(); + lcd_setBacklight(lcd_brightness); + + gfx_bitmapInit(lcd_bitmap, raster, LCD_WIDTH, LCD_HEIGHT); + gfx_setFont(lcd_bitmap, &font_luBS14); + lcd_hx8347_blitBitmap(lcd_bitmap); /* Initialize TCP/IP stack */ tcpip_init(NULL, NULL); @@ -121,64 +172,86 @@ static void init(void) netif_add(&netif, &ipaddr, &netmask, &gw, NULL, ethernetif_init, tcpip_input); netif_set_default(&netif); netif_set_up(&netif); +} - dmac_init(); - - adc_init(); - /* Enable the adc to read internal temperature sensor */ - hw_enableTempRead(); +static void sec_to_hms(uint32_t sec_time, uint32_t *h, uint32_t *m, uint32_t *s) +{ + *m = sec_time / 60; + *h = (*m) / 60; + *s = sec_time - ((*m) * 60) - ((*h) * 3600); } -static NORETURN void status_process(void) +static NORETURN void proc_displayRefresh(void) { while (1) { + //LOG_INFO("Refresh display\n"); + uint32_t m; + uint32_t h; + uint32_t s; status.internal_temp = hw_convertToDegree(adc_read(ADC_TEMPERATURE_CH)); - status.up_time++; - timer_delay(1000); + status.up_time += 5; + sec_to_hms(status.up_time, &h, &m, &s); + + text_xprintf(lcd_bitmap, 11, 0, TEXT_FILL, " "); + text_xprintf(lcd_bitmap, 11, 0, 0, "Board ip: %s", status.local_ip); + + text_xprintf(lcd_bitmap, 12, 0, TEXT_FILL, " "); + text_xprintf(lcd_bitmap, 12, 0, 0, "Last connected ip: %s", status.last_connected_ip); + + text_xprintf(lcd_bitmap, 13, 0, TEXT_FILL, " "); + text_xprintf(lcd_bitmap, 13, 0, 0, "Temperature: %d.%dC", status.internal_temp / 10, status.internal_temp % 10); + + text_xprintf(lcd_bitmap, 14, 0, TEXT_FILL, " "); + text_xprintf(lcd_bitmap, 14, 0, 0, "Up time: %ldh %ldm %lds", h, m, s); + + lcd_hx8347_blitBitmap(lcd_bitmap); + lcd_hx8347_blitBitmap24(10, 0, BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, bmp_logo); + + timer_delay(5000); } } -/* Macro to unpack the ip addres from lwip format */ -#define IP_ADDR_TO_INT_TUPLE(addr) \ - (int)((addr) >> 0 & 0xff), \ - (int)((addr) >> 8 & 0xff), \ - (int)((addr) >> 16 & 0xff), \ - (int)((addr) >> 24 & 0xff) - static uint8_t tx_buf[2048]; /* * Return a JSON string of board status. */ -static int cgi_status(struct netconn *client, const char *name, char *revc_buf, size_t revc_len) +static int cgi_status(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) { - (void)revc_buf; - (void)revc_len; + (void)recv_buf; + (void)recv_len; (void)name; + status.tot_req++; + uint16_t volt = ADC_RANGECONV(adc_read(1), 0, 3300); //Update board status. sprintf(status.last_connected_ip, "%d.%d.%d.%d", IP_ADDR_TO_INT_TUPLE(client->pcb.ip->remote_ip.addr)); sprintf(status.local_ip, "%d.%d.%d.%d", IP_ADDR_TO_INT_TUPLE(client->pcb.ip->local_ip.addr)); - sprintf((char *)tx_buf, "[ \"%s\", \"%s\", %d.%d, %ld, %d ]", status.local_ip, status.last_connected_ip, - status.internal_temp / 10, status.internal_temp % 10, - status.up_time, status.tot_req); - - status.tot_req++; - http_sendOk(client); + sprintf((char *)tx_buf, "{ \"local_ip\":\"%s\",\"last_connected_ip\":\"%s\", \"temp\":%d.%d,\"volt\":%d.%d,\"up_time\":%ld,\"tot_req\":%d, \ +\"leds\":{ \"0\":\"%d\", \"1\":\"%d\", \"2\":\"%d\"}}", + status.local_ip, status.last_connected_ip, + status.internal_temp / 10, status.internal_temp % 10, + volt / 1000, volt % 1000, + status.up_time, status.tot_req, + GET_LED_STATUS(status.led_status, 0), + GET_LED_STATUS(status.led_status, 1), + GET_LED_STATUS(status.led_status, 2)); + + http_sendOk(client, HTTP_CONTENT_JSON); netconn_write(client, tx_buf, strlen((char *)tx_buf), NETCONN_COPY); return 0; } -static int cgi_logo(struct netconn *client, const char *name, char *revc_buf, size_t revc_len) +static int cgi_logo(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) { - (void)revc_buf; - (void)revc_len; + (void)recv_buf; + (void)recv_len; (void)name; - http_sendOk(client); + http_sendOk(client, HTTP_CONTENT_JPEG); netconn_write(client, bertos_logo_jpg, bertos_logo_jpg_len, NETCONN_NOCOPY); return 0; } @@ -186,15 +259,15 @@ static int cgi_logo(struct netconn *client, const char *name, char *revc_buf, si /* * Return the internal micro temperature string. */ -static int cgi_temp(struct netconn *client, const char *name, char *revc_buf, size_t revc_len) +static int cgi_temp(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) { - (void)revc_buf; - (void)revc_len; + (void)recv_buf; + (void)recv_len; (void)name; sprintf((char *)tx_buf, "[%d.%d]", status.internal_temp / 10, status.internal_temp % 10); - http_sendOk(client); + http_sendOk(client, HTTP_CONTENT_JSON); netconn_write(client, tx_buf, strlen((char *)tx_buf), NETCONN_COPY); return 0; } @@ -203,21 +276,20 @@ static int cgi_temp(struct netconn *client, const char *name, char *revc_buf, si /* * Return the board uptime. */ -static int cgi_uptime(struct netconn *client, const char *name, char *revc_buf, size_t revc_len) +static int cgi_uptime(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) { - (void)revc_buf; - (void)revc_len; + (void)recv_buf; + (void)recv_len; (void)name; - - - uint32_t m = status.up_time / 60; - uint32_t h = m / 60; - uint32_t s = status.up_time - (m * 60) - (h * 3600); + uint32_t m; + uint32_t h; + uint32_t s; + sec_to_hms(status.up_time, &h, &m, &s); sprintf((char *)tx_buf, "[\"%ldh %ldm %lds\"]", h, m, s); - http_sendOk(client); + http_sendOk(client, HTTP_CONTENT_JSON); netconn_write(client, tx_buf, strlen((char *)tx_buf), NETCONN_COPY); return 0; } @@ -225,44 +297,182 @@ static int cgi_uptime(struct netconn *client, const char *name, char *revc_buf, /* * Return the VR1 potentiometer voltage. */ -static int cgi_resistor(struct netconn *client, const char *name, char *revc_buf, size_t revc_len) +static int cgi_resistor(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) { - (void)revc_buf; - (void)revc_len; + (void)recv_buf; + (void)recv_len; (void)name; uint16_t volt = ADC_RANGECONV(adc_read(1), 0, 3300); + kprintf("volt %d\n", volt); sprintf((char *)tx_buf, "[ \"%d.%dV\" ]", volt / 1000, volt % 1000); - http_sendOk(client); + http_sendOk(client, HTTP_CONTENT_JSON); netconn_write(client, tx_buf, strlen((char *)tx_buf), NETCONN_COPY); return 0; } + +#define CGI_LED_ID_KEY "n" +#define CGI_LED_CMD_KEY "set" + +static char key_value[80]; + /* * Reply to client the request string. */ -static int cgi_led(struct netconn *client, const char *name, char *revc_buf, size_t revc_len) +static int cgi_led(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) +{ + (void)recv_buf; + (void)recv_len; + (void)name; + + char *query_str = strstr(name, "?") + 1; + size_t query_str_len = strlen(query_str); + int led_id; + int led_cmd; + + int len = http_tokenizeGetRequest(query_str, query_str_len); + + LOG_INFO("Found %d key/value pair\n", len); + + if (http_getValue(query_str, query_str_len, CGI_LED_ID_KEY, key_value, sizeof(key_value)) < 0) + { + LOG_ERR("key %s, not found\n", CGI_LED_ID_KEY); + goto error; + } + + LOG_INFO("Found key %s = %s\n", CGI_LED_ID_KEY, key_value); + led_id = atoi(key_value); + + + if (http_getValue(query_str, query_str_len, CGI_LED_CMD_KEY, key_value, sizeof(key_value)) < 0) + { + LOG_ERR("key %s, not found\n", CGI_LED_CMD_KEY); + goto error; + } + + LOG_INFO("Found key %s = %s\n", CGI_LED_CMD_KEY, key_value); + led_cmd = atoi(key_value); + + if (led_cmd) + { + LED_ON(led_id); + SET_LED_STATUS(status.led_status, led_id); + } + else + { + LED_OFF(led_id); + CLEAR_LED_STATUS(status.led_status, led_id); + } + + sprintf((char *)tx_buf, "{\"n\":%d, \"set\":,%d}", led_id, led_cmd); + + http_sendOk(client, HTTP_CONTENT_JSON); + netconn_write(client, tx_buf, strlen((char *)tx_buf), NETCONN_COPY); + return 0; + +error: + http_sendInternalErr(client, HTTP_CONTENT_JSON); + return 0; +} + +static int cgi_ledStatus(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) { + (void)recv_buf; + (void)recv_len; (void)name; - http_sendOk(client); - netconn_write(client, revc_buf, revc_len, NETCONN_COPY); + sprintf((char *)tx_buf, "{ \"0\":\"%d\", \"1\":\"%d\", \"2\":\"%d\"}", + GET_LED_STATUS(status.led_status, 0), + GET_LED_STATUS(status.led_status, 1), + GET_LED_STATUS(status.led_status, 2)); + + http_sendOk(client, HTTP_CONTENT_JSON); + netconn_write(client, tx_buf, strlen((char *)tx_buf), NETCONN_COPY); + return 0; +} + + +#define CGI_MSG_CMD_KEY "msg" + +static int cgi_displayMsg(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) +{ + (void)recv_buf; + (void)recv_len; + (void)name; + + char *query_str = strstr(name, "?") + 1; + size_t query_str_len = strlen(query_str); + + int len = http_tokenizeGetRequest(query_str, query_str_len); + + LOG_INFO("Found %d key/value pair\n", len); + + if (http_getValue(query_str, query_str_len, CGI_MSG_CMD_KEY, key_value, sizeof(key_value)) < 0) + { + LOG_ERR("key %s, not found\n", CGI_MSG_CMD_KEY); + goto error; + } + + LOG_INFO("Found key %s = %s\n", CGI_MSG_CMD_KEY, key_value); + + text_xprintf(lcd_bitmap, 10, 0, TEXT_FILL, " "); + text_xprintf(lcd_bitmap, 10, 0, TEXT_CENTER, "%s", key_value); + + http_sendOk(client, HTTP_CONTENT_JSON); + return 0; + +error: + http_sendInternalErr(client, HTTP_CONTENT_JSON); return 0; } /* * Reply to client the request string. */ -static int cgi_echo(struct netconn *client, const char *name, char *revc_buf, size_t revc_len) +static int cgi_echo(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) { (void)name; - http_sendOk(client); - netconn_write(client, revc_buf, revc_len, NETCONN_COPY); + http_sendOk(client, HTTP_CONTENT_PLAIN); + netconn_write(client, recv_buf, recv_len, NETCONN_COPY); return 0; } +/* + * Return to client a string that display the CHIP ID information. + * See datasheet for more detail. + */ +static int cgi_chipInfo(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) +{ + (void)recv_buf; + (void)recv_len; + (void)name; + + sprintf((char *)tx_buf, "{ \"core_name\":\"%s\", \"arch_name\":\"%s\", \"sram_size\":\"%s\",\"flash_size\":\"%s\", \"mem_boot_type\":\"%s\" }", + chipid_eproc_name(CHIPID_EPRCOC()), + chipid_archnames(CHIPID_ARCH()), + chipid_sramsize(CHIPID_SRAMSIZ()), + chipid_nvpsize(CHIPID_NVPSIZ()), + chipid_nvptype(CHIPID_NVTYP())); + + http_sendOk(client, HTTP_CONTENT_JSON); + netconn_write(client, tx_buf, strlen((char *)tx_buf), NETCONN_COPY); + + return 0; +} + + +static int cgi_error(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) +{ + (void)client; + (void)name; + (void)recv_buf; + (void)recv_len; + + return -1; +} /* @@ -273,10 +483,10 @@ static int cgi_echo(struct netconn *client, const char *name, char *revc_buf, si * error page if the SD card is not present. * */ -static int http_htmPageLoad(struct netconn *client, const char *name, char *revc_buf, size_t revc_len) +static int http_htmPageLoad(struct netconn *client, const char *name, char *recv_buf, size_t recv_len) { - (void)revc_buf; - (void)revc_len; + (void)recv_buf; + (void)recv_len; if (SD_CARD_PRESENT()) { @@ -308,7 +518,8 @@ static int http_htmPageLoad(struct netconn *client, const char *name, char *revc { LOG_INFO("Opened file '%s' size %ld\n", name, in_file.fat_file.fsize); - http_sendOk(client); + int type = http_searchContentType(name); + http_sendOk(client, type); while (count < in_file.fat_file.fsize) { @@ -325,7 +536,7 @@ static int http_htmPageLoad(struct netconn *client, const char *name, char *revc else { LOG_ERR("Unable to open file: '%s' error[%d]\n", name, result); - http_sendFileNotFound(client); + http_sendFileNotFound(client, HTTP_CONTENT_HTML); netconn_write(client, http_file_not_found, http_file_not_found_len - 1, NETCONN_NOCOPY); } } @@ -335,49 +546,29 @@ static int http_htmPageLoad(struct netconn *client, const char *name, char *revc } else { - http_sendFileNotFound(client); + http_sendFileNotFound(client, HTTP_CONTENT_HTML); netconn_write(client, http_sd_not_present, http_sd_not_present_len, NETCONN_NOCOPY); } return 0; } -/* - * Return to client a string that display the CHIP ID information. - * See datasheet for more detail. - */ -static int cgi_chipInfo(struct netconn *client, const char *name, char *revc_buf, size_t revc_len) -{ - (void)revc_buf; - (void)revc_len; - (void)name; - - sprintf((char *)tx_buf, "{ \"core_name\":\"%s\", \"arch_name\":\"%s\", \"sram_size\":\"%s\",\ - \"flash_size\":\"%s\", \"mem_boot_type\":\"%s\" }", - chipid_eproc_name(CHIPID_EPRCOC()), - chipid_archnames(CHIPID_ARCH()), - chipid_sramsize(CHIPID_SRAMSIZ()), - chipid_nvpsize(CHIPID_NVPSIZ()), - chipid_nvptype(CHIPID_NVTYP())); - - http_sendOk(client); - netconn_write(client, tx_buf, strlen((char *)tx_buf), NETCONN_COPY); - - return 0; -} /* * Static cgi table where we associate callback to page. */ static HttpCGI cgi_table[] = { - { CGI_MATCH_WORD, "echo", cgi_echo }, + { CGI_MATCH_NAME, "echo", cgi_echo }, { CGI_MATCH_NAME, "get_temperature", cgi_temp }, { CGI_MATCH_NAME, "get_uptime", cgi_uptime }, { CGI_MATCH_NAME, "get_resistor", cgi_resistor }, { CGI_MATCH_NAME, "set_led", cgi_led }, - { CGI_MATCH_WORD, "status", cgi_status }, + { CGI_MATCH_NAME, "get_ledStatus", cgi_ledStatus }, + { CGI_MATCH_NAME, "error", cgi_error }, + { CGI_MATCH_NAME, "status", cgi_status }, { CGI_MATCH_NAME, "get_chipinfo", cgi_chipInfo }, + { CGI_MATCH_NAME, "display", cgi_displayMsg }, { CGI_MATCH_NAME, "bertos_logo_jpg", cgi_logo }, { CGI_MATCH_NONE, NULL, NULL } }; @@ -391,12 +582,20 @@ int main(void) init(); http_init(http_htmPageLoad, cgi_table); - proc_new(status_process, NULL, KERN_MINSTACKSIZE * 2, NULL); + proc_new(proc_displayRefresh, NULL, KERN_MINSTACKSIZE * 2, NULL); dhcp_start(&netif); while (!netif.ip_addr.addr) timer_delay(DHCP_FINE_TIMER_MSECS); - kprintf("dhcp ok: ip = %d.%d.%d.%d\n", IP_ADDR_TO_INT_TUPLE(netif.ip_addr.addr)); + + sprintf(status.local_ip, "%d.%d.%d.%d", IP_ADDR_TO_INT_TUPLE(netif.ip_addr.addr)); + sprintf(status.last_connected_ip, "%d.%d.%d.%d", IP_ADDR_TO_INT_TUPLE(0)); + kprintf("dhcp ok: ip = %s", status.local_ip); + + text_xprintf(lcd_bitmap, 12, 0, 0, "Board ip: %s", status.local_ip); + + lcd_hx8347_blitBitmap(lcd_bitmap); + lcd_hx8347_blitBitmap24(12, 0, BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, bmp_logo); server = netconn_new(NETCONN_TCP); netconn_bind(server, IP_ADDR_ANY, 80);