[Feature] Added number of processed calls to Modbus Status

Author: volkmarnissen

cypress/fixtures/slave.json

@@ -5,5 +5,9 @@
   "pollInterval": 500,
   "pollMode": 1,
   "rootTopic": "heatpump",
-  "modbusErrorsForSlave": []
+  "modbusStatusForSlave": {
+    "errors": [],
+    "requestCount": [0, 1, 2, 3, 4, 5, 6, 7],
+    "queueLength": 23
+  }
 }

cypress/fixtures/slaves.json

@@ -6,6 +6,10 @@
     "pollInterval": 500,
     "pollMode": 1,
     "rootTopic": "heatpump",
-    "modbusErrorsForSlave": []
+    "modbusStatusForSlave": {
+      "errors": [],
+      "requestCount": [0, 1, 2, 3, 4, 5, 6, 7],
+      "queueLength": 23
+    }
   }
 ]

cypress/modbus-error.cy.ts

@@ -10,17 +10,22 @@ import { ModbusErrorComponent } from "angular/src/app/modbus-error/modbus-error.
 import {
   Iconfiguration,
   ImodbusErrorsForSlave,
+  ImodbusStatusForSlave,
   ModbusErrorStates,
   ModbusTasks,
 } from "@modbus2mqtt/server.shared";
 import { ModbusRegisterType } from "@modbus2mqtt/specification.shared";
 
 let date = Date.now();
-let modbusErrors: ImodbusErrorsForSlave = {
-  task: ModbusTasks.deviceDetection,
+let modbusErrors: ImodbusStatusForSlave = {
+  errors: [{
+  task: ModbusTasks.specification,
   date: date,
   address: { address: 1, registerType: ModbusRegisterType.HoldingRegister },
   state: ModbusErrorStates.crc,
+}],
+requestCount: [0,1,2,3,4,5,6,7],
+queueLength: 23
 };
 function mount(currentDate: number) {
   // This configures the rootUrl for /api... calls
@@ -33,7 +38,7 @@ function mount(currentDate: number) {
     providers: [provideHttpClient(withInterceptorsFromDi()), provideRouter([])],
     autoDetectChanges: true,
     componentProperties: {
-      modbusErrors: [modbusErrors],
+      modbusErrors: modbusErrors,
       currentDate: date + 30 * 1000,
     },
   });
@@ -48,7 +53,7 @@ function mount(currentDate: number) {
     providers: [provideHttpClient(withInterceptorsFromDi()), provideRouter([])],
     autoDetectChanges: true,
     componentProperties: {
-      modbusErrors: [modbusErrors],
+      modbusErrors: modbusErrors,
       currentDate: currentDate,
     },
   });

src/app/modbus-error/modbus-error.component.html

@@ -1,18 +1,21 @@
 <div>
+   <div>
+      Number of entries in the queue: {{modbusErrors?modbusErrors.queueLength:""}}
+   </div>
    <ng-container *ngFor="let task of tasksToLog">
-      <div class="icon-text">
-         <mat-icon [class]="filterNewerThan(filterTask( modbusErrors, task), getMinAgo(60)).length > 0  ? 'red':'green'">circle</mat-icon>
-         <span>Task: {{ getTaskName(task)}}</span>
+      <div class="icon-text" >
+         <mat-icon [class]="filterNewerThan(filterTask( modbusErrors.errors, task), getMinAgo(60)).length > 0  ? 'red':'green'">circle</mat-icon>
+         <span>Task: {{ getTaskName(task)}} ({{modbusErrors.requestCount[task] }} processed calls) </span>
       </div>
-         <div class="indent"  *ngFor="let state of getErrorStates( filterNewerThan(filterTask( modbusErrors, task), getMinAgo(60) ))" >
+         <div class="indent"  *ngFor="let state of getErrorStates( filterNewerThan(filterTask( modbusErrors.errors, task), getMinAgo(60) ))" >
             <div>{{ getErrorStateName(state)}}
             </div>
             <ng-container
                [ngTemplateOutlet]="errorStates" 
-               [ngTemplateOutletContext]="{stateErrors:filterNewerThan(filterErrorState( filterTask( modbusErrors, task), state), getMinAgo(60))}"/>
+               [ngTemplateOutletContext]="{stateErrors:filterNewerThan(filterErrorState( filterTask( modbusErrors.errors, task), state), getMinAgo(60)) }"/>
          </div>
    </ng-container>
-   <ng-template #errorStates let-stateErrors='stateErrors'>
+   <ng-template #errorStates let-stateErrors='stateErrors' >
       <ng-container
       [ngTemplateOutlet]="errors" 
       [ngTemplateOutletContext]="{errorlist:filterLast(stateErrors), timeHeader: 'Last', timeSince: true}"/>
@@ -23,7 +26,7 @@
       [ngTemplateOutlet]="errors" 
       [ngTemplateOutletContext]="{errorlist:filterNewerThan(stateErrors, getMinAgo(60)), timeHeader: '1 hour', timeSince: false}"/>
    </ng-template>
-   <ng-template #errors let-errorlist='errorlist' let-timeHeader='timeHeader' let-timeSince="timeSince">
+   <ng-template #errors let-errorlist='errorlist' let-timeHeader='timeHeader' let-timeSince="timeSince" let-task="task">
       <mat-expansion-panel >
       <mat-expansion-panel-header>
         <mat-panel-title> {{timeHeader}}</mat-panel-title>

src/app/modbus-error/modbus-error.component.ts

@@ -18,6 +18,7 @@ import { MatTooltip } from "@angular/material/tooltip";
 import {
   Iconfiguration,
   ImodbusErrorsForSlave,
+  ImodbusStatusForSlave,
   ModbusErrorStates,
   ModbusTasks,
 } from "@modbus2mqtt/server.shared";
@@ -38,14 +39,17 @@ const oneMinuteInMs = 60 * 1000;
 })
 export class ModbusErrorComponent implements OnInit {
   config: Iconfiguration;
-  @Input({ required: true }) modbusErrors: ImodbusErrorsForSlave[] | undefined;
+  @Input({ required: true }) modbusErrors: ImodbusStatusForSlave | undefined;
   @Input({ required: false }) currentDate: number | undefined = undefined;
 
+  tasksToCount : ModbusTasks[] = [
+    ModbusTasks.poll,
+    ModbusTasks.specification
+  ]
+  
   tasksToLog: ModbusTasks[] = [
     ModbusTasks.poll,
-    ModbusTasks.specification,
-    ModbusTasks.deviceDetection,
-    ModbusTasks.initialConnect,
+    ModbusTasks.specification
   ];
   constructor(private entityApiService: ApiService) {}
   ngOnInit(): void {
@@ -169,7 +173,7 @@ export class ModbusErrorComponent implements OnInit {
       address: { address: -1, registerType: ModbusRegisterType.AnalogInputs },
       task: ModbusTasks.initialConnect,
       state: ModbusErrorStates.noerror,
-      date: 0,
+      date: 0
     };
     if (inValue != undefined)
       inValue.forEach((v) => {

src/app/select-slave/select-slave.component.ts

@@ -51,6 +51,7 @@ import {
   IEntityCommandTopics,
   ImodbusErrorsForSlave,
   apiUri,
+  ImodbusStatusForSlave,
 } from "@modbus2mqtt/server.shared";
 import { MatInput } from "@angular/material/input";
 import {
@@ -194,6 +195,7 @@ export class SelectSlaveComponent extends SessionStorage implements OnInit {
 
   private updateSlaves(detectSpec?: boolean) {
     this.entityApiService.getSlaves(this.bus.busId).subscribe((slaves) => {
+      console.log(JSON.stringify(slaves))
       this.uiSlaves = [];
       slaves.forEach((s) => {
         this.uiSlaves.push(this.getUiSlave(s, detectSpec));
@@ -777,7 +779,9 @@ export class SelectSlaveComponent extends SessionStorage implements OnInit {
       uiSlave.slaveForm.get("discoverEntitiesList")!.enable();
     else uiSlave.slaveForm.get("discoverEntitiesList")!.disable();
   }
-  getModbusErrors(uiSlave: IuiSlave): ImodbusErrorsForSlave[] | undefined {
-    return uiSlave.slave.modbusErrorsForSlave;
+  getModbusErrors(uiSlave: IuiSlave): ImodbusStatusForSlave | undefined {
+    if( !uiSlave|| ! uiSlave.slave || ! uiSlave.slave.modbusStatusForSlave)
+      return { requestCount:[0,0,0,0,0,0,0,0,0], errors: [], queueLength:0}
+    return uiSlave.slave.modbusStatusForSlave;
   }
 }