Finished for now

Author: jmmoser

CHANGELOG.md

@@ -1,9 +1,15 @@
 # Changelog
 
 ## 2.0.0-beta.2 (2019-11-30)
-- Added `PCCCLayer.echo()`
+- Logix5000 CAN NOW READ STRUCTURES 🔥
+- TCP layer automatically handles reconnects
+- Logix5000 listTags now accepts a scope (e.g. Program:SymbolName)
+- Logix5000 added data types Program, Map, Routine, Task, Cxn
+- Removed `Logix5000.readTagFragmented()`, it is now called automatically when needed
 - Fixed `PCCCLayer.typedWrite()` type/data parameter encoding
-- TCPLayer automatically handles reconnects
+- Added `PCCCLayer.echo()`
+- CIP ConnectionManager can now send unconnected messages - API still a work in progress
+
 
 
 ## 2.0.0-beta.1 (2019-11-15)

src/layers/Layer.js

@@ -87,7 +87,7 @@ class Layer extends EventEmitter {
       await this.disconnect();
 
       /** Do not bubble up since close has already bubbled up */
-      internalDestroy(this);
+      internalDestroy(this, 'Close');
 
       resolver.resolve();
     });
@@ -104,14 +104,19 @@ class Layer extends EventEmitter {
 
   forward(data, info, context) {
     if (this.upperLayer != null) {
-      this.forwardTo(this.upperLayer, data, info, context);
+      return this.forwardTo(this.upperLayer, data, info, context);
     }
   }
 
   forwardTo(layer, data, info, context) {
-    // console.log('emitting data');
-    // console.log(data);
-    internalHandleData(layer, data, info, context);
+    if (layer._defragger != null) {
+      data = layer._defragger.defrag(data);
+      if (data == null) return;
+    }
+    layer.emit('data', data, info, context);
+    return layer.handleData(data, info, context);
+
+    // return internalHandleData(layer, data, info, context);
   }
 
   send(message, info, priority, context) {
@@ -227,14 +232,14 @@ function incrementContext(self) {
 }
 
 
-function internalHandleData(self, data, info, context) {
-  if (self._defragger != null) {
-    data = self._defragger.defrag(data);
-    if (data == null) return;
-  }
-  self.emit('data', data, info, context);
-  self.handleData(data, info, context);
-}
+// function internalHandleData(self, data, info, context) {
+//   if (self._defragger != null) {
+//     data = self._defragger.defrag(data);
+//     if (data == null) return;
+//   }
+//   self.emit('data', data, info, context);
+//   return self.handleData(data, info, context);
+// }
 
 
 function internalDestroy(layer, error) {

src/layers/cip/Logix5000/constants.js

@@ -7,6 +7,16 @@ const {
 } = require('../../../utils');
 
 
+const LDataTypeCodes = {
+  Program: 0x68,
+  Map: 0x69,
+  Routine: 0x6D,
+  Task: 0x70,
+  Cxn: 0x7E
+};
+
+const LDatatypeNames = InvertKeyValues(LDataTypeCodes);
+
 
 const ClassCodes = {
   Symbol: 0x6B,
@@ -154,6 +164,8 @@ const GenericServiceStatusDescriptions = {
 
 
 module.exports = {
+  LDataTypeCodes,
+  LDatatypeNames,
   ClassCodes,
   SymbolServiceCodes,
   SymbolServiceNames,