Skip to content

Commit 0cebf31

Browse files
author
Will Sobel
committed
Updated schemas and changed version number to V1.3 RC15
1 parent 4df94c7 commit 0cebf31

File tree

5 files changed

+13
-1
lines changed

5 files changed

+13
-1
lines changed

agent/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set (AGENT_VERSION_MAJOR 1)
1010
set (AGENT_VERSION_MINOR 3)
1111
set (AGENT_VERSION_PATCH 0)
1212
set (AGENT_VERSION_BUILD 0)
13-
set (AGENT_VERSION_RC "_RC14")
13+
set (AGENT_VERSION_RC "_RC15")
1414

1515
if(WIN32)
1616
if(CMAKE_CL_64)
@@ -93,6 +93,10 @@ target_link_libraries(agent ${LINUX_LIBRARIES} libxml2)
9393

9494
if(WIN32)
9595
set(WINVER "0x0501" CACHE STRING "Windows Target Version: 0x0400 - 95 & NT 4.0, 0x0500 - 2000, 0x0501 - XP, 0x0600 - Vista, 0x0601 - 7, 0x0602 - 8")
96+
if (WINVER EQUAL "0x0501")
97+
set(CMAKE_GENERATOR_TOOLSET "v110_xp" CACHE STRING "Use XP targeting")
98+
endif(WINVER)
99+
96100
add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
97101

98102
foreach(flag_var

schemas/MTConnectAssets_1.3.xsd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
298298
<xs:enumeration value='TORQUE'/>
299299
<xs:enumeration value='TOOL_ASSET_ID'/>
300300
<xs:enumeration value='TOOL_ID'/>
301+
<xs:enumeration value='TOOL_NUMBER'/>
301302
<xs:enumeration value='VELOCITY'/>
302303
<xs:enumeration value='VIBRATION'/>
303304
<xs:enumeration value='VOLTAGE'/>
@@ -348,6 +349,8 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
348349
<xs:enumeration value='WORKHOLDING_ID'/>
349350
<xs:enumeration value='PALLET_ID'/>
350351
<xs:enumeration value='OPERATOR_ID'/>
352+
<xs:enumeration value='ASSET_REMOVED'/>
353+
<xs:enumeration value='PROGRAM_HEADER'/>
351354
<xs:enumeration value='MATERIAL_FEED'/>
352355
<xs:enumeration value='MATERIAL_CHANGE'/>
353356
<xs:enumeration value='MATERIAL_RETRACT'/>

schemas/MTConnectDevices_1.3.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
298298
<xs:enumeration value='TORQUE'/>
299299
<xs:enumeration value='TOOL_ASSET_ID'/>
300300
<xs:enumeration value='TOOL_ID'/>
301+
<xs:enumeration value='TOOL_NUMBER'/>
301302
<xs:enumeration value='VELOCITY'/>
302303
<xs:enumeration value='VIBRATION'/>
303304
<xs:enumeration value='VOLTAGE'/>

schemas/MTConnectError_1.3.xsd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
298298
<xs:enumeration value='TORQUE'/>
299299
<xs:enumeration value='TOOL_ASSET_ID'/>
300300
<xs:enumeration value='TOOL_ID'/>
301+
<xs:enumeration value='TOOL_NUMBER'/>
301302
<xs:enumeration value='VELOCITY'/>
302303
<xs:enumeration value='VIBRATION'/>
303304
<xs:enumeration value='VOLTAGE'/>
@@ -348,6 +349,8 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
348349
<xs:enumeration value='WORKHOLDING_ID'/>
349350
<xs:enumeration value='PALLET_ID'/>
350351
<xs:enumeration value='OPERATOR_ID'/>
352+
<xs:enumeration value='ASSET_REMOVED'/>
353+
<xs:enumeration value='PROGRAM_HEADER'/>
351354
<xs:enumeration value='MATERIAL_FEED'/>
352355
<xs:enumeration value='MATERIAL_CHANGE'/>
353356
<xs:enumeration value='MATERIAL_RETRACT'/>

schemas/MTConnectStreams_1.3.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ SUCH PARTY HAD ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.
298298
<xs:enumeration value='TORQUE'/>
299299
<xs:enumeration value='TOOL_ASSET_ID'/>
300300
<xs:enumeration value='TOOL_ID'/>
301+
<xs:enumeration value='TOOL_NUMBER'/>
301302
<xs:enumeration value='VELOCITY'/>
302303
<xs:enumeration value='VIBRATION'/>
303304
<xs:enumeration value='VOLTAGE'/>

0 commit comments

Comments
 (0)