Merge pull request #35 from pzanna/Dev_81_Stacking

Dev 81 stacking
NorthboundNetworks · May 17, 2017 · 0692a64 · 0692a64
2 parents edfb8b6 + 08d177a
commit 0692a64
Show file tree

Hide file tree

Showing 7 changed files with 375 additions and 155 deletions.
diff --git a/ZodiacFX/src/command.c b/ZodiacFX/src/command.c
@@ -38,6 +38,7 @@
 #include "eeprom.h"
 #include "switch.h"
 #include "flash.h"
+#include "stacking.h"
 #include "openflow/openflow.h"
 #include "openflow/of_helper.h"
 #include "lwip/def.h"
@@ -84,6 +85,8 @@ uint8_t uCLIContext = 0;
 struct arp_header arp_test;
 uint8_t esc_char = 0;
 
+// ####### SPI debug output #######
+extern struct spi_debug_stats spi_debug;
 
 // Internal Functions
 void saveConfig(void);
@@ -1661,6 +1664,32 @@ void command_debug(char *command, char *param1, char *param2, char *param3)
 		return;
 	}	
 
+	if (strcmp(command, "spi_stats")==0)
+	{
+		printf("master tx packets: %d\r\nmaster rx packets: %d\r\nmaster rx bad size: %d\r\nmaster rx bad preamble: %d\r\nmaster rx bad crc: %d\r\n",\
+				spi_debug.master_tx_count,\
+				spi_debug.master_rx_count,\
+				spi_debug.master_rx_error_bad_size,\
+				spi_debug.master_rx_error_bad_preamble,\
+				spi_debug.master_rx_error_bad_crc
+			);
+		return;
+	}
+
+	if (strcmp(command, "spi_stats_slave")==0)
+	{
+		printf("slave tx packets: %d\r\nslave rx packets: %d\r\nslave tx timeout errors: %d\r\nslave rx timeout errors: %d\r\nslave rx bad size: %d\r\nslave rx bad preamble: %d\r\nslave rx bad crc: %d\r\n",\
+		spi_debug.slave_tx_count,\
+		spi_debug.slave_rx_count,\
+		spi_debug.slave_tx_error_timeout,\
+		spi_debug.slave_rx_error_timeout,\
+		spi_debug.slave_rx_error_bad_size,\
+		spi_debug.slave_rx_error_bad_preamble,\
+		spi_debug.slave_rx_error_bad_crc
+		);
+		return;
+	}
+
 	// Unknown Command response
 	printf("Unknown command\r\n");
 	return;

diff --git a/ZodiacFX/src/main.c b/ZodiacFX/src/main.c
@@ -202,11 +202,11 @@ int main (void)
 	while(1)
 	{
 		task_switch(&gs_net_if);
-		//task_command(cCommand, cCommand_last);
+		task_command(cCommand, cCommand_last);
 		// Only run the following tasks if set to Master
 		if(masterselect == false)
 		{
-			task_command(cCommand, cCommand_last);
+			//task_command(cCommand, cCommand_last);
 			sys_check_timeouts();
 			task_openflow();	
 		} 

diff --git a/ZodiacFX/src/openflow/openflow.c b/ZodiacFX/src/openflow/openflow.c
@@ -39,12 +39,14 @@
 #include "lwip/tcp.h"
 #include "lwip/err.h"
 #include "timers.h"
+#include "stacking.h"
 
 // Global variables
 extern struct zodiac_config Zodiac_Config;
 extern uint8_t port_status[8];
 extern struct ofp10_port_stats phys10_port_stats[8];
 extern struct ofp13_port_stats phys13_port_stats[8];
+extern bool stackenabled;
 
 // Local Variables
 struct ofp_switch_config Switch_config;
@@ -354,6 +356,7 @@ void task_openflow(void)
 	{
 		fast_of_timer = sys_get_ms();
 		nnOF_timer();
+		////if (stackenabled == true) masterslave_test();
 
 		if (heartbeat > (HB_INTERVAL * 2) && tcp_con_state == 1)	//If we haven't heard anything from the controller for more then the heartbeat interval send an echo request
 		{