* 0.6 release

Ladder99 · Feb 6, 2023 · 0f0d6fd · 0f0d6fd
1 parent 3080be7
commit 0f0d6fd
Show file tree

Hide file tree

Showing 27 changed files with 496 additions and 401 deletions.
diff --git a/base-driver b/base-driver
diff --git a/examples/docker/config.machines.yml b/examples/docker/config.machines.yml
@@ -60,54 +60,87 @@ machines:
   #  <<: *no-filter
 
   # LONG VERSION
-  - id: f_sim_mtc_long
+  - id: f_sim_mqtt_long
     enabled: !!bool false
     type: l99.driver.fanuc.FanucMachine, fanuc
     strategy: l99.driver.fanuc.strategies.FanucMultiStrategy, fanuc
     handler: l99.driver.fanuc.handlers.FanucOne, fanuc
-    transport: l99.driver.fanuc.transports.SHDR, fanuc
+    transport: l99.driver.fanuc.transports.MQTT, fanuc
     l99.driver.fanuc.FanucMachine, fanuc:
       sweep_ms: !!int 1000
       net:
         ip: 10.1.10.211
         port: !!int 8193
         timeout_s: !!int 3
     l99.driver.fanuc.strategies.FanucMultiStrategy, fanuc:
+      stay_connected: !!bool false
+      #exclusions:
+      #  1: 
+      #  2: [ X, S ]
+      #  3: [ % ]
       collectors:
       - l99.driver.fanuc.collectors.MachineInfo, fanuc
       - l99.driver.fanuc.collectors.Alarms, fanuc
       - l99.driver.fanuc.collectors.Messages, fanuc
       - l99.driver.fanuc.collectors.StateData, fanuc
       - l99.driver.fanuc.collectors.ToolData, fanuc
       - l99.driver.fanuc.collectors.ProductionData, fanuc
+      #- l99.driver.fanuc.collectors.ProductionDataExternalSubprogramDetails, fanuc
       - l99.driver.fanuc.collectors.GCodeData, fanuc
       - l99.driver.fanuc.collectors.AxisData, fanuc
       - l99.driver.fanuc.collectors.SpindleData, fanuc
     l99.driver.fanuc.handlers.FanucOne, fanuc:
-      change_only: !!bool false
+      change_only: !!bool true
       skip_internal: !!bool true
-    l99.driver.fanuc.transports.SHDR, fanuc:
-      << : *default-shdr-transformers
-      << : *default-shdr-model-genny
-      device_name: f_sim
+    l99.driver.fanuc.transports.MQTT, fanuc:
+      topic: fanuc/{{machine.Id}}/{{veneer.Name}}{{if veneer.SliceKey}}/{{veneer.SliceKey}}{{end}}
+      enabled: !!bool true
       net:
-        port: !!int 7878
-        heartbeat_ms: !!int 10000
-        interval_ms: !!int 1000
+        type: tcp
+        ip: 127.0.0.1
+        port: !!int 1883
+      anonymous: !!bool true
+      user:
+      password:
+    l99.driver.fanuc.collectors.ProductionData, fanuc:
+      unsupported: !!bool false
+    l99.driver.fanuc.collectors.GCodeData, fanuc:
+      block_counter: !!bool false
+      buffer_length: !!int 512
+    l99.driver.fanuc.collectors.ProductionDataExternalSubprogramDetails, fanuc:
+      extraction:
+        files:
+          1: "c:/partprg/one"
+          1400: "c:/partprg/MCenter"
+          1401: "c:/partprg/PLeft"
+          1402: "c:/partprg/PRight"
+        lines: 
+          count: !!int 60
+          show: !!bool false
+          keep: !!bool false
+        properties:
+          keep: !!bool true
+          map:
+            program_name: "^\\( *(?<key>PROGRAM NAME) *: *(?<value>[^\\):\\n]+[^ \\):\\n])* *\\)$"
+            feed: "^\\( *(?<key>FEED) *: *(?<value>[^\\):\\n]+[^ \\):\\n])* *\\)$"
+            time_per_program: "^\\( *(?<key>TIME/PROGRAM) *: *(?<value>[^\\):\\n]+[^ \\):\\n])* *\\)$"
+            kits_per_program: "^\\( *(?<key>KITS/PROGRAM) *: *(?<value>[^\\):\\n]+[^ \\):\\n])* *\\)$"
+            comments: "^\\( *(?<key>COMMENTS) *: *(?<value>[^\\):\\n]+[^ \\):\\n])* *\\)$"
 
-  - id: f_sim_mqtt_long
+  - id: f_sim_mtc_long
     enabled: !!bool true
     type: l99.driver.fanuc.FanucMachine, fanuc
     strategy: l99.driver.fanuc.strategies.FanucMultiStrategy, fanuc
     handler: l99.driver.fanuc.handlers.FanucOne, fanuc
-    transport: l99.driver.fanuc.transports.MQTT, fanuc
+    transport: l99.driver.fanuc.transports.SHDR, fanuc
     l99.driver.fanuc.FanucMachine, fanuc:
       sweep_ms: !!int 1000
       net:
         ip: 10.1.10.211
         port: !!int 8193
         timeout_s: !!int 3
     l99.driver.fanuc.strategies.FanucMultiStrategy, fanuc:
+      stay_connected: !!bool false
       collectors:
       - l99.driver.fanuc.collectors.MachineInfo, fanuc
       - l99.driver.fanuc.collectors.Alarms, fanuc
@@ -119,18 +152,16 @@ machines:
       - l99.driver.fanuc.collectors.AxisData, fanuc
       - l99.driver.fanuc.collectors.SpindleData, fanuc
     l99.driver.fanuc.handlers.FanucOne, fanuc:
-      change_only: !!bool true
+      change_only: !!bool false
       skip_internal: !!bool true
-    l99.driver.fanuc.transports.MQTT, fanuc:
-      topic: fanuc/{{machine.Id}}/{{veneer.Name}}{{if veneer.SliceKey}}/{{veneer.SliceKey}}{{end}}
-      enabled: !!bool true
+    l99.driver.fanuc.transports.SHDR, fanuc:
+      << : *default-shdr-transformers
+      << : *default-shdr-model-genny
+      device_name: f_sim
       net:
-        type: tcp
-        ip: 10.1.10.173
-        port: !!int 1884
-      anonymous: !!bool true
-      user:
-      password:
+        port: !!int 7878
+        heartbeat_ms: !!int 10000
+        interval_ms: !!int 1000
 
   - id: f_sim_spb_long
     enabled: !!bool false
@@ -145,6 +176,7 @@ machines:
         port: !!int 8193
         timeout_s: !!int 3
     l99.driver.fanuc.strategies.FanucMultiStrategy, fanuc:
+      stay_connected: !!bool false
       collectors:
       - l99.driver.fanuc.collectors.MachineInfo, fanuc
       - l99.driver.fanuc.collectors.Alarms, fanuc
@@ -155,9 +187,6 @@ machines:
       - l99.driver.fanuc.collectors.GCodeData, fanuc
       - l99.driver.fanuc.collectors.AxisData, fanuc
       - l99.driver.fanuc.collectors.SpindleData, fanuc
-    l99.driver.fanuc.handlers.FanucOne, fanuc:
-      change_only: !!bool true
-      skip_internal: !!bool true
     l99.driver.fanuc.transports.SpB, fanuc:
       enabled: !!bool true
       net:
@@ -181,6 +210,7 @@ machines:
         port: !!int 8193
         timeout_s: !!int 3
     l99.driver.fanuc.strategies.FanucMultiStrategy, fanuc:
+      stay_connected: !!bool false
       collectors:
       - l99.driver.fanuc.collectors.MachineInfo, fanuc
       - l99.driver.fanuc.collectors.Alarms, fanuc
@@ -191,15 +221,9 @@ machines:
       - l99.driver.fanuc.collectors.GCodeData, fanuc
       - l99.driver.fanuc.collectors.AxisData, fanuc
       - l99.driver.fanuc.collectors.SpindleData, fanuc
-    l99.driver.fanuc.handlers.FanucOne, fanuc:
-      change_only: !!bool true
-      skip_internal: !!bool true
     l99.driver.fanuc.transports.InfluxLP, fanuc:
-      l99.driver.fanuc.transports.InfluxLP, fanuc:
       <<: *default-influx-transformers
       host: "http://influx:8086"
       token: "dewlnpy0CmcikwWmMBlqoxcoeuUWpdlDQi8yH7QyGU0tcfn0avMMcpPWYJ-ZUmLD8iHXNl27M3GBHGC4n4_EwA=="
       org: "fanuc"
-      bucket: "fanuc"
-
-
+      bucket: "fanuc"
diff --git a/examples/docker/config.system.yml b/examples/docker/config.system.yml
@@ -2,23 +2,6 @@
 # system configuration section
 #
 system:
-  machine-disabled: &machine-disabled
-    enabled: !!bool false
-  machine-base: &machine-base
-    enabled: !!bool true
-    type: l99.driver.fanuc.FanucMachine, fanuc
-    strategy: l99.driver.fanuc.strategies.FanucMultiStrategy, fanuc
-    handler: l99.driver.fanuc.handlers.FanucOne, fanuc
-  change-filter: &change-filter
-    l99.driver.fanuc.handlers.FanucOne, fanuc:
-      change_only: !!bool true
-      skip_internal: !!bool true
-  no-filter: &no-filter
-    l99.driver.fanuc.handlers.FanucOne, fanuc:
-      change_only: !!bool false
-      skip_internal: !!bool true
-  default-mqtt-options: &default-mqtt-options
-    topic: fanuc/{{machine.Id}}/{{veneer.Name}}{{if veneer.SliceKey}}/{{veneer.SliceKey}}{{end}}
   default-influx-transformers: &default-influx-transformers
     transformers:
       SWEEP_END: >-
@@ -418,14 +401,4 @@ system:
         ShdrEventIf p+`_state` (data.speed > 0) `TRAVEL` `STOPPED`;
         ShdrEvent p+`_rotary` `SPINDLE`;
         ShdrConditionFaultIf p+`_alm_lnk` (! data.status_lnk);
-        ShdrConditionSeverity p+`_alm_amp` (data.error > 0) (data.warning > 0) (data.error == 0 && data.warning == 0);
-  transport-base-null: &transport-base-null
-    transport: l99.driver.fanuc.transports.Null, fanuc
-  transport-base-mqtt: &transport-base-mqtt
-    transport: l99.driver.fanuc.transports.MQTT, fanuc
-  transport-base-influx: &transport-base-influx
-    transport: l99.driver.fanuc.transports.InfluxLP, fanuc
-  transport-base-shdr: &transport-base-shdr
-    transport: l99.driver.fanuc.transports.SHDR, fanuc
-  transport-base-spb: &transport-base-spb
-    transport: l99.driver.fanuc.transports.SpB, fanuc
+        ShdrConditionSeverity p+`_alm_amp` (data.error > 0) (data.warning > 0) (data.error == 0 && data.warning == 0);
diff --git a/examples/docker/config.user.yml b/examples/docker/config.user.yml
@@ -2,26 +2,64 @@
 # user configuration section
 #
 user:
-  # focas sources
+
+  machine-disabled: &machine-disabled
+    enabled: !!bool false
+  machine-base: &machine-base
+    enabled: !!bool true
+    type: l99.driver.fanuc.FanucMachine, fanuc
+    strategy: l99.driver.fanuc.strategies.FanucMultiStrategy, fanuc
+    handler: l99.driver.fanuc.handlers.FanucOne, fanuc
+  change-filter: &change-filter
+    l99.driver.fanuc.handlers.FanucOne, fanuc:
+      change_only: !!bool true
+      skip_internal: !!bool true
+  no-filter: &no-filter
+    l99.driver.fanuc.handlers.FanucOne, fanuc:
+      change_only: !!bool false
+      skip_internal: !!bool true
+  default-mqtt-options: &default-mqtt-options
+    topic: fanuc/{{machine.Id}}/{{veneer.Name}}{{if veneer.SliceKey}}/{{veneer.SliceKey}}{{end}}
+
+  transport-base-null: &transport-base-null
+    transport: l99.driver.fanuc.transports.Null, fanuc
+  transport-base-mqtt: &transport-base-mqtt
+    transport: l99.driver.fanuc.transports.MQTT, fanuc
+  transport-base-influx: &transport-base-influx
+    transport: l99.driver.fanuc.transports.InfluxLP, fanuc
+  transport-base-shdr: &transport-base-shdr
+    transport: l99.driver.fanuc.transports.SHDR, fanuc
+  transport-base-spb: &transport-base-spb
+    transport: l99.driver.fanuc.transports.SpB, fanuc
+
+  # sources
   source-1: &source-1
-    # example fanuc source
     l99.driver.fanuc.FanucMachine, fanuc:
       sweep_ms: !!int 1000
       net:
         ip: 10.1.10.211
         port: !!int 8193
         timeout_s: !!int 3
+
   # collectors
   collector-0: &collector-0
-    # example collector
     l99.driver.fanuc.strategies.FanucMultiStrategy, fanuc:
+      stay_connected: !!bool false
+      #exclusions:
+      #  1: 
+      #  2: [ X, S ]
+      #  3: [ % ]
       collectors:
       - l99.driver.fanuc.collectors.ParameterDump, fanuc
       - l99.driver.fanuc.collectors.DiagnosisDump, fanuc
       - l99.driver.fanuc.collectors.PmcDump, fanuc
   collector-1: &collector-1
-    # example collector
     l99.driver.fanuc.strategies.FanucMultiStrategy, fanuc:
+      stay_connected: !!bool false
+      #exclusions:
+      #  1: 
+      #  2: [ X, S ]
+      #  3: [ % ]
       collectors:
       - l99.driver.fanuc.collectors.MachineInfo, fanuc
       - l99.driver.fanuc.collectors.Alarms, fanuc
@@ -32,14 +70,13 @@ user:
       - l99.driver.fanuc.collectors.GCodeData, fanuc
       - l99.driver.fanuc.collectors.AxisData, fanuc
       - l99.driver.fanuc.collectors.SpindleData, fanuc
-  # targets
+
+  # sinks
   target-null: &target-null
-    # send to nothing
     << : *transport-base-null
     l99.driver.fanuc.transports.Null, fanuc:
       enabled: !!bool true
   target-mqtt-1: &target-mqtt-1
-    # send to tcp mqtt broker
     << : *transport-base-mqtt
     l99.driver.fanuc.transports.MQTT, fanuc:
       << : *default-mqtt-options
@@ -52,7 +89,6 @@ user:
       user:
       password:
   target-mqtt-2: &target-mqtt-2
-    # send to websocket mqtt broker
     << : *transport-base-mqtt
     l99.driver.fanuc.transports.MQTT, fanuc:
       << : *default-mqtt-options
@@ -65,7 +101,6 @@ user:
       user:
       password:
   target-influx-1: &target-influx-1
-    # send to cloud influx instance
     <<: *transport-base-influx
     l99.driver.fanuc.transports.InfluxLP, fanuc:
       <<: *default-influx-transformers
@@ -74,7 +109,6 @@ user:
       org: "fanuc"
       bucket: "fanuc"
   target-spb-1: &target-spb-1
-    # send to tcp mqtt broker
     << : *transport-base-spb
     l99.driver.fanuc.transports.SpB, fanuc:
       enabled: !!bool true
@@ -86,7 +120,6 @@ user:
       user: admin
       password: password
   target-shdr-1: &target-shdr-1
-    # open tcp socket for mtconnect agent
     << : *transport-base-shdr
     l99.driver.fanuc.transports.SHDR, fanuc:
       << : *default-shdr-transformers
@@ -95,4 +128,4 @@ user:
       net:
         port: !!int 7878
         heartbeat_ms: !!int 10000
-        interval_ms: !!int 1000
+        interval_ms: !!int 1000
diff --git a/examples/docker/nlog.config b/examples/docker/nlog.config
@@ -16,10 +16,22 @@
                 archiveAboveSize="10000000"/>
         <target xsi:type="Console" name="consoleTarget"
                 layout="${date}|${level:uppercase=true}|${message} ${exception:format=tostring}|${logger}|${all-event-properties}" />
+        <target name="throttle_log4j" type="AsyncWrapper" timeToSleepBetweenBatches="100" batchSize="1" overflowAction="Block">
+            <target name="log4j" type="Chainsaw" address="udp://127.0.0.1:4445" newline="true" />
+        </target>
     </targets>
 
     <!-- rules to map from logger name to target -->
     <rules>
-        <logger name="*" minlevel="INFO" writeTo="fileTarget,consoleTarget" />
+        <logger name="l99.driver.base.*" minlevel="INFO" writeTo="fileTarget,consoleTarget" />
+        <logger name="l99.driver.fanuc.Platform" minlevel="INFO" writeTo="fileTarget,consoleTarget" />
+        <logger name="l99.driver.fanuc.utils.*" minlevel="INFO" writeTo="fileTarget,consoleTarget" />
+        <logger name="l99.driver.fanuc.collectors.*" minlevel="INFO" writeTo="fileTarget,consoleTarget" />
+        <logger name="l99.driver.fanuc.veneers.*" minlevel="INFO" writeTo="fileTarget,consoleTarget" />
+        <logger name="l99.driver.fanuc.strategies.*" minlevel="INFO" writeTo="fileTarget,consoleTarget" />
+        <logger name="l99.driver.fanuc.handlers.*" minlevel="INFO" writeTo="fileTarget,consoleTarget" />
+        <logger name="l99.driver.fanuc.transports.*" minlevel="INFO" writeTo="fileTarget,consoleTarget" />
+        <!--<logger name="*" minlevel="DEBUG" writeTo="fileTarget,consoleTarget" />-->
+        <!--<logger name="*" minlevel="INFO" writeTo="throttle_log4j" />-->
     </rules>
 </nlog>
+2 −2		base/Bootstrap.cs
+14 −15		base/Machine.cs
+26 −22		base/Machines.cs