diff --git a/backend/core/src/scheduler.cpp b/backend/core/src/scheduler.cpp index 8394f901..06b0b386 100644 --- a/backend/core/src/scheduler.cpp +++ b/backend/core/src/scheduler.cpp @@ -413,7 +413,6 @@ void Scheduler::handleRequest(string key, json::value value, string username, js Unit* unit = unitsManager->getGroupLeader(ID); if (unit != nullptr) { unsigned char alarmState = value[L"alarmState"].as_integer(); - log(username + " is trying to set unit " + unit->getUnitName() + "(" + unit->getName() + ") alarm state to " + to_string(alarmState), true); unit->commandAlarmState(alarmState); log(username + " set unit " + unit->getUnitName() + "(" + unit->getName() + ") alarm state to " + to_string(alarmState), true); } else { diff --git a/backend/core/src/unit.cpp b/backend/core/src/unit.cpp index 5b2d0738..f3c8b61f 100644 --- a/backend/core/src/unit.cpp +++ b/backend/core/src/unit.cpp @@ -84,7 +84,6 @@ void Unit::update(json::value json, double dt) setAlive(json[L"isAlive"].as_bool()); if (json.has_string_field(L"alarmState")) { - // log("Unit " + to_string(json[L"unitName"]) + " has alarmState: " + to_string(json[L"alarmState"])); setAlarmState(to_string(json[L"alarmState"])); } diff --git a/frontend/react/src/server/servermanager.ts b/frontend/react/src/server/servermanager.ts index 1a19d1f9..83c03a2c 100644 --- a/frontend/react/src/server/servermanager.ts +++ b/frontend/react/src/server/servermanager.ts @@ -626,8 +626,6 @@ export class ServerManager { loadEnvResources() { /* Load the drawings */ this.getDrawings((drawingsData: { drawings: Record> }) => { - console.log('---- drawings: ', drawingsData); - if (drawingsData) { getApp().getDrawingsManager()?.initDrawings(drawingsData); } diff --git a/scripts/lua/backend/OlympusCommand.lua b/scripts/lua/backend/OlympusCommand.lua index 6d4bd993..1395f2c1 100644 --- a/scripts/lua/backend/OlympusCommand.lua +++ b/scripts/lua/backend/OlympusCommand.lua @@ -1077,27 +1077,6 @@ function Olympus.setOnOff(groupName, onOff) end end --- Disable the AI of a group on or off entirely -function Olympus.setRedGreenAuto(groupName, redGreenAuto) - Olympus.debug("Olympus.setRedGreenAuto " .. groupName .. " " .. tostring(redGreenAuto), 2) - local group = Group.getByName(groupName) - if group ~= nil then - - if redGreenAuto == 'RED' then - group:getController():setOption(AI.Option.Ground.id.ALARM_STATE, AI.Option.Ground.val.ALARM_STATE.RED) - end - - if redGreenAuto == 'GREEN' then - group:getController():setOption(AI.Option.Ground.id.ALARM_STATE, AI.Option.Ground.val.ALARM_STATE.GREEN) - end - - if redGreenAuto == 'AUTO' then - group:getController():setOption(AI.Option.Ground.id.ALARM_STATE, AI.Option.Ground.val.ALARM_STATE.AUTO) - end - Olympus.debug("Olympus.setRedGreenAuto completed successfully", 2) - end -end - function getUnitDescription(unit) return unit:getDescr() end