Skip to content
This repository has been archived by the owner on Jan 8, 2019. It is now read-only.

Commit

Permalink
Added some utilities and updated the simulation to the NIST adapter d…
Browse files Browse the repository at this point in the history 
…ump with two NIST Mazak machine.
  • Loading branch information
Will Sobel committed Oct 29, 2017
1 parent 5a9eaaa commit 45bc869
Show file tree
Hide file tree
Showing 15 changed files with 630 additions and 53,456 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ node_modules

# literate-programming
build
doc/*~

*.ps1

*~
15 changes: 7 additions & 8 deletions adapters/simulator/config/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,16 @@ module.exports = {
manufacturer: 'SystemInsights',
modelName: 'Simulator',
serialNumber: '123456',
inputFile: './adapters/simulator/public/vmc_10di.txt',
deviceFile: './adapters/simulator/public/Device.xml',

inputFile: './adapters/simulator/public/Mazak01.log',
deviceFile: './adapters/simulator/public/Mazak01.xml',

app: {
name: 'Simulator_1',
app: {
name: 'Simulator_1',
version: '0.1'
},
},

logging: {
logLevel: env.MTC_LOG_LEVEL || 'warn',
logDir: env.MTC_LOG_DIR
logDir: env.MTC_LOG_DIR
}
}
}
117 changes: 0 additions & 117 deletions adapters/simulator/public/Device.xml
View file

This file was deleted.

141 changes: 141 additions & 0 deletions adapters/simulator/public/Mazak01.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="/styles/Devices.xsl"?>
<MTConnectDevices xmlns:m="urn:mtconnect.org:MTConnectDevices:1.3" xmlns="urn:mtconnect.org:MTConnectDevices:1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mtconnect.org:MTConnectDevices:1.3 /schemas/MTConnectDevices_1.3.xsd">
<Header creationTime="2017-10-29T02:40:27Z" sender="962b6da7a383" instanceId="1508338563" version="1.3.0.18" assetBufferSize="1024" assetCount="0" bufferSize="1048576"/>
<Devices>
<Device id="Mazak01" name="Mazak01" uuid="43444e50-a578-11e7-a3dd-28cfe91a82ef">
<Description manufacturer="Mazak" model="Integrex" serialNumber="M7303290458">Mazak Integrex 100-IV</Description>
<DataItems>
<DataItem category="EVENT" id="Mazak01-dtop_1" name="avail" type="AVAILABILITY"/>
<DataItem category="EVENT" id="Mazak01_asset_chg" type="ASSET_CHANGED"/>
<DataItem category="EVENT" id="Mazak01_asset_rem" type="ASSET_REMOVED"/>
</DataItems>
<Components>
<Axes id="Mazak01-base" name="base">
<DataItems>
<DataItem category="CONDITION" id="Mazak01-base_1" name="servo_cond" type="ACTUATOR"/>
</DataItems>
<Components>
<Linear id="Mazak01-X" name="X">
<DataItems>
<DataItem category="SAMPLE" coordinateSystem="MACHINE" id="Mazak01-X_1" name="Xabs" nativeUnits="MILLIMETER" subType="ACTUAL" type="POSITION" units="MILLIMETER"/>
<DataItem category="CONDITION" id="Mazak01-X_2" name="Xtravel" type="POSITION"/>
<DataItem category="SAMPLE" id="Mazak01-X_3" name="Xload" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
<DataItem category="SAMPLE" id="Mazak01-X_4" name="Xfrt" nativeUnits="MILLIMETER/SECOND" type="AXIS_FEEDRATE" units="MILLIMETER/SECOND"/>
</DataItems>
</Linear>
<Linear id="Mazak01-Y" name="Y">
<DataItems>
<DataItem category="SAMPLE" coordinateSystem="MACHINE" id="Mazak01-Y_1" name="Yabs" nativeUnits="MILLIMETER" subType="ACTUAL" type="POSITION" units="MILLIMETER"/>
<DataItem category="CONDITION" id="Mazak01-Y_2" name="Ytravel" type="POSITION"/>
<DataItem category="SAMPLE" id="Mazak01-Y_3" name="Yload" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
<DataItem category="SAMPLE" id="Mazak01-Y_4" name="Yfrt" nativeUnits="MILLIMETER/SECOND" type="AXIS_FEEDRATE" units="MILLIMETER/SECOND"/>
</DataItems>
</Linear>
<Linear id="Mazak01-Z" name="Z">
<DataItems>
<DataItem category="SAMPLE" coordinateSystem="MACHINE" id="Mazak01-Z_1" name="Zabs" nativeUnits="MILLIMETER" subType="ACTUAL" type="POSITION" units="MILLIMETER"/>
<DataItem category="CONDITION" id="Mazak01-Z_2" name="Ztravel" type="POSITION"/>
<DataItem category="SAMPLE" id="Mazak01-Z_3" name="Zload" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
<DataItem category="SAMPLE" id="Mazak01-Z_4" name="Zfrt" nativeUnits="MILLIMETER/SECOND" type="AXIS_FEEDRATE" units="MILLIMETER/SECOND"/>
</DataItems>
</Linear>
<Rotary id="Mazak01-B" name="B">
<DataItems>
<DataItem category="SAMPLE" id="Mazak01-B_1" name="Bload" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
<DataItem category="SAMPLE" id="Mazak01-B_2" name="Bfrt" nativeUnits="DEGREE/MINUTE" type="ANGULAR_VELOCITY" units="DEGREE/SECOND"/>
<DataItem category="CONDITION" id="Mazak01-B_3" name="Btravel" type="ANGLE"/>
<DataItem category="SAMPLE" id="Mazak01-B_4" name="Bdeg" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE"/>
</DataItems>
</Rotary>
<Rotary id="Mazak01-C" name="C">
<DataItems>
<DataItem category="SAMPLE" id="Mazak01-C_1" name="Cload" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
<DataItem category="SAMPLE" id="Mazak01-C_2" name="Sload" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
<DataItem category="CONDITION" id="Mazak01-C_3" name="Ctravel" type="ANGLE"/>
<DataItem category="SAMPLE" id="Mazak01-C_4" name="Cfrt" nativeUnits="DEGREE/MINUTE" type="ANGULAR_VELOCITY" units="DEGREE/SECOND"/>
<DataItem category="SAMPLE" id="Mazak01-C_5" name="Srpm" nativeUnits="REVOLUTION/MINUTE" subType="ACTUAL" type="ROTARY_VELOCITY" units="REVOLUTION/MINUTE"/>
<DataItem category="EVENT" id="Mazak01-C_6" name="Sovr" nativeUnits="PERCENT" type="ROTARY_VELOCITY_OVERRIDE" units="PERCENT"/>
<DataItem category="SAMPLE" id="Mazak01-C_7" name="Stemp" nativeUnits="CELSIUS" type="TEMPERATURE" units="CELSIUS"/>
<DataItem category="SAMPLE" id="Mazak01-C_8" name="Cdeg" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE"/>
<DataItem category="CONDITION" id="Mazak01-C_9" name="Sload_cond" type="LOAD"/>
<DataItem category="CONDITION" id="Mazak01-C_10" name="Stemp_cond" type="TEMPERATURE"/>
</DataItems>
</Rotary>
<Rotary id="Mazak01-C2" name="C">
<DataItems>
<DataItem category="SAMPLE" id="Mazak01-C2_1" name="S2load" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
<DataItem category="SAMPLE" id="Mazak01-C2_2" name="S2rpm" nativeUnits="REVOLUTION/MINUTE" subType="ACTUAL" type="ROTARY_VELOCITY" units="REVOLUTION/MINUTE"/>
<DataItem category="SAMPLE" id="Mazak01-C2_3" name="S2temp" nativeUnits="CELSIUS" type="TEMPERATURE" units="CELSIUS"/>
<DataItem category="CONDITION" id="Mazak01-C2_4" name="S2load_cond" type="LOAD"/>
<DataItem category="CONDITION" id="Mazak01-C2_5" name="S2temp_cond" type="TEMPERATURE"/>
</DataItems>
</Rotary>
</Components>
</Axes>
<Controller id="Mazak01-controller" name="controller">
<DataItems>
<DataItem category="CONDITION" id="Mazak01-controller_1" name="comms_cond" type="COMMUNICATIONS"/>
<DataItem category="CONDITION" id="Mazak01-controller_2" name="logic_cond" type="LOGIC_PROGRAM"/>
<DataItem category="CONDITION" id="Mazak01-controller_3" name="system_cond" type="SYSTEM"/>
<DataItem category="EVENT" id="Mazak01-controller_4" name="estop" type="EMERGENCY_STOP"/>
</DataItems>
<Components>
<Path id="Mazak01-path" name="path">
<DataItems>
<DataItem category="EVENT" id="Mazak01-path_1" name="program" type="PROGRAM"/>
<DataItem category="EVENT" id="Mazak01-path_2" name="subprogram" subType="x:SUB" type="PROGRAM"/>
<DataItem category="EVENT" id="Mazak01-path_3" name="line" type="LINE"/>
<DataItem category="EVENT" id="Mazak01-path_4" name="unitNum" type="x:UNIT"/>
<DataItem category="EVENT" id="Mazak01-path_5" name="sequenceNum" type="x:SEQUENCE_NUMBER"/>
<DataItem category="EVENT" id="Mazak01-path_6" name="PartCountAct" type="PART_COUNT"/>
<DataItem category="SAMPLE" coordinateSystem="WORK" id="Mazak01-path_7" name="Fact" nativeUnits="FOOT/MINUTE" subType="ACTUAL" type="PATH_FEEDRATE" units="MILLIMETER/SECOND"/>
<DataItem category="EVENT" id="Mazak01-path_8" name="Frapidovr" nativeUnits="PERCENT" subType="RAPID" type="PATH_FEEDRATE_OVERRIDE" units="PERCENT"/>
<DataItem category="EVENT" id="Mazak01-path_9" name="Fovr" nativeUnits="PERCENT" subType="PROGRAMMED" type="PATH_FEEDRATE_OVERRIDE" units="PERCENT"/>
<DataItem category="EVENT" id="Mazak01-path_10" name="Tool_number" type="TOOL_NUMBER"/>
<DataItem category="EVENT" id="Mazak01-path_11" name="Tool_group" type="x:TOOL_GROUP"/>
<DataItem category="EVENT" id="Mazak01-path_12" name="Tool_suffix" type="x:TOOL_SUFFIX"/>
<DataItem category="EVENT" id="Mazak01-path_13" name="execution" type="EXECUTION"/>
<DataItem category="EVENT" id="Mazak01-path_14" name="mode" type="CONTROLLER_MODE"/>
<DataItem category="EVENT" id="Mazak01-path_15" name="program_cmt" type="x:PROGRAM_COMMENT"/>
<DataItem category="EVENT" id="Mazak01-path_16" name="subprogram_cmt" subType="x:SUB" type="x:PROGRAM_COMMENT"/>
<DataItem category="SAMPLE" id="Mazak01-path_17" name="auto_time" subType="x:AUTO" type="ACCUMULATED_TIME"/>
<DataItem category="SAMPLE" id="Mazak01-path_18" name="total_time" subType="x:TOTAL" type="ACCUMULATED_TIME"/>
<DataItem category="SAMPLE" id="Mazak01-path_19" name="cut_time" subType="x:CUT" type="ACCUMULATED_TIME"/>
<DataItem category="CONDITION" id="Mazak01-path_20" name="motion_cond" type="MOTION_PROGRAM"/>
<DataItem category="CONDITION" id="Mazak01-path_21" name="path_system" type="SYSTEM"/>
</DataItems>
</Path>
</Components>
</Controller>
<Systems id="Mazak01-systems" name="systems">
<Components>
<Electric id="Mazak01-electric" name="electric">
<DataItems>
<DataItem category="EVENT" id="Mazak01-electric_1" name="power" type="POWER_STATE"/>
<DataItem category="CONDITION" id="Mazak01-electric_2" name="electric_temp" type="TEMPERATURE"/>
</DataItems>
</Electric>
<Hydraulic id="Mazak01-hydraulic" name="hydraulic">
<DataItems>
<DataItem category="CONDITION" id="Mazak01-hydraulic_1" name="hydra_cond" type="PRESSURE"/>
</DataItems>
</Hydraulic>
<Coolant id="Mazak01-coolant" name="coolant">
<DataItems>
<DataItem category="CONDITION" id="Mazak01-coolant_1" name="coolant_pres" type="PRESSURE"/>
<DataItem category="CONDITION" id="Mazak01-coolant_2" name="coolant_temp" type="TEMPERATURE"/>
<DataItem category="CONDITION" id="Mazak01-coolant_3" name="coolant_level" type="LEVEL"/>
</DataItems>
</Coolant>
<Pneumatic id="Mazak01-pneumatic" name="pneumatic">
<DataItems>
<DataItem category="CONDITION" id="Mazak01-pneumatic_1" name="pneu_cond" type="PRESSURE"/>
</DataItems>
</Pneumatic>
</Components>
</Systems>
</Components>
</Device>
</Devices>
</MTConnectDevices>
Loading

0 comments on commit 45bc869

Please sign in to comment.