add custom html pages (compiled with makefsdata into fsdata_custom.c)

viteo · viteo · commit c344e6fee5e9 · 2021-12-20T13:03:48.000+03:00
diff --git a/.cproject b/.cproject
@@ -82,7 +82,7 @@
 					<sourceEntries>
 						<entry excluding="device|lib/cmsis|lib/spl|lib|Startup" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Startup"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="device"/>
+						<entry excluding="fsdata_custom.c" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="device"/>
 						<entry excluding="lwip/src/apps/http/fsdata.c|lwip/src/apps/http/makefsdata|lwip/doc|lwip/test" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="lib"/>
 					</sourceEntries>
 				</configuration>
diff --git a/device/fsdata_custom.c b/device/fsdata_custom.c
diff --git a/device/httpd_cgi_ssi.c b/device/httpd_cgi_ssi.c
@@ -14,7 +14,7 @@ const char IsChecked[] = "checked";
 
 const char *SSI_TAGS[] =
 {
-		"led",	// 0
+		"IsLED",	// 0
 };
 
 uint16_t SSI_Handler(int iIndex, char *pcInsert, int iInsertLen)
@@ -24,7 +24,7 @@ uint16_t SSI_Handler(int iIndex, char *pcInsert, int iInsertLen)
 	//iIndex of element in SSI_TAGS array
 	{
 	case 0: // is LED on
-		if(GPIO_ReadInputDataBit(GPIOC, PIN_LED))
+		if(!GPIO_ReadInputDataBit(GPIOC, PIN_LED))
 			strcpy(pcInsert, IsChecked);
 		break;
 	default:
@@ -47,7 +47,7 @@ const char* CGI_LEDS_Handler(int iIndex, int iNumParams, char *pcParam[], char *
 	if (iIndex == 0)
 	{
 		/* All leds off */
-		GPIO_ResetBits(GPIOC, PIN_LED);
+		GPIO_SetBits(GPIOC, PIN_LED);
 
 		/* Check cgi parameter : example GET /leds.cgi?led=1&led=2 */
 		for (i = 0; i < iNumParams; i++)
@@ -57,12 +57,12 @@ const char* CGI_LEDS_Handler(int iIndex, int iNumParams, char *pcParam[], char *
 			{
 				/* switch led1 ON if 1 */
 				if (strcmp(pcValue[i], "1") == 0)
-					GPIO_SetBits(GPIOC, PIN_LED);
+					GPIO_ResetBits(GPIOC, PIN_LED);
 			}
 		}
 	}
 	/* uri to send after cgi call*/
-	return "/status.shtml";
+	return "/index.shtml";
 }
 
 /* CGI call table */
diff --git a/device/httpd_cgi_ssi.h b/device/httpd_cgi_ssi.h
diff --git a/fs/404.html b/fs/404.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>404</title>	
+</head>
+<body>
+<H1>404 - PAGE NOT FOUND</H1>
+</body>
+</html>
diff --git a/fs/img/BluePill.svg b/fs/img/BluePill.svg
@@ -0,0 +1,27 @@
+<svg width="220" height="550" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <rect width="220" height="550" fill="#004baa"/>
+  <rect x="24" y="10" width="24" height="530" fill="#f0f000" stroke="#fff" stroke-width="2"/>
+  <rect x="175" y="10" width="24" height="530" fill="#f0f000" stroke="#fff" stroke-width="2"/>
+  <rect x="70" width="80" height="55" ry="4" fill="#e6e6e6"/>
+  <text x="95" y="45" fill="#323232" font-family="Arial" font-size="16px" style="line-height:2">USB</text>
+  <rect x="135" y="4" width="6" height="20" fill="#b4b4b4"/>
+  <rect x="80" y="4" width="6" height="20" fill="#b4b4b4"/>
+  <rect x="62" y="92" width="35" height="60" fill="#e6e6e6" stroke="#b4b4b4" stroke-width="7"/>
+  <rect x="113" y="87" width="51" height="73" ry="10" fill="#f0f000"/>
+  <rect transform="rotate(-45)" x="-140" y="212" width="65" height="105" fill="#b4b4b4"/>
+  <rect transform="rotate(45)" x="233" y="55" width="65" height="105" fill="#b4b4b4"/>
+  <rect transform="rotate(45)" x="222" y="65" width="85" height="85" ry="5" fill="#333"/>
+  <circle cx="111" cy="305" r="6" fill="#191919"/>
+  <text transform="rotate(-45)" x="-140" y="240" fill="#dcdcdc" font-family="Arial" font-size="10px" style="line-height:2">STM32</text>
+  <text transform="rotate(-45)" x="-140" y="255" fill="#dcdcdc" font-family="Arial" font-size="10px" style="line-height:2">F103C8T6</text>
+  <rect x="62" y="330" width="100" height="35" ry="20" fill="#bebebe" stroke="#dcdcdc" stroke-width="3"/>
+  <rect x="75" y="380" width="73" height="32" fill="#323232"/>
+  <circle cx="135" cy="395" r="6" fill="#646464"/>
+  <rect x="66" y="443" width="30" height="15" fill="#00b400" stroke="#dcdcdc"/>
+  <text x="68" y="440" fill="#dcdcdc" font-family="Arial" font-size="10px" style="line-height:2">PC13</text>
+  <rect x="131" y="443" width="30" height="15" fill="#a00000" stroke="#dcdcdc"/>
+  <rect x="60" y="470" width="103" height="24" fill="#f0f000" stroke="#fff" stroke-width="2"/>
+  <text x="51" y="530" fill="#f0f0f0" font-family="Arial" font-size="18px" style="line-height:2">STM32 Bluepill</text>
+ </g>
+</svg>
diff --git a/fs/index.shtml b/fs/index.shtml
@@ -0,0 +1,24 @@
+<html>
+<head>
+<title>RNDIS Bluepull with lwIP</title>
+</head>
+<body>
+<table style="margin-left: auto; margin-right: auto;">
+<tr>
+<td>
+<form method="get" action="/leds.cgi">
+<table>
+<tr>
+<th>LED PC13</th>
+<td>
+<input type="checkbox" id="ld1" name="led" value="1" <!--#IsLED--> />
+</td>
+</tr>
+</table>
+<input value="OK" type="submit"/>
+</form>
+</td>
+<td><img src="./img/BluePill.svg"></td>
+</tr>
+</table>
+</body>
diff --git a/lib/lwip_port/lwipopts.h b/lib/lwip_port/lwipopts.h
@@ -175,7 +175,9 @@ a lot of data that needs to be copied, this should be set high. */
 #define LWIP_HTTPD_CGI                  1
 #define LWIP_HTTPD_SSI                  1
 #define LWIP_HTTPD_SSI_INCLUDE_TAG      0
-//#define HTTPD_USE_CUSTOM_FSDATA         1
+#define HTTPD_USE_CUSTOM_FSDATA         1
+// additional define for makefsdata app to properly include svg files:
+#define HTTPD_ADDITIONAL_CONTENT_TYPES {"svg", HTTP_CONTENT_TYPE("image/svg+xml")}
 
 /*
    ----------------------------------------
diff --git a/main.c b/main.c
@@ -33,12 +33,12 @@ int main()
 		if (rndis_data_pending())
 			LwIP_Pkt_Handle();
 
-		static uint32_t LocalTime = 0;
-		LocalTime += 10;
-		if(LocalTime % 500 == 0)
-		{
-			GPIO_ToggleBits(GPIOC, PIN_LED);
-		}
-		DWT_Delay_ms(10);
+//		static uint32_t LocalTime = 0;
+//		LocalTime += 10;
+//		if(LocalTime % 500 == 0)
+//		{
+//			GPIO_ToggleBits(GPIOC, PIN_LED);
+//		}
+//		DWT_Delay_ms(10);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ const char IsChecked[] = "checked";`
`14`	`14`
`15`	`15`	`const char *SSI_TAGS[] =`
`16`	`16`	`{`
`17`		`- "led", // 0`
	`17`	`+ "IsLED", // 0`
`18`	`18`	`};`
`19`	`19`
`20`	`20`	`uint16_t SSI_Handler(int iIndex, char *pcInsert, int iInsertLen)`
`@@ -24,7 +24,7 @@ uint16_t SSI_Handler(int iIndex, char *pcInsert, int iInsertLen)`
`24`	`24`	`//iIndex of element in SSI_TAGS array`
`25`	`25`	`{`
`26`	`26`	`case 0: // is LED on`
`27`		`- if(GPIO_ReadInputDataBit(GPIOC, PIN_LED))`
	`27`	`+ if(!GPIO_ReadInputDataBit(GPIOC, PIN_LED))`
`28`	`28`	`strcpy(pcInsert, IsChecked);`
`29`	`29`	`break;`
`30`	`30`	`default:`
`@@ -47,7 +47,7 @@ const char* CGI_LEDS_Handler(int iIndex, int iNumParams, char pcParam[], char `
`47`	`47`	`if (iIndex == 0)`
`48`	`48`	`{`
`49`	`49`	`/* All leds off */`
`50`		`- GPIO_ResetBits(GPIOC, PIN_LED);`
	`50`	`+ GPIO_SetBits(GPIOC, PIN_LED);`
`51`	`51`
`52`	`52`	`/* Check cgi parameter : example GET /leds.cgi?led=1&led=2 */`
`53`	`53`	`for (i = 0; i < iNumParams; i++)`
`@@ -57,12 +57,12 @@ const char* CGI_LEDS_Handler(int iIndex, int iNumParams, char pcParam[], char `
`57`	`57`	`{`
`58`	`58`	`/* switch led1 ON if 1 */`
`59`	`59`	`if (strcmp(pcValue[i], "1") == 0)`
`60`		`- GPIO_SetBits(GPIOC, PIN_LED);`
	`60`	`+ GPIO_ResetBits(GPIOC, PIN_LED);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`/* uri to send after cgi call*/`
`65`		`- return "/status.shtml";`
	`65`	`+ return "/index.shtml";`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/* CGI call table */`