support faulted

shiv3 · Jul 7, 2024 · 6442e67 · 6442e67
1 parent facc0b0
commit 6442e67
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/src/components/Connector.tsx b/src/components/Connector.tsx
@@ -1,13 +1,13 @@
-import React, { useState, useEffect } from "react";
-import { ChargePoint } from "../cp/ChargePoint.ts";
+import React, {useState, useEffect} from "react";
+import {ChargePoint} from "../cp/ChargePoint.ts";
 import * as ocpp from "../cp/OcppTypes";
 
 interface ConnectorProps {
   id: number;
   cp: ChargePoint | null;
 }
 
-const Connector: React.FC<ConnectorProps> = ({ id: connector_id, cp }) => {
+const Connector: React.FC<ConnectorProps> = ({id: connector_id, cp}) => {
   const [cpTransactionID, setCpTransactionID] = useState<number | null>(0);
   const [connectorStatus, setConnectorStatus] = useState<ocpp.OCPPStatus>(
     ocpp.OCPPStatus.Unavailable
@@ -16,7 +16,7 @@ const Connector: React.FC<ConnectorProps> = ({ id: connector_id, cp }) => {
     ocpp.OCPPAvailability.Operative
   );
   const [meterValue, setMeterValue] = useState<number>(0);
-  const [idTag] = useState<string>(localStorage.getItem("TAG") || "DEADBEEF");
+  const [idTag, setIdTag] = useState<string>(localStorage.getItem("TAG") || "DEADBEEF");
 
   useEffect(() => {
     if (cp) {
@@ -72,7 +72,7 @@ const Connector: React.FC<ConnectorProps> = ({ id: connector_id, cp }) => {
             <label className="text-gray-700 text-sm font-bold mb-2">
               Connector Status:{" "}
             </label>
-            <ConnectorStatus status={connectorStatus} />
+            <ConnectorStatus status={connectorStatus}/>
           </div>
           {connectorStatus === ocpp.OCPPStatus.Charging && (
             <div className="mb-6">
@@ -89,7 +89,7 @@ const Connector: React.FC<ConnectorProps> = ({ id: connector_id, cp }) => {
             onChange={(e) =>
               setConnectorStatus(e.target.value as ocpp.OCPPStatus)
             }
-            style={{ maxWidth: "16ch", marginRight: "1ch" }}
+            style={{maxWidth: "16ch", marginRight: "1ch"}}
           >
             {Object.keys(ocpp.OCPPStatus).map((status) =>
               status === ocpp.OCPPStatus.Charging ? null : (
@@ -117,7 +117,7 @@ const Connector: React.FC<ConnectorProps> = ({ id: connector_id, cp }) => {
               >
                 Connector Availability:
               </label>
-              <ConnectorAvailability availability={availability} />
+              <ConnectorAvailability availability={availability}/>
               {/*<select
                 <select
                   id={`AVAILABILITY_CON${connector_id}`}
@@ -133,6 +133,21 @@ const Connector: React.FC<ConnectorProps> = ({ id: connector_id, cp }) => {
             </div>
           </div>
         </div>
+        <div className="form-group bg-gray-100 rounded p-4">
+          <div className="mb-1">
+            <label className="text-gray-700 text-sm font-bold mb-2">
+              RFID Tag
+            </label>
+            <input
+              className="shadow appearance-none border rounded w-full py-1 px-1 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
+              type="text"
+              value={idTag}
+              onChange={(e) => setIdTag(e.target.value)}
+              placeholder="DEADBEEF"
+              style={{maxWidth: "20ch"}}
+            />
+          </div>
+        </div>
         <button
           onClick={handleStartTransaction}
           className="bg-yellow-500 hover:bg-yellow-700 text-white font-bold py-2 px-4 rounded mb-2 w-full
@@ -189,7 +204,7 @@ const Connector: React.FC<ConnectorProps> = ({ id: connector_id, cp }) => {
   );
 };
 
-const ConnectorStatus: React.FC<{ status: string }> = ({ status }) => {
+const ConnectorStatus: React.FC<{ status: string }> = ({status}) => {
   const statusColor = (s: string) => {
     switch (s) {
       case ocpp.OCPPStatus.Unavailable:
@@ -211,8 +226,8 @@ const ConnectorStatus: React.FC<{ status: string }> = ({ status }) => {
 };
 
 const ConnectorAvailability: React.FC<{ availability: string }> = ({
-  availability,
-}) => {
+                                                                     availability,
+                                                                   }) => {
   const availabilityColor = (a: string) => {
     switch (a) {
       case ocpp.OCPPAvailability.Operative:

diff --git a/src/cp/OCPPMessageHandler.ts b/src/cp/OCPPMessageHandler.ts
@@ -427,14 +427,17 @@ export class OCPPMessageHandler {
     payload: StartTransactionResponse
   ): void {
     const { transactionId, idTagInfo } = payload;
+    const connector = this._chargePoint.getConnector(connectorId);
     if (idTagInfo.status === "Accepted") {
-      const connector = this._chargePoint.getConnector(connectorId);
       if (connector) {
         connector.transactionId = transactionId;
         connector.status = OCPPStatus.Charging;
       }
     } else {
       this._logger.log("Failed to start transaction");
+      if (connector) {
+        connector.status = OCPPStatus.Faulted;
+      }
     }
   }