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

 #define		BUTTONS_COM1	0
 #define		BUTTONS_COM2	1
-#define		BUTTONS_BOTH	2
+#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 CALLBACK dispatchProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext);
 void Process_Exception(SIMCONNECT_RECV* pData);
 void Process_Connected();
 void Process_FSX_Quit();
 char* Format_SOL(char* Direction, char* Importance);
 void Connect();
 void Disconnect();
+usb_dev_handle *handle = NULL;
 HANDLE  hSimConnect = NULL;
 bool    keep_going = false;
 bool	Paused = true;
 char 	string[80];
 bool	updateLeds = true;
 char 	ledStatus = 0x00;
 int		nBytes = 0;
 char	buffer[16];
 struct CommSelectData {
-	double	comm1;
+	double	com1;
-	double	comm2;
+	double	com2;
-	double	commb;
+	double	comb;
 	double	vor1;
 	double	vor2;
 	double	mkr;
 	double	dme;
 	double	adf;
 static enum EVENT_ID {
 	EVENT_COM1_TRANSMIT_SELECT,
 	EVENT_COM2_TRANSMIT_SELECT,
 	EVENT_COM_RECEIVE_ALL_TOGGLE,
 	EVENT_RADIO_VOR1_IDENT_TOGGLE,
-	EVENT_RADIO_VOR2_IDENT_TOGGLE
+	EVENT_RADIO_VOR2_IDENT_TOGGLE,
 	EVENT_MARKER_SOUND_TOGGLE,
 	EVENT_RADIO_DME1_IDENT_TOGGLE,
 	EVENT_RADIO_ADF_IDENT_TOGGLE,
 };
 int main(int argc, char **argv) {
-	usb_dev_handle *handle = NULL;
     handle = usbOpenDevice(0x4242, "newioit.com.au", 0xe231, "Comm Selector");
     if(handle == NULL) {
             fprintf(stderr, "Could not find USB device\n");
             exit(1);
 			unsigned int buttons = (unsigned int)buffer[1];
-			for (i=-; 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);
+					}
-					if (rbi(lastButtons, i) && ! rbi(buttons, i)
+					if (rbi(lastButtons, i) && ! rbi(buttons, i))
 						cbi(lastButtons, i);
+			}
             SimConnect_CallDispatch(hSimConnect, dispatchProc, NULL);
             Sleep(1);
 			Process_Connected();
 			break;
 		case SIMCONNECT_RECV_ID_EVENT: {
 			SIMCONNECT_RECV_EVENT *evt = (SIMCONNECT_RECV_EVENT*)pData;
+			/*
 			switch (evt->uEventID) {
 				default:
 					break;
+			}
+			*/
 			break;
+		}
 		case SIMCONNECT_RECV_ID_SIMOBJECT_DATA: {
 			SIMCONNECT_RECV_SIMOBJECT_DATA_BYTYPE *pObjData = (SIMCONNECT_RECV_SIMOBJECT_DATA_BYTYPE*)pData;
 			switch(pObjData->dwRequestID) {
 				case REQUEST_1: {
 					DWORD ObjectID = pObjData->dwObjectID;
 					CommSelectData *ps = (CommSelectData*)&pObjData->dwData;
-					hr = SimConnect_RequestDataOnSimObject(hSimConnect, REQUEST_1, DEFINITION_1, ObjectID,
-														   SIMCONNECT_PERIOD_SECOND, SIMCONNECT_DATA_REQUEST_FLAG_CHANGED);
-					setLed(ps->com1, &ledStatus, BUTTONS_COM1);
+					setLed(ps->com1, BUTTONS_COM1);
-					setLed(ps->com2, &ledStatus, BUTTONS_COM2);
+					setLed(ps->com2, BUTTONS_COM2);
-					setLed(ps->comb, &ledStatus, BUTTONS_COMB);
+					setLed(ps->comb, BUTTONS_COMB);
-					setLed(ps->vor1, &ledStatus, BUTTONS_NAV1);
+					setLed(ps->vor1, BUTTONS_NAV1);
-					setLed(ps->vor2, &ledStatus, BUTTONS_NAV2);
+					setLed(ps->vor2, BUTTONS_NAV2);
-					setLed(ps->mkr, &ledStatus, BUTTONS_MKR);
+					setLed(ps->mkr, BUTTONS_MKR);
-					setLed(ps->dme, &ledStatus, BUTTONS_DME);
+					setLed(ps->dme, BUTTONS_DME);
-					setLed(ps->adf, &ledStatus, BUTTONS_ADF);
+					setLed(ps->adf, BUTTONS_ADF);
 					nBytes = usb_control_msg(handle,
 						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",  );
+					printf("\nSIMOBJECT_DATA %d LED Update" );
 					break;
+				}
+			}
 			break;
+		}
 			switch(pObjData->dwRequestID) {
 				case REQUEST_1: {
 					DWORD ObjectID = pObjData->dwObjectID;
 					CommSelectData *pS = (CommSelectData*)&pObjData->dwData;
+					HRESULT hr;
 					hr = SimConnect_RequestDataOnSimObject(hSimConnect, REQUEST_1, DEFINITION_1, ObjectID,
-														   SIMCONNECT_PERIOD_SECOND, SIMCONNECT_DATA_REQUEST_FLAG_CHANGED);
+														   SIMCONNECT_PERIOD_SIM_FRAME, SIMCONNECT_DATA_REQUEST_FLAG_CHANGED);
 					break;
+				}
+			}
 			break;
+		}
 		case SIMCONNECT_RECV_ID_EVENT_RACE_END:
 		case SIMCONNECT_RECV_ID_EVENT_RACE_LAP: */
 		case SIMCONNECT_RECV_ID_EXCEPTION:
         case SIMCONNECT_RECV_ID_EVENT_OBJECT_ADDREMOVE:
-		case SIMCONNECT_RECV_ID_SIMOBJECT_DATA:
 		case SIMCONNECT_RECV_ID_ASSIGNED_OBJECT_ID:
 		case SIMCONNECT_RECV_ID_EVENT_FILENAME:
 		case SIMCONNECT_RECV_ID_EVENT_FRAME:
 		case SIMCONNECT_RECV_ID_WEATHER_OBSERVATION:
 		case SIMCONNECT_RECV_ID_CLOUD_STATE:
 		default:
 			printf("\n%s Message ignored (Unknown RECV_ID)", Format_SOL(M_IN, I_NEX));
+    }
+}
-void setLed(double value, char* ledS, int bit) {
+void setLed(double value, int bit) {
 	if (value)
-		sbi(ledS, bit);
+		sbi(ledStatus, bit);
 	else
-		cbi(ledS, bit);
+		cbi(ledStatus, bit);
+}
 void Process_Exception(SIMCONNECT_RECV* pData) {
 	// SimConnect cannot process a client request
 	SIMCONNECT_RECV_EXCEPTION *except = (SIMCONNECT_RECV_EXCEPTION *) pData;
 		Exception_String(except->dwException));
+}
 void Process_Connected() {
 	printf("\n%s Connected.", Format_SOL(M_IN));
-	EVENT_COM1_TRANSMIT_SELECT,
-	EVENT_COM2_TRANSMIT_SELECT,
-	EVENT_COM_RECEIVE_ALL_TOGGLE,
-	EVENT_RADIO_VOR1_IDENT_TOGGLE,
-	EVENT_RADIO_VOR2_IDENT_TOGGLE
-	EVENT_MARKER_SOUND_TOGGLE,
-	RADIO_DME1_IDENT_TOGGLE,
-	RADIO_ADF_IDENT_TOGGLE,
 	HRESULT hr;
 	hr = SimConnect_MapClientEventToSimEvent(hSimConnect, EVENT_COM1_TRANSMIT_SELECT, "COM1_TRANSMIT_SELECT");
 	hr = SimConnect_MapClientEventToSimEvent(hSimConnect, EVENT_COM2_TRANSMIT_SELECT, "COM2_TRANSMIT_SELECT");
 	hr = SimConnect_MapClientEventToSimEvent(hSimConnect, EVENT_COM_RECEIVE_ALL_TOGGLE, "COM_RECEIVE_ALL_TOGGLE");

Subversion Repositories group.electronics

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