summaryrefslogtreecommitdiff
path: root/sensors/Activity
diff options
context:
space:
mode:
Diffstat (limited to 'sensors/Activity')
-rw-r--r--sensors/Activity/Activity.inxbin2491 -> 5180 bytes
-rw-r--r--sensors/Activity/Activity.sln18
-rw-r--r--sensors/Activity/Activity.vcxproj4
-rw-r--r--sensors/Activity/Activity.vcxproj.Filters8
-rw-r--r--sensors/Activity/Device.h1
-rw-r--r--sensors/Activity/README.md8
-rw-r--r--sensors/Activity/SensorsTrace.h11
-rw-r--r--sensors/Activity/client.cpp4
-rw-r--r--sensors/Activity/device.cpp4
9 files changed, 32 insertions, 26 deletions
diff --git a/sensors/Activity/Activity.inx b/sensors/Activity/Activity.inx
index e3c036c3..7f2558c1 100644
--- a/sensors/Activity/Activity.inx
+++ b/sensors/Activity/Activity.inx
Binary files differ
diff --git a/sensors/Activity/Activity.sln b/sensors/Activity/Activity.sln
index ed653c1d..918419d9 100644
--- a/sensors/Activity/Activity.sln
+++ b/sensors/Activity/Activity.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0
MinimumVisualStudioVersion = 12.0
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Activity", "Activity.vcxproj", "{8D62CC9B-7F6B-4B7C-A650-32595DA9B28D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Activity", "Activity.vcxproj", "{9C41A0A9-BEE7-4410-A604-2B97BDDE6A87}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,14 +13,14 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {8D62CC9B-7F6B-4B7C-A650-32595DA9B28D}.Debug|Win32.ActiveCfg = Debug|Win32
- {8D62CC9B-7F6B-4B7C-A650-32595DA9B28D}.Debug|Win32.Build.0 = Debug|Win32
- {8D62CC9B-7F6B-4B7C-A650-32595DA9B28D}.Release|Win32.ActiveCfg = Release|Win32
- {8D62CC9B-7F6B-4B7C-A650-32595DA9B28D}.Release|Win32.Build.0 = Release|Win32
- {8D62CC9B-7F6B-4B7C-A650-32595DA9B28D}.Debug|x64.ActiveCfg = Debug|x64
- {8D62CC9B-7F6B-4B7C-A650-32595DA9B28D}.Debug|x64.Build.0 = Debug|x64
- {8D62CC9B-7F6B-4B7C-A650-32595DA9B28D}.Release|x64.ActiveCfg = Release|x64
- {8D62CC9B-7F6B-4B7C-A650-32595DA9B28D}.Release|x64.Build.0 = Release|x64
+ {9C41A0A9-BEE7-4410-A604-2B97BDDE6A87}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9C41A0A9-BEE7-4410-A604-2B97BDDE6A87}.Debug|Win32.Build.0 = Debug|Win32
+ {9C41A0A9-BEE7-4410-A604-2B97BDDE6A87}.Release|Win32.ActiveCfg = Release|Win32
+ {9C41A0A9-BEE7-4410-A604-2B97BDDE6A87}.Release|Win32.Build.0 = Release|Win32
+ {9C41A0A9-BEE7-4410-A604-2B97BDDE6A87}.Debug|x64.ActiveCfg = Debug|x64
+ {9C41A0A9-BEE7-4410-A604-2B97BDDE6A87}.Debug|x64.Build.0 = Debug|x64
+ {9C41A0A9-BEE7-4410-A604-2B97BDDE6A87}.Release|x64.ActiveCfg = Release|x64
+ {9C41A0A9-BEE7-4410-A604-2B97BDDE6A87}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/sensors/Activity/Activity.vcxproj b/sensors/Activity/Activity.vcxproj
index 4e67e58b..724803cd 100644
--- a/sensors/Activity/Activity.vcxproj
+++ b/sensors/Activity/Activity.vcxproj
@@ -19,12 +19,12 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{8D62CC9B-7F6B-4B7C-A650-32595DA9B28D}</ProjectGuid>
+ <ProjectGuid>{9C41A0A9-BEE7-4410-A604-2B97BDDE6A87}</ProjectGuid>
<RootNamespace>$(MSBuildProjectName)</RootNamespace>
<UMDF_VERSION_MAJOR>2</UMDF_VERSION_MAJOR>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<Platform Condition="'$(Platform)' == ''">Win32</Platform>
- <SampleGuid>{2AA63371-1F17-4DD3-A61C-A4B309500609}</SampleGuid>
+ <SampleGuid>{C9C93A11-59AB-4977-BE1F-E0AB103302E2}</SampleGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/sensors/Activity/Activity.vcxproj.Filters b/sensors/Activity/Activity.vcxproj.Filters
index b030df77..f32344d8 100644
--- a/sensors/Activity/Activity.vcxproj.Filters
+++ b/sensors/Activity/Activity.vcxproj.Filters
@@ -3,19 +3,19 @@
<ItemGroup>
<Filter Include="Source Files">
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx;*</Extensions>
- <UniqueIdentifier>{41DFCDBE-6A67-4D84-AB7B-45C8FE834475}</UniqueIdentifier>
+ <UniqueIdentifier>{E51044F1-2844-4B85-9CB3-50C5574B73E6}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- <UniqueIdentifier>{DD7B7ED0-4EF4-4753-AD23-72366C6CB41E}</UniqueIdentifier>
+ <UniqueIdentifier>{18DACA49-0487-4FC6-94D7-DE977A2AD8D5}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms;man;xml</Extensions>
- <UniqueIdentifier>{C8299C55-D177-4014-A1C4-2502A34B3F09}</UniqueIdentifier>
+ <UniqueIdentifier>{60868430-E51C-40B0-86F8-D5C119418603}</UniqueIdentifier>
</Filter>
<Filter Include="Driver Files">
<Extensions>inf;inv;inx;mof;mc;</Extensions>
- <UniqueIdentifier>{4C33DA67-A0C3-4947-93E0-01E52A3E1B62}</UniqueIdentifier>
+ <UniqueIdentifier>{B845F613-F2F8-4EDB-8CAE-574E38ABD746}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
diff --git a/sensors/Activity/Device.h b/sensors/Activity/Device.h
index 34e14fd0..64b2a5e4 100644
--- a/sensors/Activity/Device.h
+++ b/sensors/Activity/Device.h
@@ -52,6 +52,7 @@ typedef enum
SENSOR_MODEL,
SENSOR_PERSISTENT_UNIQUEID,
SENSOR_CATEGORY,
+ SENSOR_ISPRIMARY,
// These enumeration properties overlap with a subset of the common properties,
// and facilitate discovery without opening a sensor
diff --git a/sensors/Activity/README.md b/sensors/Activity/README.md
deleted file mode 100644
index aa8fcf09..00000000
--- a/sensors/Activity/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Activity
-========
-
-The activity sensor sample shows how to write a UMDF v2 driver to control a virtual activity sensor.
-
-## Universal Windows Driver Compliant
-This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
-
diff --git a/sensors/Activity/SensorsTrace.h b/sensors/Activity/SensorsTrace.h
index 1ea2dbdb..f6239fd7 100644
--- a/sensors/Activity/SensorsTrace.h
+++ b/sensors/Activity/SensorsTrace.h
@@ -20,7 +20,7 @@ extern "C" {
#define WPP_CONTROL_GUIDS \
WPP_DEFINE_CONTROL_GUID( \
- ActivityTraceGuid, (B6E7F50C,8F25,445E,8B39,D05802A53EB9), \
+ ActivityTraceGuid, (B6E7F50C,8F25,445E,8B39,D05802A53EB9), \
WPP_DEFINE_BIT(EntryExit) \
WPP_DEFINE_BIT(DataFlow) \
WPP_DEFINE_BIT(Verbose) \
@@ -86,6 +86,15 @@ extern "C" {
}
+
+// WPP Recorder -------------------------------------------------------------------------------------------
+//
+// The following two macros are required to enable WPP Recorder functionality for clients of the Sensor Class Extension
+//
+#define WPP_RECORDER_LEVEL_FLAGS_SENSOREXIT_FILTER(LEVEL, FLAGS, status) WPP_RECORDER_LEVEL_FLAGS_FILTER(LEVEL, FLAGS)
+#define WPP_RECORDER_LEVEL_FLAGS_SENSOREXIT_ARGS(LEVEL, FLAGS, status) WPP_RECORDER_LEVEL_FLAGS_ARGS(LEVEL, FLAGS)
+
+
#ifdef __cplusplus
}
#endif
diff --git a/sensors/Activity/client.cpp b/sensors/Activity/client.cpp
index 51c53e32..ca4c5bc2 100644
--- a/sensors/Activity/client.cpp
+++ b/sensors/Activity/client.cpp
@@ -884,7 +884,7 @@ NTSTATUS ActivityDevice::OnSetDataInterval(_In_ SENSOROBJECT sensorInstance, _In
if (nullptr == pDevice || Act_Default_MinDataInterval_Ms > dataRateMs)
{
status = STATUS_INVALID_PARAMETER;
- TraceError("ACT %!FUNC! Sensor parameter is invalid. Failed %!STATUS!", status);
+ TraceError("ACT %!FUNC! Invalid parameters! %!STATUS!", status);
}
else
{
@@ -977,7 +977,7 @@ NTSTATUS ActivityDevice::OnSetDataThresholds(
if (nullptr == pDevice)
{
status = STATUS_INVALID_PARAMETER;
- TraceError("ACT %!FUNC! Sensor(%08X) parameter is invalid. Failed %!STATUS!", (INT) sensorInstance, status);
+ TraceError("ACT %!FUNC! Sensor(0x%p) parameter is invalid. Failed %!STATUS!", sensorInstance, status);
}
else
{
diff --git a/sensors/Activity/device.cpp b/sensors/Activity/device.cpp
index 1414b67b..1b0339db 100644
--- a/sensors/Activity/device.cpp
+++ b/sensors/Activity/device.cpp
@@ -64,6 +64,10 @@ NTSTATUS ActivityDevice::InitializeEnumerationProperties()
InitPropVariantFromCLSID(GUID_SensorCategory_Motion,
&(m_pEnumerationProperties->List[SENSOR_CATEGORY].Value));
+ m_pEnumerationProperties->List[SENSOR_ISPRIMARY].Key = DEVPKEY_Sensor_IsPrimary;
+ InitPropVariantFromBoolean(FALSE,
+ &(m_pEnumerationProperties->List[SENSOR_ISPRIMARY].Value));
+
m_pEnumerationProperties->List[SENSOR_MIN_INTERVAL].Key = PKEY_Sensor_MinimumDataInterval_Ms;
InitPropVariantFromUInt32(Act_Default_MinDataInterval_Ms,
&(m_pEnumerationProperties->List[SENSOR_MIN_INTERVAL].Value));
generated by cgit v1.3.1 (git 2.54.0) at 2026-09-01 08:36:18 +0000