WebSVN – group.electronics – Diff – /Projects/commselect/fsx_driver/CommSelector/CommSelector.cpp

 char* I_OK = "+";		// ignored, ok
 char* I_NEX = "?";		// ignored, unexpected
 char* I_EXE = "e";		// exception
 char* X_SEP = "|";		// separator
 #define		BUTTONS_COM1	0
 #define		BUTTONS_COM2	1
 #define		BUTTONS_COMB	2
 #define		BUTTONS_NAV1	3
 #define		BUTTONS_NAV2	4
 #define		BUTTONS_MKR 	5
 #define		BUTTONS_DME 	6
 #define		BUTTONS_ADF 	7
 static usb_dev_handle * usbOpenDevice(int vendor, char *vendorName, int product, char *productName);
 static int usbGetDescriptorString(usb_dev_handle *dev, int index, int langid, char *buf, int buflen);
 void testCode(usb_dev_handle *handle);
 void setLed(double value, int bit);
+void usbPushLeds(void);
+void usbGetState(void);
 void CALLBACK dispatchProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext);
 void Process_Exception(SIMCONNECT_RECV* pData);
 void Process_Connected();
 bool	Paused = true;
 char 	string[80];
 bool	updateLeds = true;
 char 	ledStatus = 0x00;
 int		nBytes = 0;
-char	buffer[16];
+unsigned char	buffer[16];
 struct CommSelectData {
 	double	com1;
 	double	com2;
 	double	comb;
     if(handle == NULL) {
             fprintf(stderr, "Could not find USB device\n");
             exit(1);
+    }
 	//testCode(handle);
+	//exit(0);
 	int i;
 	for (i = 0; i < 15; i++) {
 		buffer[i] = 0x00;
+	}
-	nBytes = usb_control_msg(handle,
+	usbPushLeds();
-					USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN,
-					USB_LEDS_SET, ledStatus, 0, (char *)buffer, sizeof(buffer), 5000);
 	Connect();
 	if (hSimConnect != NULL) {
 		keep_going = true;
 		unsigned int lastButtons = 0;
-		while(keep_going)
+		while(keep_going) {
-        {
 			HRESULT hr;
-			// Put this in an 'On Event' thing later...
-			//hr = SimConnect_RequestDataOnSimObjectType(hSimConnect, REQUEST_1, DEFINITION_1, 0, SIMCONNECT_SIMOBJECT_TYPE_USER);
-			nBytes = usb_control_msg(handle,
+			usbGetState();
-						USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN,
-						USB_STATE_READ, 0, 0, (char *)buffer, sizeof(buffer), 5000);
-			unsigned int buttons = (unsigned int)buffer[1];
+			unsigned char buttons = (unsigned char)buffer[1];
-			for (i=0; i<7; i++) {
+			for (i=0; i<=7; i++) {
 					if (rbi(buttons, i) && rbi(lastButtons, i) == 0) {
 						sbi(lastButtons, i);
 						hr = SimConnect_TransmitClientEvent(hSimConnect,0, i, 1 ,
 								SIMCONNECT_GROUP_PRIORITY_STANDARD,SIMCONNECT_EVENT_FLAG_GROUPID_IS_PRIORITY);
+					}
+		}
+	}
 	printf("\n%s Resetting internal status to disconnected.", Format_SOL(M_NO));
 	hSimConnect = NULL;
+	ledStatus = 0x00;
+	usbPushLeds();
 	keep_going = false;
+}
 void CALLBACK dispatchProc(SIMCONNECT_RECV* pData, DWORD cbData, void *pContext)
+{
     switch(pData->dwID)
+    {
 		case SIMCONNECT_RECV_ID_QUIT:
-			// FSX is stopping
 			Process_FSX_Quit();
             break;
 		case SIMCONNECT_RECV_ID_OPEN:
-			// the connection process is complete
 			Process_Connected();
 			break;
 		case SIMCONNECT_RECV_ID_EVENT: {
 			SIMCONNECT_RECV_EVENT *evt = (SIMCONNECT_RECV_EVENT*)pData;
 					setLed(ps->comb, BUTTONS_COMB);
 					setLed(ps->vor1, BUTTONS_NAV1);
 					setLed(ps->vor2, BUTTONS_NAV2);
 					setLed(ps->mkr, BUTTONS_MKR);
 					setLed(ps->dme, BUTTONS_DME);
 					setLed(ps->adf, BUTTONS_ADF);
-					nBytes = usb_control_msg(handle,
+					usbPushLeds();
-						USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN,
-						USB_LEDS_SET, ledStatus, 0, (char *)buffer, sizeof(buffer), 5000);
-					printf("\nSIMOBJECT_DATA %d LED Update" );
 					break;
+				}
+			}
 			break;
+		}
 /*
  *	*** USB Functions ***
  */
+void usbPushLeds() {
+	nBytes = usb_control_msg(handle,
+		USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN,
+		USB_LEDS_SET, ledStatus, 0, (char *)buffer, sizeof(buffer), 5000);
+}
+void usbGetState() {
+	nBytes = usb_control_msg(handle,
+		USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN,
+		USB_STATE_READ, 0, 0, (char *)buffer, sizeof(buffer), 5000);
+}
 static int usbGetDescriptorString(usb_dev_handle *dev, int index, int langid,
                                   char *buf, int buflen) {
     char buffer[256];
     int rval, i;
+}
 void testCode(usb_dev_handle *handle) {
 	int nBytes = 0;
-    char buffer[16];
+    unsigned char buffer[16];
 	int i;
 	for (i = 0; i < 15; i++) {
 		buffer[i] = 0x00;
+	}
 						USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN,
 						USB_STATE_READ, 0, 0, (char *)buffer, sizeof(buffer), 5000);
 			printf("Got %d bytes: %s\n", nBytes, buffer);
 			for (i = 0; i < 15; i++) {
 				if (i>0) printf(":");
-				printf("%02X",  buffer[i]);
+				printf("%02X",  (unsigned char)buffer[i]);
+			}
 			printf("\n");
+		}
 		Sleep(1);
+	}

Subversion Repositories group.electronics

(root)/Projects/commselect/fsx_driver/CommSelector/CommSelector.cpp – Rev 115 → 116