.gitignore

@@ -85,3 +85,7 @@ dkms.conf
 *.exe
 *.out
 *.app
+
+#Exceptions
+bin/w800
+!bin/build/w800/lib/

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    "files.associations": {
+        "nano_shell_interface.h": "c",
+        "wm_include.h": "c",
+        "wm_osal.h": "c",
+        "wm_os_config.h": "c"
+    }
+}

Makefile

@@ -6,7 +6,7 @@ GEN_IMAGES= $(TARGET).elf
 GEN_BINS = $(TARGET).bin
 SUBDIRS = \
     $(TOP_DIR)/app \
-    $(TOP_DIR)/app/app_lib \
+	$(TOP_DIR)/app/app_lib \
     $(TOP_DIR)/app/third_party/nano-shell-master \
     $(TOP_DIR)/app/third_party/driver/NRF24L01P
 endif # } PDIR
@@ -14,12 +14,12 @@ endif # } PDIR
 ifndef PDIR # {
 ifeq ($(USE_LIB), 0)
 SUBDIRS += \
-    $(TOP_DIR)/platform/arch        \
+	$(TOP_DIR)/platform/arch        \
-    $(TOP_DIR)/platform/common      \
+	$(TOP_DIR)/platform/common      \
-    $(TOP_DIR)/platform/drivers     \
+	$(TOP_DIR)/platform/drivers     \
-    $(TOP_DIR)/platform/sys         \
+	$(TOP_DIR)/platform/sys         \
-    $(TOP_DIR)/src/network          \
+	$(TOP_DIR)/src/network          \
-    $(TOP_DIR)/src/os               \
+	$(TOP_DIR)/src/os               \
 	$(TOP_DIR)/src/app
 ifeq ($(USE_NIMBLE), 1)
 SUBDIRS += \
@@ -33,7 +33,7 @@ endif
 
 COMPONENTS_$(TARGET) =	\
     $(TOP_DIR)/app/libuser$(LIB_EXT) \
-    $(TOP_DIR)/app/app_lib/libapplib$(LIB_EXT) \
+	$(TOP_DIR)/app/app_lib/libapplib$(LIB_EXT) \
     $(TOP_DIR)/app/third_party/nano-shell-master/libnanoshell$(LIB_EXT) \
     $(TOP_DIR)/app/third_party/driver/NRF24L01P/libnrf24l01p$(LIB_EXT)
 
@@ -44,39 +44,47 @@ COMPONENTS_$(TARGET) += \
     $(TOP_DIR)/platform/drivers/libdrivers$(LIB_EXT)    \
     $(TOP_DIR)/platform/sys/libwmsys$(LIB_EXT)          \
     $(TOP_DIR)/src/network/libnetwork$(LIB_EXT)         \
-    $(TOP_DIR)/src/os/libos$(LIB_EXT)                   \
+    $(TOP_DIR)/src/os/libos$(LIB_EXT)
-    $(TOP_DIR)/src/app/libapp$(LIB_EXT)
 ifeq ($(USE_NIMBLE), 1)
 COMPONENTS_$(TARGET) += \
-	$(TOP_DIR)/src/bt/libblehost$(LIB_EXT) 
+	$(TOP_DIR)/src/bt/libblehost$(LIB_EXT) \
+	$(TOP_DIR)/src/app/libapp$(LIB_EXT)
 else
 COMPONENTS_$(TARGET) += \
-	$(TOP_DIR)/src/bt/libbthost$(LIB_EXT)
+	$(TOP_DIR)/src/bt/libbthost_br_edr$(LIB_EXT) \
+	$(TOP_DIR)/src/app/libapp_br_edr$(LIB_EXT)
 endif	
 endif
 
 
 LINKLIB = 	\
     $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libwlan$(LIB_EXT) \
-    $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libbtcontroller$(LIB_EXT)	\
+	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libdsp$(LIB_EXT)	
-    $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libdsp$(LIB_EXT)	
+
+ifeq ($(USE_NIMBLE), 1)
+LINKLIB +=$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libbtcontroller$(LIB_EXT)
+else
+LINKLIB +=$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libbtcontroller_br_edr$(LIB_EXT)
+endif
+	
 
 
 ifeq ($(USE_LIB), 1)
 LINKLIB += \
-    $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libapp$(LIB_EXT)         \
+	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libwmarch$(LIB_EXT)      \
-    $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libwmarch$(LIB_EXT)      \
+	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libwmcommon$(LIB_EXT)    \
-    $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libwmcommon$(LIB_EXT)    \
+	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libdrivers$(LIB_EXT)     \
-    $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libdrivers$(LIB_EXT)     \
+	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libnetwork$(LIB_EXT)     \
-    $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libnetwork$(LIB_EXT)     \
+	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libos$(LIB_EXT)          \
-    $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libos$(LIB_EXT)          \
+	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libwmsys$(LIB_EXT)
-    $(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libwmsys$(LIB_EXT)
 ifeq ($(USE_NIMBLE), 1)
 LINKLIB += \
-	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libblehost$(LIB_EXT)
+	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libblehost$(LIB_EXT) \
+	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libapp$(LIB_EXT)
 else
 LINKLIB += \
-	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libbthost$(LIB_EXT)
+	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libbthost_br_edr$(LIB_EXT)\
+	$(TOP_DIR)/lib/$(CONFIG_ARCH_TYPE)/libapp_br_edr$(LIB_EXT)
 endif	
 endif
 

app/main.c

@@ -172,7 +172,7 @@ void user_main(void *param)
 	tls_uart_rx_callback_register(TLS_UART_1, &(uart1_rx_callback), NULL);
 
 	//we test the NRF lib here
-	NRF24L01P_t NRF;
+	/*NRF24L01P_t NRF;
 	shell_printf("Checking NRF setup."NEW_LINE);
 	shell_printf("Setting SPI to 1 Mhz : %d."NEW_LINE, tls_spi_setup(SPI_DEFAULT_MODE, SPI_CS_ACTIVE_MODE, 8000000));
 	shell_printf("NRF begin : %d."NEW_LINE, NRF24L01P_begin(&NRF));
@@ -192,10 +192,10 @@ void user_main(void *param)
 	NRF24L01P_writeAckPayload(&NRF, 1, ack_pl, sizeof ack_pl);
 	NRF24L01P_startListening(&NRF);
 	shell_printf("NRF PA level : %d"NEW_LINE, NRF24L01P_getPALevel(&NRF));
-	NRF24L01P_printDetails(&NRF);
-	/*uint8_t payload[32] = "Hello W801";
-	shell_printf("Sending payload : %d"NEW_LINE, NRF24L01P_write(&NRF, payload, sizeof payload));
 	NRF24L01P_printDetails(&NRF);*/
+	//uint8_t payload[32] = "Hello W801";
+	//shell_printf("Sending payload : %d"NEW_LINE, NRF24L01P_write(&NRF, payload, sizeof payload));
+	//NRF24L01P_printDetails(&NRF);
 
 	nano_shell_server_task_stack = tls_mem_alloc(sizeof(u32) * NANO_SHELL_SERVER_TASK_STK_SIZE);
 	if(nano_shell_server_task_stack != NULL)
@@ -250,7 +250,7 @@ void user_main(void *param)
 
 		tls_os_time_delay(pdMS_TO_TICKS(pulse_rate));
 
-		if(nrf_irq)
+		/*if(nrf_irq)
 		{
 			bool tx_ok, tx_fail, rx_ready;
 			NRF24L01P_whatHappened(&NRF, &tx_ok, &tx_fail, &rx_ready);
@@ -265,7 +265,6 @@ void user_main(void *param)
 			}
 
 			nrf_irq = false;
-		}
+		}*/
 	}
 }
-