Fix exceptions description bug!

Author: adrianscheit

src/data-field-strategy.ts

@@ -124,3 +124,28 @@ export class AddressQuantityRegisters extends AddressQuantity {
         this.registers = new Registers(data.slice(4));
     }
 }
+
+export class Exception {
+    static exceptionDescriptions: ReadonlyMap<number, string> = new Map<number, string>([
+        [0x81, 'Illegal Function'],
+        [0x82, 'Illegal Data Address'],
+        [0x83, 'Illegal Data Value'],
+        [0x84, 'Server Device Failure'],
+        [0x85, 'Acknowledge'],
+        [0x86, 'Server Device Busy'],
+        [0x87, 'Negative Acknowledge'],
+        [0x88, 'Memory Parity Error'],
+        [0x90, 'Gateway Path Unavailable'],
+        [0x91, 'Gateway Target Device Failed to Respond'],
+    ]);
+    code: number;
+    description: string | undefined;
+
+    constructor(data: number[]) {
+        if (data.length !== 1) {
+            throw new Error('Just on byte of exception code is allowed!');
+        }
+        this.code = data[0];
+        this.description = Exception.exceptionDescriptions.get(this.code);
+    }
+}

src/frame.ts

@@ -35,7 +35,7 @@ export class Frame {
         return [
             new TableDataColumn(`${Frame.getDateTime()} (${this.type})`, this.type),
             new TableDataColumn(`${this.slaveAddress} = 0x${Converters.byteToHex(this.slaveAddress!)}`, this.type),
-            new TableDataColumn(FunctionCodes.getDescription(this.functionCode), this.type),
+            new TableDataColumn(FunctionCodes.getDescription(this.functionCode), FunctionCodes.isError(this.functionCode || 0) ? 'error' : this.type),
             new TableDataColumn(this.getDataLength().toString(), this.type),
             new TableDataColumn(this.getDataAsText(), this.isNoValidDataFormat() ? 'error' : this.type),
             this.type === 'error' ? new TableDataColumn('', this.type) : new TableColumnButton('To send form', () => Dom.sendForm.setFormData(this)),

src/function-codes.ts

@@ -1,5 +1,5 @@
 import { Converters } from "./converters";
-import { AddressBoolean, AddressQuantity, AddressQuantityBooleans, AddressQuantityRegisters, AddressRegister, Booleans, DataFieldStrategy, Registers } from "./data-field-strategy";
+import { AddressBoolean, AddressQuantity, AddressQuantityBooleans, AddressQuantityRegisters, AddressRegister, Booleans, DataFieldStrategy, Exception, Registers } from "./data-field-strategy";
 
 interface FunctionCodeDetails {
     readonly code: number;
@@ -20,16 +20,6 @@ const allFunctionCodeDetails: ReadonlySet<FunctionCodeDetails> = new Set<Functio
     { code: 0x0f, description: 'Write Multiple Coils', masterRequestStrategy: AddressQuantityBooleans, slaveResponseStrategy: AddressQuantity },
     { code: 0x10, description: 'Write Multiple Registers', masterRequestStrategy: AddressQuantityRegisters, slaveResponseStrategy: AddressQuantity },
     { code: 0x11, description: 'Identify Device Server' },
-    { code: 0x81, description: 'Illegal Function' },
-    { code: 0x82, description: 'Illegal Data Address' },
-    { code: 0x83, description: 'Illegal Data Value' },
-    { code: 0x84, description: 'Server Device Failure' },
-    { code: 0x85, description: 'Acknowledge' },
-    { code: 0x86, description: 'Server Device Busy' },
-    { code: 0x87, description: 'Negative Acknowledge' },
-    { code: 0x88, description: 'Memory Parity Error' },
-    { code: 0x90, description: 'Gateway Path Unavailable' },
-    { code: 0x91, description: 'Gateway Target Device Failed to Respond' },
 ]);
 
 export type StrategyResult = { object?: Object, error?: string } | undefined;
@@ -51,7 +41,7 @@ export class FunctionCodes {
         if (code === undefined) {
             return '';
         }
-        const description = this.descriptions.get(code);
+        const description = this.descriptions.get(code & ~0x80);
         if (description) {
             return this._getDescription(code, description);
         }
@@ -71,7 +61,7 @@ export class FunctionCodes {
     }
 
     static newSlaveResponse(code: number, dataFieldBytes: number[]): StrategyResult {
-        return this._newDataFieldStrategy(this.slaveResponseStrategies.get(code), dataFieldBytes);
+        return this._newDataFieldStrategy(code & 0x80 ? Exception : this.slaveResponseStrategies.get(code), dataFieldBytes);
     }
 
     private static _newDataFieldStrategy(strategy: DataFieldStrategy | undefined, dataFieldBytes: number[]): StrategyResult {