Skip to content

Commit

Permalink
Refactored tasks to separate files and replaced queues with global st…
Browse files Browse the repository at this point in the history
…ate variables
  • Loading branch information
morcibacsi committed Mar 20, 2021
1 parent 0145c6c commit 1d2a4a3
Show file tree
Hide file tree
Showing 44 changed files with 1,145 additions and 732 deletions.
2 changes: 2 additions & 0 deletions Config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ constexpr bool QUERY_PARKING_AID_DISTANCE = false;
//if true the VAN messages with CRC ERROR are logged
constexpr bool LOG_MSG_WITH_CRC_ERROR = true;

constexpr bool READ_SERIAL_PORT_FOR_COMMANDS = false;

constexpr uint8_t ENABLE_PARKING_AID_SOUND_FROM_SPEAKER = 0;

constexpr uint8_t TASK_WATCHDOG_TIMEOUT = 7;
Expand Down
14 changes: 13 additions & 1 deletion PSAVanCanBridge.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@
<ClInclude Include="Config.h" />
<ClInclude Include="PSAVanCanBridgeMain.h" />
<ClInclude Include="src\Can\AbstractCanMessageSender.h" />
<ClInclude Include="src\Can\CanDataReaderTask.h" />
<ClInclude Include="src\Can\CanDataSenderTask.h" />
<ClInclude Include="src\Can\CanIgnitionTask.h" />
<ClInclude Include="src\Can\CanMessageHandlerContainer.h" />
<ClInclude Include="src\Can\CanMessageSender.h" />
<ClInclude Include="src\Can\CanMessageSenderEsp32Arduino.h" />
Expand Down Expand Up @@ -174,15 +177,20 @@
<ClInclude Include="src\Helpers\CanDisplayPopupItem.h" />
<ClInclude Include="src\Helpers\DashIcons1.h" />
<ClInclude Include="src\Helpers\DoorStatus.h" />
<ClInclude Include="src\Helpers\GetDeviceInfoEsp32.h" />
<ClInclude Include="src\Helpers\IGetDeviceInfo.h" />
<ClInclude Include="src\Helpers\IntegRadioHelper.h" />
<ClInclude Include="src\Helpers\IVinFlashStorage.h" />
<ClInclude Include="src\Helpers\LightStatus.h" />
<ClInclude Include="src\Helpers\PacketGenerator.h" />
<ClInclude Include="src\Helpers\Serializer.h" />
<ClInclude Include="src\Helpers\SerialReader.h" />
<ClInclude Include="src\Helpers\VanCanAirConditionerSpeedMap.h" />
<ClInclude Include="src\Helpers\VanCanDisplayPopupMap.h" />
<ClInclude Include="src\Helpers\VanDataToBridgeToCan.h" />
<ClInclude Include="src\Helpers\VanIgnitionDataToBridgeToCan.h" />
<ClInclude Include="src\Helpers\VinFlashStorage.h" />
<ClInclude Include="src\Helpers\VanVinToBridgeToCan.h" />
<ClInclude Include="src\Helpers\VinFlashStorageEsp32.h" />
<ClInclude Include="src\SerialPort\AbstractSerial.h" />
<ClInclude Include="src\SerialPort\BluetoothSerialAbs.h" />
<ClInclude Include="src\SerialPort\HardwareSerialAbs.h" />
Expand All @@ -205,6 +213,7 @@
<ClInclude Include="src\Van\Handlers\VanPositionForRt3Handler.h" />
<ClInclude Include="src\Van\Handlers\VanRadioRemoteHandler.h" />
<ClInclude Include="src\Van\Handlers\VanSpeedAndRpmHandler.h" />
<ClInclude Include="src\Van\IVanMessageReader.h" />
<ClInclude Include="src\Van\Structs\VanAirConditioner1Structs.h" />
<ClInclude Include="src\Van\Structs\VanAirConditioner2Structs.h" />
<ClInclude Include="src\Van\Structs\VanAirConditionerDiagStructs.h" />
Expand All @@ -226,9 +235,12 @@
<ClInclude Include="src\Van\Structs\VanRadioTunerStructs.h" />
<ClInclude Include="src\Van\Structs\VanSpeedAndRpmStructs.h" />
<ClInclude Include="src\Van\Structs\VanVinStructs.h" />
<ClInclude Include="src\Van\VanDataParserTask.h" />
<ClInclude Include="src\Van\VanHandlerContainer.h" />
<ClInclude Include="src\Van\VanMessageReaderEsp32Rmt.h" />
<ClInclude Include="src\Van\VanMessageSender.h" />
<ClInclude Include="src\Van\VanWriterContainer.h" />
<ClInclude Include="src\Van\VanWriterTask.h" />
<ClInclude Include="src\Van\Writers\VanDisplayStatus.h" />
<ClInclude Include="src\Van\Writers\VanMessageWriterBase.h" />
<ClInclude Include="src\Van\Writers\VanQueryAirCon.h" />
Expand Down
42 changes: 39 additions & 3 deletions PSAVanCanBridge.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,6 @@
<ClInclude Include="src\Can\Handlers\AbstractCanMessageHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Helpers\VinFlashStorage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Van\Writers\VanDisplayStatus.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -397,6 +394,45 @@
<ClInclude Include="src\Van\Handlers\VanBsiEventsHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Helpers\GetDeviceInfoEsp32.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Helpers\IGetDeviceInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Helpers\SerialReader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Helpers\IVinFlashStorage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Helpers\VanVinToBridgeToCan.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Helpers\VinFlashStorageEsp32.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Can\CanIgnitionTask.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Can\CanDataSenderTask.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Can\CanDataReaderTask.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Van\IVanMessageReader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Van\VanDataParserTask.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Van\VanMessageReaderEsp32Rmt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Van\VanWriterTask.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\SerialPort\BluetoothSerialAbs.cpp">
Expand Down
Loading

0 comments on commit 1d2a4a3

Please sign in to comment.