lots of stuff

source/ports.c

@@ -32,6 +32,7 @@
 #include "usbComms.h"
 #include "driver.h"
 #include "broadcast.h"
+#include "direct.h"
 
 uint16_t	Port_timer;
 uint16_t	Taps_adjust_timer;
@@ -172,7 +173,7 @@ void ACCY_service(void)
 			{
 				sys.activeAccessory = sys.nextAccessory;
 				sys.nextAccessory = NULL;
-				initAccessory(active);
+				initAccessory(sys.activeAccessory);
 			}
 		}
 	}
@@ -316,7 +317,7 @@ bool ACCY_Connect(ACCESSORY_t *accy, ACCY_ID_t id)
 		case ID_TX_SINGLE_DIRECT:
 		{
 			accy->channels[CHANNEL_A].connected = true;
-			accy->handler = handleDirectConnect;
+			accy->handler = direct_service;
 			break;
 		}