From 24f280dc4a700f00f5fbb8f13815b941620adb8e Mon Sep 17 00:00:00 2001 From: zlockard Date: Wed, 31 Jan 2024 13:45:54 -0800 Subject: Fixes for sample build errors and updates to the execution script to use new build flags (#1078) * Fixes for sample build errors * Fix additional sample * Add additional sample * Updated comments in Build-Sample.ps1 * Adjusting exclusions.csv to be accurate for GE. Still issues for NI that we need to understand better * Merge from develop branch * Merge from develop branch * Merge from develop branch * Delete WPD samples * Separate infverif additional options for old vs new WDK * Delete WPD samples entry in our CODEOWNERS file * Fix spelling error * For 22621 WDK Remove the /samples flag --------- Co-authored-by: Zac Lockard Co-authored-by: Jakob Lichtenberg (170957) --- wpd/WpdBasicHardwareDriver/WpdObjectProperties.h | 111 ----------------------- 1 file changed, 111 deletions(-) delete mode 100644 wpd/WpdBasicHardwareDriver/WpdObjectProperties.h (limited to 'wpd/WpdBasicHardwareDriver/WpdObjectProperties.h') diff --git a/wpd/WpdBasicHardwareDriver/WpdObjectProperties.h b/wpd/WpdBasicHardwareDriver/WpdObjectProperties.h deleted file mode 100644 index 1860e0ad..00000000 --- a/wpd/WpdBasicHardwareDriver/WpdObjectProperties.h +++ /dev/null @@ -1,111 +0,0 @@ -#pragma once - -#define DEVICE_PROTOCOL_VALUE L"Sensor Protocol ver 1.00" -#define DEVICE_FIRMWARE_VERSION_VALUE L"1.0.0.0" -#define DEVICE_POWER_LEVEL_VALUE 100 -#define DEVICE_MODEL_VALUE L"RS232 Sensor" -#define DEVICE_FRIENDLY_NAME_VALUE L"Parallax BS2 Sensor" -#define DEVICE_MANUFACTURER_VALUE L"Windows Portable Devices Group" -#define DEVICE_SERIAL_NUMBER_VALUE L"01234567890123-45676890123456" -#define DEVICE_SUPPORTS_NONCONSUMABLE_VALUE FALSE - -#define SENSOR_OBJECT_ID L"Sensor" -#define SENSOR_OBJECT_NAME_VALUE L"Parallax Sensor" -#define COMPASS_SENSOR_OBJECT_ID L"Compass" -#define COMPASS_SENSOR_OBJECT_NAME_VALUE L"HM55B Compass Sensor" -#define PIR_SENSOR_OBJECT_ID L"PIR" -#define PIR_SENSOR_OBJECT_NAME_VALUE L"Passive Infra-Red Sensor" -#define QTI_SENSOR_OBJECT_ID L"QTI" -#define QTI_SENSOR_OBJECT_NAME_VALUE L"QTI Light Sensor" -#define FLEX_SENSOR_OBJECT_ID L"Flex" -#define FLEX_SENSOR_OBJECT_NAME_VALUE L"Flex Force Sensor" -#define PING_SENSOR_OBJECT_ID L"Ping" -#define PING_SENSOR_OBJECT_NAME_VALUE L"Ultrasonic Distance Sensor" -#define PIEZO_SENSOR_OBJECT_ID L"Piezo" -#define PIEZO_SENSOR_OBJECT_NAME_VALUE L"Piezo Vibration Sensor" -#define TEMP_SENSOR_OBJECT_ID L"TempHumidity" -#define TEMP_SENSOR_OBJECT_NAME_VALUE L"Sensiron Temperature and Humidity Sensor" -#define MEMSIC_SENSOR_OBJECT_ID L"Memsic" -#define MEMSIC_SENSOR_OBJECT_NAME_VALUE L"Memsic Dual-Axis G-Force Sensor" -#define HITACHI_SENSOR_OBJECT_ID L"Hitachi" -#define HITACHI_SENSOR_OBJECT_NAME_VALUE L"Hitachi Tri-Axis G-Force Sensor" -// INSERT ID and NAME definitions for other sensors here!! - - -GUID GetObjectFormat(CAtlStringW strObjectID); -GUID GetObjectContentType(CAtlStringW strObjectID); -HRESULT AddSupportedPropertyKeys(_In_ LPCWSTR wszObjectID, - _In_ IPortableDeviceKeyCollection* pKeys); - -VOID AddCommonPropertyKeys(_In_ IPortableDeviceKeyCollection* pKeys); -VOID AddDevicePropertyKeys(_In_ IPortableDeviceKeyCollection* pKeys); - -VOID AddSensorPropertyKeys(_In_ IPortableDeviceKeyCollection* pKeys); //Required for sensor props - -class WpdObjectProperties -{ -public: - - WpdObjectProperties(); - virtual ~WpdObjectProperties(); - - HRESULT Initialize(_In_ WpdBaseDriver* pBaseDriver); - - HRESULT DispatchWpdMessage(_In_ REFPROPERTYKEY Command, - _In_ IPortableDeviceValues* pParams, - _In_ IPortableDeviceValues* pResults); - - HRESULT OnGetSupportedProperties(_In_ IPortableDeviceValues* pParams, - _In_ IPortableDeviceValues* pResults); - - HRESULT OnGetPropertyValues(_In_ IPortableDeviceValues* pParams, - _In_ IPortableDeviceValues* pResults); - - HRESULT OnGetAllPropertyValues(_In_ IPortableDeviceValues* pParams, - _In_ IPortableDeviceValues* pResults); - - HRESULT OnSetPropertyValues(_In_ IPortableDeviceValues* pParams, - _In_ IPortableDeviceValues* pResults); - - HRESULT OnGetPropertyAttributes(_In_ IPortableDeviceValues* pParams, - _In_ IPortableDeviceValues* pResults); - - HRESULT OnDeleteProperties(_In_ IPortableDeviceValues* pParams, - _In_ IPortableDeviceValues* pResults); - - VOID SetSensorReading(LONGLONG llNewReading); - - LONGLONG GetSensorReading(); - - VOID SetUpdateInterval(DWORD dwNewInterval); - - DWORD GetUpdateInterval(); - - HRESULT SendUpdateIntervalToDevice(DWORD dwNewInterval); - - BOOL IsValidUpdateInterval(DWORD dwInterval); - -private: - - HRESULT GetPropertyValuesForObject(_In_ LPCWSTR wszObjectID, - _In_ IPortableDeviceKeyCollection* pKeys, - _In_ IPortableDeviceValues* pValues); - - HRESULT GetPropertyAttributesForObject(_In_ LPCWSTR wszObjectID, - _In_ REFPROPERTYKEY Key, - _In_ IPortableDeviceValues* pAttributes); - - -private: - WpdBaseDriver* m_pBaseDriver; - - // This critical section protects the sensor reading from concurrent access - // by the application (which reads it) and the read request callback (which updates it) - CComAutoCriticalSection m_SensorReadingCriticalSection; - LONGLONG m_llSensorReading; - - // A critical section is not needed for the update interval because it is accessed - // by the client application, and set/get requests from the application arrive serially - // through the sequential WDF queue. - DWORD m_dwUpdateInterval; -}; -- cgit v1.3.1