sbmp added but too large

user/datalink.c

@@ -0,0 +1,27 @@
+#include "esp8266.h"
+#include "uart_driver.h"
+#include "sbmp.h"
+
+#include "datalink.h"
+
+/** func used for sending bytes by SBMP */
+static void u0_putc(uint8_t c)
+{
+	UART_WriteCharCRLF(UART0, c, 0);
+}
+
+
+static void dg_handler(SBMP_Datagram *dg)
+{
+	sbmp_info("Datagram received.");
+}
+
+
+
+static SBMP_Endpoint *ep;
+
+/** Datalink */
+void datalinkInit(void)
+{
+	ep = sbmp_ep_init(NULL, NULL, 256, dg_handler, u0_putc);
+}

user/datalink.h

@@ -0,0 +1,6 @@
+#ifndef DATALINK_H
+#define DATALINK_H
+
+void datalinkInit(void);
+
+#endif // DATALINK_H

user/serial.c

@@ -14,12 +14,12 @@
 
 
 
-LOCAL void uart0_rx_intr_handler(void *para);
-LOCAL void uart_recvTask(os_event_t *events);
+static void uart0_rx_intr_handler(void *para);
+static void uart_recvTask(os_event_t *events);
 
 #define uart_recvTaskPrio        0
 #define uart_recvTaskQueueLen    10
-LOCAL os_event_t uart_recvTaskQueue[uart_recvTaskQueueLen];
+static os_event_t uart_recvTaskQueue[uart_recvTaskQueueLen];
 
 
 
@@ -37,7 +37,7 @@ clear_rxtx(int uart_no)
  * @brief Configure UART 115200-8-N-1
  * @param uart_no
  */
-void ICACHE_FLASH_ATTR
+static void ICACHE_FLASH_ATTR
 my_uart_init(UARTn uart_no)
 {
 	UART_SetParity(uart_no, PARITY_NONE);
@@ -48,8 +48,8 @@ my_uart_init(UARTn uart_no)
 }
 
 
-void ICACHE_FLASH_ATTR
-serialInit()
+/** Configure basic UART func and pins */
+static void conf_uart_pins(void)
 {
 	// U0TXD
 	PIN_FUNC_SELECT(PERIPHS_IO_MUX_U0TXD_U, FUNC_U0TXD);
@@ -67,48 +67,47 @@ serialInit()
 
 	// Select debug port
 	UART_SetPrintPort(UART1);
+}
 
-
-	// Configure Rx on UART0
-
-
+/** Configure Rx on UART0 */
+static void conf_uart_receiver(void)
+{
+	//
 	// Start the Rx reading task
 	system_os_task(uart_recvTask, uart_recvTaskPrio, uart_recvTaskQueue, uart_recvTaskQueueLen);
-
-
 	// set handler
 	ETS_UART_INTR_ATTACH((void *)uart0_rx_intr_handler, &(UartDev.rcv_buff)); // the buf will be used as an arg
 
-
 	// fifo threshold config
 	uint32_t conf = ((100 & UART_RXFIFO_FULL_THRHD) << UART_RXFIFO_FULL_THRHD_S);
 	conf |= ((0x10 & UART_TXFIFO_EMPTY_THRHD) << UART_TXFIFO_EMPTY_THRHD_S);
-
 	// timeout config
 	conf |= ((0x02 & UART_RX_TOUT_THRHD) << UART_RX_TOUT_THRHD_S); // timeout threshold
 	conf |= UART_RX_TOUT_EN; // enable timeout
-
 	WRITE_PERI_REG(UART_CONF1(UART0), conf);
 
-
 	// enable TOUT and ERR irqs
 	SET_PERI_REG_MASK(UART_INT_ENA(UART0), UART_RXFIFO_TOUT_INT_ENA | UART_FRM_ERR_INT_ENA);
-
 	/* clear interrupt flags */
 	WRITE_PERI_REG(UART_INT_CLR(UART0), 0xffff);
-
 	/* enable RX interrupts */
 	SET_PERI_REG_MASK(UART_INT_ENA(UART0), UART_RXFIFO_FULL_INT_ENA | UART_RXFIFO_OVF_INT_ENA);
 
-
 	// Enable IRQ in Extensa
 	ETS_UART_INTR_ENABLE();
 }
 
 
-// ---- receive business ----
+void ICACHE_FLASH_ATTR
+serialInit()
+{
+	conf_uart_pins();
+	conf_uart_receiver();
+}
 
 
+// ---- async receive stuff ----
+
 
 void uart_rx_intr_disable(uint8 uart_no)
 {
@@ -129,7 +128,7 @@ void uart_rx_intr_enable(uint8 uart_no)
 #define UART_GetRxFifoCount(uart_no) ((READ_PERI_REG(UART_STATUS((uart_no))) >> UART_RXFIFO_CNT_S) & UART_RXFIFO_CNT)
 
 
-LOCAL void ICACHE_FLASH_ATTR
+static void ICACHE_FLASH_ATTR
 uart_recvTask(os_event_t *events)
 {
 	if (events->sig == 0) {
@@ -158,7 +157,7 @@ uart_recvTask(os_event_t *events)
  * Parameters   : void *para - point to ETS_UART_INTR_ATTACH's arg
  * Returns      : NONE
 *******************************************************************************/
-LOCAL void
+static void
 uart0_rx_intr_handler(void *para)
 {
 	uint32_t status_reg = READ_PERI_REG(UART_INT_ST(UART0));

user/user_main.c

@@ -21,8 +21,9 @@
 
 // user files
 #include "cgi.h"
-#include "cfg_serial.h"
+#include "serial.h"
 #include "io.h"
+#include "datalink.h"
 #include "uart_driver.h"
 
 
@@ -114,12 +115,12 @@ static HttpdBuiltInUrl builtInUrls[] = {
 };
 
 
-static ETSTimer prTestTimer;
+//static ETSTimer prTestTimer;
 
-static void ICACHE_FLASH_ATTR test_timer_task(void *arg) {
-	const char * t = "Test\r\n";
-	UART_WriteBuffer(0, (uint8_t*)t, strlen(t), 1000);
-}
+//static void ICACHE_FLASH_ATTR test_timer_task(void *arg) {
+//	const char * t = "Test\r\n";
+//	UART_WriteBuffer(0, (uint8_t*)t, strlen(t), 1000);
+//}
 
 
 /**
@@ -133,11 +134,12 @@ void user_init(void)
 	// reset button etc
 	ioInit();
 
+	// set up SBMP
+	datalinkInit();
+
 	// Start the captive portal
 	captdnsInit();
 
-	/* --- Initialize ESPFS --- */
-
 	// 0x40200000 is the base address for spi flash memory mapping, ESPFS_POS is the position
 	// where image is written in flash that is defined in Makefile.
 #ifdef ESPFS_POS
@@ -152,10 +154,10 @@ void user_init(void)
 
 	os_printf("\nReady\n");
 
-	// print TEST on the command interface every 500 ms
-	os_timer_disarm(&prTestTimer);
-	os_timer_setfn(&prTestTimer, test_timer_task, NULL);
-	os_timer_arm(&prTestTimer, 500, 1);
+//	// print TEST on the command interface every 500 ms
+//	os_timer_disarm(&prTestTimer);
+//	os_timer_setfn(&prTestTimer, test_timer_task, NULL);
+//	os_timer_arm(&prTestTimer, 500, 1);
 }