diff --git a/.env.development b/.env.development index f3eb587..0fb4329 100644 --- a/.env.development +++ b/.env.development @@ -6,5 +6,5 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false NEXT_PUBLIC_EXPORT_STATIC=false NEXT_PUBLIC_USE_CGI=false # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.420 +NEXT_PUBLIC_APP_VERSION=1.6.421 NEXT_PUBLIC_CPL_MODE=jsmock # json (Entwicklungsumgebung) oder jsmock (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter) \ No newline at end of file diff --git a/.env.production b/.env.production index 06f5b26..ad23f8a 100644 --- a/.env.production +++ b/.env.production @@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL NEXT_PUBLIC_EXPORT_STATIC=true NEXT_PUBLIC_USE_CGI=true # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.420 +NEXT_PUBLIC_APP_VERSION=1.6.421 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/components/main/analogInputs/AnalogInputsTable.tsx b/components/main/analogInputs/AnalogInputsTable.tsx index d173604..a3afc23 100644 --- a/components/main/analogInputs/AnalogInputsTable.tsx +++ b/components/main/analogInputs/AnalogInputsTable.tsx @@ -24,7 +24,7 @@ export default function AnalogInputsTable({ }, [dispatch]); const analogInputs = useSelector( - (state: RootState) => state.analogeInputsSlice + (state: RootState) => state.analogInputs ?? [] ); const handleSelect = (id: number) => { diff --git a/mocks/device-cgi-simulator/SERVICE/analogInputsMockData.js b/mocks/device-cgi-simulator/SERVICE/analogInputsMockData.js index 6f6222b..1cda64a 100644 --- a/mocks/device-cgi-simulator/SERVICE/analogInputsMockData.js +++ b/mocks/device-cgi-simulator/SERVICE/analogInputsMockData.js @@ -2,10 +2,10 @@ var win_analogInputsValues = [ 4.771072, 5.665244, 0.005467, -0.007468, 0.000002, 0.000001, 0.000001, - 0.000007, + 0.070007, ]; var win_analogInputsNames = [ - "AE1", + "AE 1", "AE 2", "AE 3", "AE 4", diff --git a/package-lock.json b/package-lock.json index 5a17886..2bb5ba1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.420", + "version": "1.6.421", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.420", + "version": "1.6.421", "dependencies": { "@fontsource/roboto": "^5.1.0", "@iconify-icons/ri": "^1.2.10", diff --git a/package.json b/package.json index 10e8dc2..9a8de23 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.420", + "version": "1.6.421", "private": true, "scripts": { "dev": "next dev", diff --git a/pages/api/cpl/getAnalogInputsHandler.ts b/pages/api/cpl/getAnalogInputsHandler.ts index f6d66f4..04cac69 100644 --- a/pages/api/cpl/getAnalogInputsHandler.ts +++ b/pages/api/cpl/getAnalogInputsHandler.ts @@ -56,6 +56,13 @@ export default async function handler( ), }; + // Begrenzung auf maximal 8 Elemente je Array + Object.keys(result).forEach((key) => { + if (Array.isArray(result[key])) { + result[key] = result[key].slice(0, 8); + } + }); + return res.status(200).json(result); } diff --git a/redux/store.ts b/redux/store.ts index 773bbc5..71a67e8 100644 --- a/redux/store.ts +++ b/redux/store.ts @@ -11,7 +11,7 @@ import opcuaSettingsReducer from "./slices/opcuaSettingsSlice"; import digitalOutputsReducer from "./slices/digitalOutputsSlice"; import brushReducer from "./slices/brushSlice"; import tdrChartReducer from "./slices/tdrChartSlice"; -import analogInputsReducer from "./slices/analogInputsSlice"; +import analogInputsSlice from "./slices/analogInputsSlice"; import digitalInputsReducer from "./slices/digitalInputsSlice"; import tdrReferenceChartReducer from "./slices/tdrReferenceChartSlice"; import loopChartReducer from "./slices/loopChartSlice"; @@ -36,7 +36,7 @@ const store = configureStore({ systemSettingsSlice: systemSettingsReducer, opcuaSettingsSlice: opcuaSettingsReducer, digitalOutputsSlice: digitalOutputsReducer, - analogeInputsSlice: analogInputsReducer, + analogInputs: analogInputsSlice, brushSlice: brushReducer, tdrChartSlice: tdrChartReducer, tdrReferenceChartSlice: tdrReferenceChartReducer,