diff --git a/VideoCamModule/CameraLightTurnsSupplyController.cpp b/VideoCamModule/CameraLightTurnsSupplyController.cpp index fcba8dd..3c2c0d1 100644 --- a/VideoCamModule/CameraLightTurnsSupplyController.cpp +++ b/VideoCamModule/CameraLightTurnsSupplyController.cpp @@ -5,7 +5,7 @@ #include const int TIMINGS_ADDR = 0; -const int CAUTION_BUTTON_DELAY = 450; +const int CAUTION_BUTTON_DELAY = 300; CameraLightTurnsSupplyController::CameraLightTurnsSupplyController() {} @@ -52,7 +52,6 @@ void CameraLightTurnsSupplyController::updateTimings(Timings newTimings) { void CameraLightTurnsSupplyController::executeCommand(CommunicationUnit::ControlCommandSet command) { if (cautionIsPressed != command.cautionIsOn)pushCautionButton(); - digitalWrite(outLeftFogLight, command.leftFogIsOn); digitalWrite(outRightFogLight, command.rightFogIsOn); digitalWrite(outRelayCameraSwitch, command.relayIsOn); @@ -61,6 +60,7 @@ CameraLightTurnsSupplyController::executeCommand(CommunicationUnit::ControlComma digitalWrite(outDisplayOn, command.displayIsOn); setCameraState(command.cameraState); sendCurrentState(); + if (command.leftAngelEyeIsOn)fogTintIsWhite=true; // temp for POC } void CameraLightTurnsSupplyController::sendUpTimings() { @@ -74,7 +74,7 @@ void CameraLightTurnsSupplyController::sendCurrentState() { rightTurnLever.isOn(), rightTurnLever.isDoubleClicked(), reverseGear.isOn(), - digitalRead(outCautionSignal), + cautionIsPressed, digitalRead(outLeftFogLight), digitalRead(outRightFogLight), digitalRead(outRelayCameraSwitch), @@ -179,14 +179,26 @@ void CameraLightTurnsSupplyController::turnFogLightOn() { if (leftTurnLever.isOn()) { digitalWrite(outLeftFogLight, HIGH); digitalWrite(outRightFogLight, LOW); + if(fogTintIsWhite){ + digitalWrite(outAngelEyeLeft, HIGH); + digitalWrite(outAngelEyeRight, LOW); + } newFogsState = LEFT_ON; } else if (rightTurnLever.isOn()) { - digitalWrite(outRightFogLight, HIGH); - digitalWrite(outLeftFogLight, LOW); + digitalWrite(outLeftFogLight, LOW); + digitalWrite(outRightFogLight, HIGH); + if(fogTintIsWhite){ + digitalWrite(outAngelEyeLeft, LOW); + digitalWrite(outAngelEyeRight, HIGH); + } newFogsState = RIGHT_ON; } else { digitalWrite(outLeftFogLight, HIGH); digitalWrite(outRightFogLight, HIGH); + if(fogTintIsWhite){ + digitalWrite(outAngelEyeLeft, HIGH); + digitalWrite(outAngelEyeRight, HIGH); + } newFogsState = BOTH_ON; } if (newFogsState != fogLightsState) { @@ -198,6 +210,10 @@ void CameraLightTurnsSupplyController::turnFogLightOn() { void CameraLightTurnsSupplyController::turnOffFogLight() { digitalWrite(outLeftFogLight, LOW); digitalWrite(outRightFogLight, LOW); + if(fogTintIsWhite){ + digitalWrite(outAngelEyeLeft, LOW); + digitalWrite(outAngelEyeRight, LOW); + } isChangedFlag = true; } @@ -238,4 +254,4 @@ void CameraLightTurnsSupplyController::getTimingsFromStorage() { void CameraLightTurnsSupplyController::putTimingsToStorage() { timings.crc = utils::crc8((byte * ) & timings, sizeof(timings)); EEPROM.put(TIMINGS_ADDR, timings); -} \ No newline at end of file +} diff --git a/VideoCamModule/CameraLightTurnsSupplyController.h b/VideoCamModule/CameraLightTurnsSupplyController.h index 5927e43..af07417 100644 --- a/VideoCamModule/CameraLightTurnsSupplyController.h +++ b/VideoCamModule/CameraLightTurnsSupplyController.h @@ -54,6 +54,7 @@ class CameraLightTurnsSupplyController : public ControllerForCommUnitInterface { } fogLightsState = ALL_OFF; bool cautionIsPressed = false; long cautionIsTimeStamp = 0; + bool fogTintIsWhite=false;// temp for POC //input gears Lever reverseGear; Lever leftTurnLever; @@ -87,4 +88,4 @@ class CameraLightTurnsSupplyController : public ControllerForCommUnitInterface { void putTimingsToStorage(); }; -#endif \ No newline at end of file +#endif