From 9dd42cba6f893f7af617d53d9fe4fe1a7a9d51f7 Mon Sep 17 00:00:00 2001 From: Roman Lumetsberger Date: Sun, 7 May 2017 09:25:57 +0200 Subject: [PATCH] Moved common parts into ODB.NET.Common re-factored SerialConnection to ISerialConnection interface and removed stuff which is not compatible with NetStandard --- .../Commands/ATCommand.cs | 0 .../Commands/STCommand.cs | 0 .../Communication/SerialConnection.cs | 40 ++++ .../DataTypes/Count.cs | 0 .../DataTypes/Degree.cs | 0 .../DataTypes/DegreeCelsius.cs | 0 .../DataTypes/GenericData.cs | 0 .../DataTypes/GramPerSec.cs | 0 .../DataTypes/Kilometre.cs | 0 .../DataTypes/KilometrePerHour.cs | 0 .../DataTypes/Kilopascal.cs | 0 .../DataTypes/LitresPerHour.cs | 0 .../DataTypes/Milliampere.cs | 0 .../DataTypes/Minute.cs | 0 .../DataTypes/NewtonMetre.cs | 0 .../DataTypes/Pascal.cs | 0 .../DataTypes/Percent.cs | 0 .../DataTypes/Ratio.cs | 0 .../DataTypes/RevolutionsPerMinute.cs | 0 .../DataTypes/Second.cs | 0 .../DataTypes/Volt.cs | 0 .../Devices/ELM327.cs | 2 +- .../Devices/STN1170.cs | 2 +- .../Devices/SerialDevice.cs | 4 +- .../{OBD.NET => OBD.NET.Common}/Enums/Mode.cs | 0 .../Events/EventArgs/DataReceivedEventArgs.cs | 0 .../EventArgs/RawDataReceivedEventArgs.cs | 0 .../Events/GenericDataEventManager.cs | 0 .../Events/IDataEventManager.cs | 0 .../Exceptions/SerialException.cs | 6 +- .../Exceptions/UnexpectedResultException.cs | 9 +- .../Extensions/HexExtension.cs | 0 .../Logging/IOBDLogger.cs | 0 .../Logging/OBDLogLevel.cs | 0 OBD.NET/OBD.NET.Common/OBD.NET.Common.csproj | 20 ++ .../OBDData/00-1F/AuxiliaryInputStatus.cs | 0 .../OBDData/00-1F/CalculatedEngineLoad.cs | 0 .../00-1F/CommandedSecondaryAirStatus.cs | 0 .../OBDData/00-1F/EngineCoolantTemperature.cs | 0 .../OBDData/00-1F/EngineRPM.cs | 0 .../OBDData/00-1F/FuelPressure.cs | 0 .../OBDData/00-1F/FuelSystemStatus.cs | 0 .../OBDData/00-1F/IntakeAirTemperature.cs | 0 .../00-1F/IntakeManifoldAbsolutePressure.cs | 0 .../OBDData/00-1F/LongTermFuelTrimBank1.cs | 0 .../OBDData/00-1F/LongTermFuelTrimBank2.cs | 0 .../OBDData/00-1F/MAFAirFlowRate.cs | 0 .../OBDData/00-1F/OBDStandards.cs | 0 .../OBDData/00-1F/OxygenSensor1FuelTrim.cs | 0 .../OBDData/00-1F/OxygenSensor2FuelTrim.cs | 0 .../OBDData/00-1F/OxygenSensor3FuelTrim.cs | 0 .../OBDData/00-1F/OxygenSensor4FuelTrim.cs | 0 .../OBDData/00-1F/OxygenSensor5FuelTrim.cs | 0 .../OBDData/00-1F/OxygenSensor6FuelTrim.cs | 0 .../OBDData/00-1F/OxygenSensor7FuelTrim.cs | 0 .../OBDData/00-1F/OxygenSensor8FuelTrim.cs | 0 .../OBDData/00-1F/OxygenSensorPresent.cs | 0 .../OBDData/00-1F/OxygenSensorsPresent2.cs | 0 .../OBDData/00-1F/PidsSupported01_20.cs | 0 .../OBDData/00-1F/RunTimeSinceEngineStart.cs | 0 .../OBDData/00-1F/ShortTermFuelTrimBank1.cs | 0 .../OBDData/00-1F/ShortTermFuelTrimBank2.cs | 0 .../OBDData/00-1F/ThrottlePosition.cs | 0 .../OBDData/00-1F/TimingAdvance.cs | 0 .../OBDData/00-1F/VehicleSpeed.cs | 0 .../20-3F/AbsoluteBarometricPressure.cs | 0 .../20-3F/CatalystTemperatureBank1Sensor1.cs | 0 .../20-3F/CatalystTemperatureBank1Sensor2.cs | 0 .../20-3F/CatalystTemperatureBank2Sensor1.cs | 0 .../20-3F/CatalystTemperatureBank2Sensor2.cs | 0 .../OBDData/20-3F/CommandedEGR.cs | 0 .../20-3F/CommandedEvaporativePurge.cs | 0 .../DistanceTraveledSinceCodesCleared.cs | 0 .../20-3F/DistanceTraveledWithMILOn.cs | 0 .../OBDData/20-3F/EGRError.cs | 0 .../OBDData/20-3F/EvapSystemVaporPressure.cs | 0 .../OBDData/20-3F/FuelRailGaugePressure.cs | 0 .../OBDData/20-3F/FuelRailPressure.cs | 0 .../OBDData/20-3F/FuelTankLevelInput.cs | 0 .../OBDData/20-3F/OxygenSensor1FuelAir.cs | 0 .../OBDData/20-3F/OxygenSensor1FuelAir2.cs | 0 .../OBDData/20-3F/OxygenSensor2FuelAir.cs | 0 .../OBDData/20-3F/OxygenSensor2FuelAir2.cs | 0 .../OBDData/20-3F/OxygenSensor3FuelAir.cs | 0 .../OBDData/20-3F/OxygenSensor3FuelAir2.cs | 0 .../OBDData/20-3F/OxygenSensor4FuelAir.cs | 0 .../OBDData/20-3F/OxygenSensor4FuelAir2.cs | 0 .../OBDData/20-3F/OxygenSensor5FuelAir.cs | 0 .../OBDData/20-3F/OxygenSensor5FuelAir2.cs | 0 .../OBDData/20-3F/OxygenSensor6FuelAir.cs | 0 .../OBDData/20-3F/OxygenSensor6FuelAir2.cs | 0 .../OBDData/20-3F/OxygenSensor7FuelAir.cs | 0 .../OBDData/20-3F/OxygenSensor7FuelAir2.cs | 0 .../OBDData/20-3F/OxygenSensor8FuelAir.cs | 0 .../OBDData/20-3F/OxygenSensor8FuelAir2.cs | 0 .../OBDData/20-3F/PidsSupported21_40.cs | 0 .../OBDData/20-3F/WarmUpsSinceCodesCleared.cs | 0 .../40-5F/AbsoluteEvapSystemVaporPressure.cs | 0 .../OBDData/40-5F/AbsoluteLoadValue.cs | 0 .../40-5F/AbsoluteThrottlePositionB.cs | 0 .../40-5F/AbsoluteThrottlePositionC.cs | 0 .../40-5F/AcceleratorPedalPositionD.cs | 0 .../40-5F/AcceleratorPedalPositionE.cs | 0 .../40-5F/AcceleratorPedalPositionF.cs | 0 .../OBDData/40-5F/AmbientAirTemperature.cs | 0 .../40-5F/CommandedThrottleActuator.cs | 0 .../OBDData/40-5F/ControlModuleVoltage.cs | 0 .../OBDData/40-5F/EngineFuelRate.cs | 0 .../OBDData/40-5F/EngineOilTemperature.cs | 0 .../OBDData/40-5F/EthanolFuel.cs | 0 .../OBDData/40-5F/EvapSystemVaporPressure2.cs | 0 .../40-5F/FuelAirCommandedEquivalenceRatio.cs | 0 .../OBDData/40-5F/FuelInjectionTiming.cs | 0 .../OBDData/40-5F/FuelRailAbsolutePressure.cs | 0 .../OBDData/40-5F/FuelType.cs | 0 .../40-5F/HybridBatteryPackRemainingLife.cs | 0 ...LongTermSecondaryOxygenSensorTrimBank13.cs | 0 ...LongTermSecondaryOxygenSensorTrimBank24.cs | 0 .../40-5F/MaximumValueForAirFlowRate.cs | 0 .../OBDData/40-5F/MaximumValues.cs | 0 .../40-5F/MonitorStatusThisDriveCycle.cs | 0 .../OBDData/40-5F/PidsSupported41_60.cs | 0 .../40-5F/RelativeAcceleratorPedalPosition.cs | 0 .../OBDData/40-5F/RelativeThrottlePosition.cs | 0 ...hortTermSecondaryOxygenSensorTrimBank13.cs | 0 ...hortTermSecondaryOxygenSensorTrimBank24.cs | 0 .../OBDData/40-5F/TimeRunWithMILOn.cs | 0 .../40-5F/TimeSinceTroubleCodesCleared.cs | 0 .../60-7F/ActualEnginePercentTorque.cs | 0 .../60-7F/DriversDemandEnginePercentTorque.cs | 0 .../OBDData/60-7F/EnginePercentTorqueData.cs | 0 .../OBDData/60-7F/EngineReferenceTorque.cs | 0 .../OBDData/60-7F/PidsSupported61_80.cs | 0 .../OBDData/80-9F/PidsSupported81_A0.cs | 0 .../OBDData/A0-BF/PidsSupportedA1_C0.cs | 0 .../OBDData/AbstractOBDData.cs | 0 .../OBDData/C0-DF/PidsSupportedC1_E0.cs | 0 .../OBDData/IOBDData.cs | 0 OBD.NET/OBD.NET.sln | 14 +- .../Communication/EnhancedSerialPort.cs | 163 --------------- .../OBD.NET/Communication/SerialConnection.cs | 108 ---------- OBD.NET/OBD.NET/OBD.NET.csproj | 197 ------------------ OBD.NET/OBD.NET/OBD.NET.csproj.DotSettings | 8 - OBD.NET/OBD.NET/Properties/AssemblyInfo.cs | 36 ---- 144 files changed, 73 insertions(+), 536 deletions(-) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Commands/ATCommand.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Commands/STCommand.cs (100%) create mode 100644 OBD.NET/OBD.NET.Common/Communication/SerialConnection.cs rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/Count.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/Degree.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/DegreeCelsius.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/GenericData.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/GramPerSec.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/Kilometre.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/KilometrePerHour.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/Kilopascal.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/LitresPerHour.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/Milliampere.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/Minute.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/NewtonMetre.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/Pascal.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/Percent.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/Ratio.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/RevolutionsPerMinute.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/Second.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/DataTypes/Volt.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Devices/ELM327.cs (98%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Devices/STN1170.cs (80%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Devices/SerialDevice.cs (93%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Enums/Mode.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Events/EventArgs/DataReceivedEventArgs.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Events/EventArgs/RawDataReceivedEventArgs.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Events/GenericDataEventManager.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Events/IDataEventManager.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Exceptions/SerialException.cs (71%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Exceptions/UnexpectedResultException.cs (78%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Extensions/HexExtension.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Logging/IOBDLogger.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/Logging/OBDLogLevel.cs (100%) create mode 100644 OBD.NET/OBD.NET.Common/OBD.NET.Common.csproj rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/AuxiliaryInputStatus.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/CalculatedEngineLoad.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/CommandedSecondaryAirStatus.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/EngineCoolantTemperature.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/EngineRPM.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/FuelPressure.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/FuelSystemStatus.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/IntakeAirTemperature.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/LongTermFuelTrimBank1.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/LongTermFuelTrimBank2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/MAFAirFlowRate.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/OBDStandards.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/OxygenSensor1FuelTrim.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/OxygenSensor2FuelTrim.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/OxygenSensor3FuelTrim.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/OxygenSensor4FuelTrim.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/OxygenSensor5FuelTrim.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/OxygenSensor6FuelTrim.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/OxygenSensor7FuelTrim.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/OxygenSensor8FuelTrim.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/OxygenSensorPresent.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/OxygenSensorsPresent2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/PidsSupported01_20.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/RunTimeSinceEngineStart.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/ShortTermFuelTrimBank1.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/ShortTermFuelTrimBank2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/ThrottlePosition.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/TimingAdvance.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/00-1F/VehicleSpeed.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/AbsoluteBarometricPressure.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/CommandedEGR.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/CommandedEvaporativePurge.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/DistanceTraveledWithMILOn.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/EGRError.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/EvapSystemVaporPressure.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/FuelRailGaugePressure.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/FuelRailPressure.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/FuelTankLevelInput.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor1FuelAir.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor1FuelAir2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor2FuelAir.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor2FuelAir2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor3FuelAir.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor3FuelAir2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor4FuelAir.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor4FuelAir2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor5FuelAir.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor5FuelAir2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor6FuelAir.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor6FuelAir2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor7FuelAir.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor7FuelAir2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor8FuelAir.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/OxygenSensor8FuelAir2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/PidsSupported21_40.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/20-3F/WarmUpsSinceCodesCleared.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/AbsoluteLoadValue.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/AbsoluteThrottlePositionB.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/AbsoluteThrottlePositionC.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/AcceleratorPedalPositionD.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/AcceleratorPedalPositionE.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/AcceleratorPedalPositionF.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/AmbientAirTemperature.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/CommandedThrottleActuator.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/ControlModuleVoltage.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/EngineFuelRate.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/EngineOilTemperature.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/EthanolFuel.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/EvapSystemVaporPressure2.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/FuelInjectionTiming.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/FuelRailAbsolutePressure.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/FuelType.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/HybridBatteryPackRemainingLife.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/MaximumValueForAirFlowRate.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/MaximumValues.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/MonitorStatusThisDriveCycle.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/PidsSupported41_60.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/RelativeThrottlePosition.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/TimeRunWithMILOn.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/60-7F/ActualEnginePercentTorque.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/60-7F/DriversDemandEnginePercentTorque.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/60-7F/EnginePercentTorqueData.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/60-7F/EngineReferenceTorque.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/60-7F/PidsSupported61_80.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/80-9F/PidsSupported81_A0.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/A0-BF/PidsSupportedA1_C0.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/AbstractOBDData.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/C0-DF/PidsSupportedC1_E0.cs (100%) rename OBD.NET/{OBD.NET => OBD.NET.Common}/OBDData/IOBDData.cs (100%) delete mode 100644 OBD.NET/OBD.NET/Communication/EnhancedSerialPort.cs delete mode 100644 OBD.NET/OBD.NET/Communication/SerialConnection.cs delete mode 100644 OBD.NET/OBD.NET/OBD.NET.csproj delete mode 100644 OBD.NET/OBD.NET/OBD.NET.csproj.DotSettings delete mode 100644 OBD.NET/OBD.NET/Properties/AssemblyInfo.cs diff --git a/OBD.NET/OBD.NET/Commands/ATCommand.cs b/OBD.NET/OBD.NET.Common/Commands/ATCommand.cs similarity index 100% rename from OBD.NET/OBD.NET/Commands/ATCommand.cs rename to OBD.NET/OBD.NET.Common/Commands/ATCommand.cs diff --git a/OBD.NET/OBD.NET/Commands/STCommand.cs b/OBD.NET/OBD.NET.Common/Commands/STCommand.cs similarity index 100% rename from OBD.NET/OBD.NET/Commands/STCommand.cs rename to OBD.NET/OBD.NET.Common/Commands/STCommand.cs diff --git a/OBD.NET/OBD.NET.Common/Communication/SerialConnection.cs b/OBD.NET/OBD.NET.Common/Communication/SerialConnection.cs new file mode 100644 index 0000000..e4a2112 --- /dev/null +++ b/OBD.NET/OBD.NET.Common/Communication/SerialConnection.cs @@ -0,0 +1,40 @@ +using System; +using System.Text; +using System.Threading; + +namespace OBD.NET.Communication +{ + /// + /// Serial connection interface + /// + /// + public interface ISerialConnection : IDisposable + { + /// + /// Gets a value indicating whether this instance is open. + /// + /// + /// true if this instance is open; otherwise, false. + /// + bool IsOpen { get; } + + /// + /// Occurs when a full line was received + /// + event EventHandler MessageReceived; + + + /// + /// Connects the serial port. + /// + void Connect(); + + + /// + /// Writes the specified text to the serial connection + /// + /// The text. + void Write(string text); + + } +} diff --git a/OBD.NET/OBD.NET/DataTypes/Count.cs b/OBD.NET/OBD.NET.Common/DataTypes/Count.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/Count.cs rename to OBD.NET/OBD.NET.Common/DataTypes/Count.cs diff --git a/OBD.NET/OBD.NET/DataTypes/Degree.cs b/OBD.NET/OBD.NET.Common/DataTypes/Degree.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/Degree.cs rename to OBD.NET/OBD.NET.Common/DataTypes/Degree.cs diff --git a/OBD.NET/OBD.NET/DataTypes/DegreeCelsius.cs b/OBD.NET/OBD.NET.Common/DataTypes/DegreeCelsius.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/DegreeCelsius.cs rename to OBD.NET/OBD.NET.Common/DataTypes/DegreeCelsius.cs diff --git a/OBD.NET/OBD.NET/DataTypes/GenericData.cs b/OBD.NET/OBD.NET.Common/DataTypes/GenericData.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/GenericData.cs rename to OBD.NET/OBD.NET.Common/DataTypes/GenericData.cs diff --git a/OBD.NET/OBD.NET/DataTypes/GramPerSec.cs b/OBD.NET/OBD.NET.Common/DataTypes/GramPerSec.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/GramPerSec.cs rename to OBD.NET/OBD.NET.Common/DataTypes/GramPerSec.cs diff --git a/OBD.NET/OBD.NET/DataTypes/Kilometre.cs b/OBD.NET/OBD.NET.Common/DataTypes/Kilometre.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/Kilometre.cs rename to OBD.NET/OBD.NET.Common/DataTypes/Kilometre.cs diff --git a/OBD.NET/OBD.NET/DataTypes/KilometrePerHour.cs b/OBD.NET/OBD.NET.Common/DataTypes/KilometrePerHour.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/KilometrePerHour.cs rename to OBD.NET/OBD.NET.Common/DataTypes/KilometrePerHour.cs diff --git a/OBD.NET/OBD.NET/DataTypes/Kilopascal.cs b/OBD.NET/OBD.NET.Common/DataTypes/Kilopascal.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/Kilopascal.cs rename to OBD.NET/OBD.NET.Common/DataTypes/Kilopascal.cs diff --git a/OBD.NET/OBD.NET/DataTypes/LitresPerHour.cs b/OBD.NET/OBD.NET.Common/DataTypes/LitresPerHour.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/LitresPerHour.cs rename to OBD.NET/OBD.NET.Common/DataTypes/LitresPerHour.cs diff --git a/OBD.NET/OBD.NET/DataTypes/Milliampere.cs b/OBD.NET/OBD.NET.Common/DataTypes/Milliampere.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/Milliampere.cs rename to OBD.NET/OBD.NET.Common/DataTypes/Milliampere.cs diff --git a/OBD.NET/OBD.NET/DataTypes/Minute.cs b/OBD.NET/OBD.NET.Common/DataTypes/Minute.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/Minute.cs rename to OBD.NET/OBD.NET.Common/DataTypes/Minute.cs diff --git a/OBD.NET/OBD.NET/DataTypes/NewtonMetre.cs b/OBD.NET/OBD.NET.Common/DataTypes/NewtonMetre.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/NewtonMetre.cs rename to OBD.NET/OBD.NET.Common/DataTypes/NewtonMetre.cs diff --git a/OBD.NET/OBD.NET/DataTypes/Pascal.cs b/OBD.NET/OBD.NET.Common/DataTypes/Pascal.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/Pascal.cs rename to OBD.NET/OBD.NET.Common/DataTypes/Pascal.cs diff --git a/OBD.NET/OBD.NET/DataTypes/Percent.cs b/OBD.NET/OBD.NET.Common/DataTypes/Percent.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/Percent.cs rename to OBD.NET/OBD.NET.Common/DataTypes/Percent.cs diff --git a/OBD.NET/OBD.NET/DataTypes/Ratio.cs b/OBD.NET/OBD.NET.Common/DataTypes/Ratio.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/Ratio.cs rename to OBD.NET/OBD.NET.Common/DataTypes/Ratio.cs diff --git a/OBD.NET/OBD.NET/DataTypes/RevolutionsPerMinute.cs b/OBD.NET/OBD.NET.Common/DataTypes/RevolutionsPerMinute.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/RevolutionsPerMinute.cs rename to OBD.NET/OBD.NET.Common/DataTypes/RevolutionsPerMinute.cs diff --git a/OBD.NET/OBD.NET/DataTypes/Second.cs b/OBD.NET/OBD.NET.Common/DataTypes/Second.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/Second.cs rename to OBD.NET/OBD.NET.Common/DataTypes/Second.cs diff --git a/OBD.NET/OBD.NET/DataTypes/Volt.cs b/OBD.NET/OBD.NET.Common/DataTypes/Volt.cs similarity index 100% rename from OBD.NET/OBD.NET/DataTypes/Volt.cs rename to OBD.NET/OBD.NET.Common/DataTypes/Volt.cs diff --git a/OBD.NET/OBD.NET/Devices/ELM327.cs b/OBD.NET/OBD.NET.Common/Devices/ELM327.cs similarity index 98% rename from OBD.NET/OBD.NET/Devices/ELM327.cs rename to OBD.NET/OBD.NET.Common/Devices/ELM327.cs index ca7e445..53dbd5b 100644 --- a/OBD.NET/OBD.NET/Devices/ELM327.cs +++ b/OBD.NET/OBD.NET.Common/Devices/ELM327.cs @@ -36,7 +36,7 @@ namespace OBD.NET.Devices #region Constructors - public ELM327(SerialConnection connection, IOBDLogger logger = null) + public ELM327(ISerialConnection connection, IOBDLogger logger = null) : base(connection, logger: logger) { } diff --git a/OBD.NET/OBD.NET/Devices/STN1170.cs b/OBD.NET/OBD.NET.Common/Devices/STN1170.cs similarity index 80% rename from OBD.NET/OBD.NET/Devices/STN1170.cs rename to OBD.NET/OBD.NET.Common/Devices/STN1170.cs index 8439124..af35037 100644 --- a/OBD.NET/OBD.NET/Devices/STN1170.cs +++ b/OBD.NET/OBD.NET.Common/Devices/STN1170.cs @@ -9,7 +9,7 @@ namespace OBD.NET.Devices #region Constructors - public STN1170(SerialConnection connection, IOBDLogger logger = null) + public STN1170(ISerialConnection connection, IOBDLogger logger = null) : base(connection, logger) { } diff --git a/OBD.NET/OBD.NET/Devices/SerialDevice.cs b/OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs similarity index 93% rename from OBD.NET/OBD.NET/Devices/SerialDevice.cs rename to OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs index 67fb3dc..c92dd8c 100644 --- a/OBD.NET/OBD.NET/Devices/SerialDevice.cs +++ b/OBD.NET/OBD.NET.Common/Devices/SerialDevice.cs @@ -11,14 +11,14 @@ namespace OBD.NET.Devices protected IOBDLogger Logger { get; } - protected SerialConnection Connection { get; } + protected ISerialConnection Connection { get; } protected char Terminator { get; set; } #endregion #region Constructors - protected SerialDevice(SerialConnection connection, char terminator = '\r', IOBDLogger logger = null) + protected SerialDevice(ISerialConnection connection, char terminator = '\r', IOBDLogger logger = null) { this.Connection = connection; this.Terminator = terminator; diff --git a/OBD.NET/OBD.NET/Enums/Mode.cs b/OBD.NET/OBD.NET.Common/Enums/Mode.cs similarity index 100% rename from OBD.NET/OBD.NET/Enums/Mode.cs rename to OBD.NET/OBD.NET.Common/Enums/Mode.cs diff --git a/OBD.NET/OBD.NET/Events/EventArgs/DataReceivedEventArgs.cs b/OBD.NET/OBD.NET.Common/Events/EventArgs/DataReceivedEventArgs.cs similarity index 100% rename from OBD.NET/OBD.NET/Events/EventArgs/DataReceivedEventArgs.cs rename to OBD.NET/OBD.NET.Common/Events/EventArgs/DataReceivedEventArgs.cs diff --git a/OBD.NET/OBD.NET/Events/EventArgs/RawDataReceivedEventArgs.cs b/OBD.NET/OBD.NET.Common/Events/EventArgs/RawDataReceivedEventArgs.cs similarity index 100% rename from OBD.NET/OBD.NET/Events/EventArgs/RawDataReceivedEventArgs.cs rename to OBD.NET/OBD.NET.Common/Events/EventArgs/RawDataReceivedEventArgs.cs diff --git a/OBD.NET/OBD.NET/Events/GenericDataEventManager.cs b/OBD.NET/OBD.NET.Common/Events/GenericDataEventManager.cs similarity index 100% rename from OBD.NET/OBD.NET/Events/GenericDataEventManager.cs rename to OBD.NET/OBD.NET.Common/Events/GenericDataEventManager.cs diff --git a/OBD.NET/OBD.NET/Events/IDataEventManager.cs b/OBD.NET/OBD.NET.Common/Events/IDataEventManager.cs similarity index 100% rename from OBD.NET/OBD.NET/Events/IDataEventManager.cs rename to OBD.NET/OBD.NET.Common/Events/IDataEventManager.cs diff --git a/OBD.NET/OBD.NET/Exceptions/SerialException.cs b/OBD.NET/OBD.NET.Common/Exceptions/SerialException.cs similarity index 71% rename from OBD.NET/OBD.NET/Exceptions/SerialException.cs rename to OBD.NET/OBD.NET.Common/Exceptions/SerialException.cs index 74413e7..d6fc529 100644 --- a/OBD.NET/OBD.NET/Exceptions/SerialException.cs +++ b/OBD.NET/OBD.NET.Common/Exceptions/SerialException.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.Serialization; namespace OBD.NET.Exceptions { @@ -17,10 +16,7 @@ namespace OBD.NET.Exceptions public SerialException(string message, Exception innerException) : base(message, innerException) { } - - protected SerialException(SerializationInfo info, StreamingContext context) - : base(info, context) - { } + #endregion } diff --git a/OBD.NET/OBD.NET/Exceptions/UnexpectedResultException.cs b/OBD.NET/OBD.NET.Common/Exceptions/UnexpectedResultException.cs similarity index 78% rename from OBD.NET/OBD.NET/Exceptions/UnexpectedResultException.cs rename to OBD.NET/OBD.NET.Common/Exceptions/UnexpectedResultException.cs index d6b4f82..5c6dab5 100644 --- a/OBD.NET/OBD.NET/Exceptions/UnexpectedResultException.cs +++ b/OBD.NET/OBD.NET.Common/Exceptions/UnexpectedResultException.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.Serialization; namespace OBD.NET.Exceptions { @@ -34,13 +33,7 @@ namespace OBD.NET.Exceptions this.Result = result; this.ExpectedResult = expectedResult; } - - protected UnexpectedResultException(SerializationInfo info, StreamingContext context, string result, string expectedResult) - : base(info, context) - { - this.Result = result; - this.ExpectedResult = expectedResult; - } + #endregion } diff --git a/OBD.NET/OBD.NET/Extensions/HexExtension.cs b/OBD.NET/OBD.NET.Common/Extensions/HexExtension.cs similarity index 100% rename from OBD.NET/OBD.NET/Extensions/HexExtension.cs rename to OBD.NET/OBD.NET.Common/Extensions/HexExtension.cs diff --git a/OBD.NET/OBD.NET/Logging/IOBDLogger.cs b/OBD.NET/OBD.NET.Common/Logging/IOBDLogger.cs similarity index 100% rename from OBD.NET/OBD.NET/Logging/IOBDLogger.cs rename to OBD.NET/OBD.NET.Common/Logging/IOBDLogger.cs diff --git a/OBD.NET/OBD.NET/Logging/OBDLogLevel.cs b/OBD.NET/OBD.NET.Common/Logging/OBDLogLevel.cs similarity index 100% rename from OBD.NET/OBD.NET/Logging/OBDLogLevel.cs rename to OBD.NET/OBD.NET.Common/Logging/OBDLogLevel.cs diff --git a/OBD.NET/OBD.NET.Common/OBD.NET.Common.csproj b/OBD.NET/OBD.NET.Common/OBD.NET.Common.csproj new file mode 100644 index 0000000..dd002d0 --- /dev/null +++ b/OBD.NET/OBD.NET.Common/OBD.NET.Common.csproj @@ -0,0 +1,20 @@ + + + + netstandard1.6 + Wyrez / Roman Lumetsberger + - + OBD.NET + C#-Library to read/write data from/to a car through an ELM327-/STN1170-Adapter + + + + + + + + + + + + \ No newline at end of file diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/AuxiliaryInputStatus.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/AuxiliaryInputStatus.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/AuxiliaryInputStatus.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/AuxiliaryInputStatus.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/CalculatedEngineLoad.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/CalculatedEngineLoad.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/CalculatedEngineLoad.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/CalculatedEngineLoad.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/CommandedSecondaryAirStatus.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/CommandedSecondaryAirStatus.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/CommandedSecondaryAirStatus.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/CommandedSecondaryAirStatus.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/EngineCoolantTemperature.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/EngineCoolantTemperature.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/EngineCoolantTemperature.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/EngineCoolantTemperature.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/EngineRPM.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/EngineRPM.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/EngineRPM.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/EngineRPM.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/FuelPressure.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/FuelPressure.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/FuelPressure.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/FuelPressure.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/FuelSystemStatus.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/FuelSystemStatus.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/FuelSystemStatus.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/FuelSystemStatus.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/IntakeAirTemperature.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/IntakeAirTemperature.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/IntakeAirTemperature.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/IntakeAirTemperature.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/IntakeManifoldAbsolutePressure.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank1.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/LongTermFuelTrimBank1.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank1.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/LongTermFuelTrimBank1.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank2.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/LongTermFuelTrimBank2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/LongTermFuelTrimBank2.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/LongTermFuelTrimBank2.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/MAFAirFlowRate.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/MAFAirFlowRate.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/MAFAirFlowRate.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/MAFAirFlowRate.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OBDStandards.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/OBDStandards.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/OBDStandards.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/OBDStandards.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor1FuelTrim.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor1FuelTrim.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor1FuelTrim.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor1FuelTrim.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor2FuelTrim.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor2FuelTrim.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor2FuelTrim.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor2FuelTrim.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor3FuelTrim.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor3FuelTrim.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor3FuelTrim.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor3FuelTrim.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor4FuelTrim.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor4FuelTrim.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor4FuelTrim.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor4FuelTrim.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor5FuelTrim.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor5FuelTrim.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor5FuelTrim.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor5FuelTrim.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor6FuelTrim.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor6FuelTrim.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor6FuelTrim.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor6FuelTrim.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor7FuelTrim.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor7FuelTrim.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor7FuelTrim.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor7FuelTrim.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor8FuelTrim.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor8FuelTrim.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensor8FuelTrim.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensor8FuelTrim.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorPresent.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensorPresent.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorPresent.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensorPresent.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorsPresent2.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensorsPresent2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/OxygenSensorsPresent2.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/OxygenSensorsPresent2.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/PidsSupported01_20.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/PidsSupported01_20.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/PidsSupported01_20.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/PidsSupported01_20.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/RunTimeSinceEngineStart.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/RunTimeSinceEngineStart.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/RunTimeSinceEngineStart.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/RunTimeSinceEngineStart.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank1.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/ShortTermFuelTrimBank1.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank1.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/ShortTermFuelTrimBank1.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank2.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/ShortTermFuelTrimBank2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/ShortTermFuelTrimBank2.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/ShortTermFuelTrimBank2.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/ThrottlePosition.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/ThrottlePosition.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/ThrottlePosition.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/ThrottlePosition.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/TimingAdvance.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/TimingAdvance.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/TimingAdvance.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/TimingAdvance.cs diff --git a/OBD.NET/OBD.NET/OBDData/00-1F/VehicleSpeed.cs b/OBD.NET/OBD.NET.Common/OBDData/00-1F/VehicleSpeed.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/00-1F/VehicleSpeed.cs rename to OBD.NET/OBD.NET.Common/OBDData/00-1F/VehicleSpeed.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/AbsoluteBarometricPressure.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/AbsoluteBarometricPressure.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/AbsoluteBarometricPressure.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/AbsoluteBarometricPressure.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/CatalystTemperatureBank1Sensor1.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/CatalystTemperatureBank1Sensor2.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/CatalystTemperatureBank2Sensor1.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/CatalystTemperatureBank2Sensor2.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEGR.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/CommandedEGR.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/CommandedEGR.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/CommandedEGR.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/CommandedEvaporativePurge.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/CommandedEvaporativePurge.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/CommandedEvaporativePurge.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/CommandedEvaporativePurge.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/DistanceTraveledSinceCodesCleared.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledWithMILOn.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/DistanceTraveledWithMILOn.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/DistanceTraveledWithMILOn.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/DistanceTraveledWithMILOn.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/EGRError.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/EGRError.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/EGRError.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/EGRError.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/EvapSystemVaporPressure.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/EvapSystemVaporPressure.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/EvapSystemVaporPressure.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/EvapSystemVaporPressure.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailGaugePressure.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/FuelRailGaugePressure.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/FuelRailGaugePressure.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/FuelRailGaugePressure.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/FuelRailPressure.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/FuelRailPressure.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/FuelRailPressure.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/FuelRailPressure.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/FuelTankLevelInput.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/FuelTankLevelInput.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/FuelTankLevelInput.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/FuelTankLevelInput.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor1FuelAir.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor1FuelAir.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir2.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor1FuelAir2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor1FuelAir2.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor1FuelAir2.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor2FuelAir.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor2FuelAir.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir2.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor2FuelAir2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor2FuelAir2.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor2FuelAir2.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor3FuelAir.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor3FuelAir.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir2.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor3FuelAir2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor3FuelAir2.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor3FuelAir2.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor4FuelAir.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor4FuelAir.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir2.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor4FuelAir2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor4FuelAir2.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor4FuelAir2.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor5FuelAir.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor5FuelAir.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir2.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor5FuelAir2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor5FuelAir2.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor5FuelAir2.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor6FuelAir.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor6FuelAir.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir2.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor6FuelAir2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor6FuelAir2.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor6FuelAir2.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor7FuelAir.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor7FuelAir.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir2.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor7FuelAir2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor7FuelAir2.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor7FuelAir2.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor8FuelAir.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor8FuelAir.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir2.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor8FuelAir2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/OxygenSensor8FuelAir2.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/OxygenSensor8FuelAir2.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/PidsSupported21_40.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/PidsSupported21_40.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/PidsSupported21_40.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/PidsSupported21_40.cs diff --git a/OBD.NET/OBD.NET/OBDData/20-3F/WarmUpsSinceCodesCleared.cs b/OBD.NET/OBD.NET.Common/OBDData/20-3F/WarmUpsSinceCodesCleared.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/20-3F/WarmUpsSinceCodesCleared.cs rename to OBD.NET/OBD.NET.Common/OBDData/20-3F/WarmUpsSinceCodesCleared.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/AbsoluteEvapSystemVaporPressure.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteLoadValue.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/AbsoluteLoadValue.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteLoadValue.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/AbsoluteLoadValue.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionB.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/AbsoluteThrottlePositionB.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionB.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/AbsoluteThrottlePositionB.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionC.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/AbsoluteThrottlePositionC.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/AbsoluteThrottlePositionC.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/AbsoluteThrottlePositionC.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionD.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/AcceleratorPedalPositionD.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionD.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/AcceleratorPedalPositionD.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionE.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/AcceleratorPedalPositionE.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionE.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/AcceleratorPedalPositionE.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionF.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/AcceleratorPedalPositionF.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/AcceleratorPedalPositionF.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/AcceleratorPedalPositionF.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/AmbientAirTemperature.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/AmbientAirTemperature.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/AmbientAirTemperature.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/AmbientAirTemperature.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/CommandedThrottleActuator.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/CommandedThrottleActuator.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/CommandedThrottleActuator.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/CommandedThrottleActuator.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/ControlModuleVoltage.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/ControlModuleVoltage.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/ControlModuleVoltage.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/ControlModuleVoltage.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/EngineFuelRate.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/EngineFuelRate.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/EngineFuelRate.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/EngineFuelRate.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/EngineOilTemperature.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/EngineOilTemperature.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/EngineOilTemperature.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/EngineOilTemperature.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/EthanolFuel.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/EthanolFuel.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/EthanolFuel.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/EthanolFuel.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/EvapSystemVaporPressure2.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/EvapSystemVaporPressure2.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/EvapSystemVaporPressure2.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/EvapSystemVaporPressure2.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/FuelAirCommandedEquivalenceRatio.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/FuelInjectionTiming.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/FuelInjectionTiming.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/FuelInjectionTiming.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/FuelInjectionTiming.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/FuelRailAbsolutePressure.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/FuelRailAbsolutePressure.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/FuelRailAbsolutePressure.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/FuelRailAbsolutePressure.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/FuelType.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/FuelType.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/FuelType.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/FuelType.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/HybridBatteryPackRemainingLife.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/HybridBatteryPackRemainingLife.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/HybridBatteryPackRemainingLife.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/HybridBatteryPackRemainingLife.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank13.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/LongTermSecondaryOxygenSensorTrimBank24.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValueForAirFlowRate.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/MaximumValueForAirFlowRate.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/MaximumValueForAirFlowRate.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/MaximumValueForAirFlowRate.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/MaximumValues.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/MaximumValues.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/MaximumValues.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/MaximumValues.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/MonitorStatusThisDriveCycle.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/MonitorStatusThisDriveCycle.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/MonitorStatusThisDriveCycle.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/MonitorStatusThisDriveCycle.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/PidsSupported41_60.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/PidsSupported41_60.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/PidsSupported41_60.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/PidsSupported41_60.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/RelativeAcceleratorPedalPosition.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/RelativeThrottlePosition.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/RelativeThrottlePosition.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/RelativeThrottlePosition.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/RelativeThrottlePosition.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank13.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/ShortTermSecondaryOxygenSensorTrimBank24.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/TimeRunWithMILOn.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/TimeRunWithMILOn.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/TimeRunWithMILOn.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/TimeRunWithMILOn.cs diff --git a/OBD.NET/OBD.NET/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs b/OBD.NET/OBD.NET.Common/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs rename to OBD.NET/OBD.NET.Common/OBDData/40-5F/TimeSinceTroubleCodesCleared.cs diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/ActualEnginePercentTorque.cs b/OBD.NET/OBD.NET.Common/OBDData/60-7F/ActualEnginePercentTorque.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/60-7F/ActualEnginePercentTorque.cs rename to OBD.NET/OBD.NET.Common/OBDData/60-7F/ActualEnginePercentTorque.cs diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/DriversDemandEnginePercentTorque.cs b/OBD.NET/OBD.NET.Common/OBDData/60-7F/DriversDemandEnginePercentTorque.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/60-7F/DriversDemandEnginePercentTorque.cs rename to OBD.NET/OBD.NET.Common/OBDData/60-7F/DriversDemandEnginePercentTorque.cs diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/EnginePercentTorqueData.cs b/OBD.NET/OBD.NET.Common/OBDData/60-7F/EnginePercentTorqueData.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/60-7F/EnginePercentTorqueData.cs rename to OBD.NET/OBD.NET.Common/OBDData/60-7F/EnginePercentTorqueData.cs diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/EngineReferenceTorque.cs b/OBD.NET/OBD.NET.Common/OBDData/60-7F/EngineReferenceTorque.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/60-7F/EngineReferenceTorque.cs rename to OBD.NET/OBD.NET.Common/OBDData/60-7F/EngineReferenceTorque.cs diff --git a/OBD.NET/OBD.NET/OBDData/60-7F/PidsSupported61_80.cs b/OBD.NET/OBD.NET.Common/OBDData/60-7F/PidsSupported61_80.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/60-7F/PidsSupported61_80.cs rename to OBD.NET/OBD.NET.Common/OBDData/60-7F/PidsSupported61_80.cs diff --git a/OBD.NET/OBD.NET/OBDData/80-9F/PidsSupported81_A0.cs b/OBD.NET/OBD.NET.Common/OBDData/80-9F/PidsSupported81_A0.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/80-9F/PidsSupported81_A0.cs rename to OBD.NET/OBD.NET.Common/OBDData/80-9F/PidsSupported81_A0.cs diff --git a/OBD.NET/OBD.NET/OBDData/A0-BF/PidsSupportedA1_C0.cs b/OBD.NET/OBD.NET.Common/OBDData/A0-BF/PidsSupportedA1_C0.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/A0-BF/PidsSupportedA1_C0.cs rename to OBD.NET/OBD.NET.Common/OBDData/A0-BF/PidsSupportedA1_C0.cs diff --git a/OBD.NET/OBD.NET/OBDData/AbstractOBDData.cs b/OBD.NET/OBD.NET.Common/OBDData/AbstractOBDData.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/AbstractOBDData.cs rename to OBD.NET/OBD.NET.Common/OBDData/AbstractOBDData.cs diff --git a/OBD.NET/OBD.NET/OBDData/C0-DF/PidsSupportedC1_E0.cs b/OBD.NET/OBD.NET.Common/OBDData/C0-DF/PidsSupportedC1_E0.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/C0-DF/PidsSupportedC1_E0.cs rename to OBD.NET/OBD.NET.Common/OBDData/C0-DF/PidsSupportedC1_E0.cs diff --git a/OBD.NET/OBD.NET/OBDData/IOBDData.cs b/OBD.NET/OBD.NET.Common/OBDData/IOBDData.cs similarity index 100% rename from OBD.NET/OBD.NET/OBDData/IOBDData.cs rename to OBD.NET/OBD.NET.Common/OBDData/IOBDData.cs diff --git a/OBD.NET/OBD.NET.sln b/OBD.NET/OBD.NET.sln index 0656bde..2d47b29 100644 --- a/OBD.NET/OBD.NET.sln +++ b/OBD.NET/OBD.NET.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26403.7 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OBD.NET", "OBD.NET\OBD.NET.csproj", "{C97E0C5B-0571-41A3-9257-90BB48E46DCF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OBD.NET.Common", "OBD.NET.Common\OBD.NET.Common.csproj", "{D985B70E-CDF3-4CF1-AB5D-8D19C7FE7B31}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C97E0C5B-0571-41A3-9257-90BB48E46DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C97E0C5B-0571-41A3-9257-90BB48E46DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C97E0C5B-0571-41A3-9257-90BB48E46DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C97E0C5B-0571-41A3-9257-90BB48E46DCF}.Release|Any CPU.Build.0 = Release|Any CPU + {D985B70E-CDF3-4CF1-AB5D-8D19C7FE7B31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D985B70E-CDF3-4CF1-AB5D-8D19C7FE7B31}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D985B70E-CDF3-4CF1-AB5D-8D19C7FE7B31}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D985B70E-CDF3-4CF1-AB5D-8D19C7FE7B31}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/OBD.NET/OBD.NET/Communication/EnhancedSerialPort.cs b/OBD.NET/OBD.NET/Communication/EnhancedSerialPort.cs deleted file mode 100644 index f92267b..0000000 --- a/OBD.NET/OBD.NET/Communication/EnhancedSerialPort.cs +++ /dev/null @@ -1,163 +0,0 @@ -// Copyright 2013 Antanas Veiverys www.veiverys.com -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -using System; -using System.ComponentModel; -using System.IO; -using System.IO.Ports; -using System.Reflection; -using System.Runtime.InteropServices; - -// Source: http://antanas.veiverys.com/mono-serialport-datareceived-event-workaround-using-a-derived-class/ -namespace OBD.NET.Communication -{ - [DesignerCategory("Code")] - public class EnhancedSerialPort : SerialPort - { - #region Properties & Fields - - // private member access via reflection - private int _fd; - private FieldInfo _disposedFieldInfo; - private object _dataReceived; - - #endregion - - #region DLLImports - - [DllImport("MonoPosixHelper", SetLastError = true)] - private static extern bool poll_serial(int fd, out int error, int timeout); - - [DllImport("libc")] - private static extern IntPtr strerror(int errnum); - - #endregion - - #region Constructors - - public EnhancedSerialPort() - : base() - { } - - public EnhancedSerialPort(IContainer container) - : base(container) - { } - - public EnhancedSerialPort(string portName) - : base(portName) - { } - - public EnhancedSerialPort(string portName, int baudRate) - : base(portName, baudRate) - { } - - public EnhancedSerialPort(string portName, int baudRate, Parity parity) - : base(portName, baudRate, parity) - { } - - public EnhancedSerialPort(string portName, int baudRate, Parity parity, int dataBits) - : base(portName, baudRate, parity, dataBits) - { } - - public EnhancedSerialPort(string portName, int baudRate, Parity parity, int dataBits, StopBits stopBits) - : base(portName, baudRate, parity, dataBits, stopBits) - { } - - #endregion - - #region Methods - - public new void Open() - { - base.Open(); - - if (!IsWindows) - { - FieldInfo fieldInfo = BaseStream.GetType().GetField("fd", BindingFlags.Instance | BindingFlags.NonPublic); - _fd = (int)fieldInfo.GetValue(BaseStream); - _disposedFieldInfo = BaseStream.GetType().GetField("disposed", BindingFlags.Instance | BindingFlags.NonPublic); - fieldInfo = typeof(SerialPort).GetField("data_received", BindingFlags.Instance | BindingFlags.NonPublic); - _dataReceived = fieldInfo.GetValue(this); - - new System.Threading.Thread(EventThreadFunction).Start(); - } - } - - private static bool IsWindows - { - get - { - PlatformID id = Environment.OSVersion.Platform; - return (id == PlatformID.Win32Windows) || (id == PlatformID.Win32NT); // WinCE not supported - } - } - - private void EventThreadFunction() - { - do - { - try - { - Stream stream = BaseStream; - if (stream == null) - return; - - if (Poll(stream, ReadTimeout)) - OnDataReceived(null); - } - catch - { - return; - } - } while (IsOpen); - } - - private void OnDataReceived(SerialDataReceivedEventArgs args) - { - SerialDataReceivedEventHandler handler = Events[_dataReceived] as SerialDataReceivedEventHandler; - handler?.Invoke(this, args); - } - - private bool Poll(Stream stream, int timeout) - { - CheckDisposed(stream); - if (IsOpen == false) - throw new Exception("port is closed"); - int error; - - bool pollResult = poll_serial(_fd, out error, ReadTimeout); - if (error == -1) - ThrowIOException(); - - return pollResult; - } - - private static void ThrowIOException() - { - int errnum = Marshal.GetLastWin32Error(); - string errorMessage = Marshal.PtrToStringAnsi(strerror(errnum)); - - throw new IOException(errorMessage); - } - - private void CheckDisposed(Stream stream) - { - bool disposed = (bool)_disposedFieldInfo.GetValue(stream); - if (disposed) - throw new ObjectDisposedException(stream.GetType().FullName); - } - - #endregion - } -} diff --git a/OBD.NET/OBD.NET/Communication/SerialConnection.cs b/OBD.NET/OBD.NET/Communication/SerialConnection.cs deleted file mode 100644 index 3c8aed7..0000000 --- a/OBD.NET/OBD.NET/Communication/SerialConnection.cs +++ /dev/null @@ -1,108 +0,0 @@ -using System; -using System.IO.Ports; -using System.Text; -using System.Threading; - -namespace OBD.NET.Communication -{ - public class SerialConnection : IDisposable - { - #region Properties & Fields - - private readonly EnhancedSerialPort _serialPort; - private readonly int _timeout; - - public bool IsOpen => _serialPort?.IsOpen ?? false; - - private readonly byte[] _readBuffer = new byte[1024]; - private readonly StringBuilder _lineBuffer = new StringBuilder(); - - private readonly AutoResetEvent _hasPrompt = new AutoResetEvent(true); - - #endregion - - #region Events - - public event EventHandler MessageReceived; - - #endregion - - #region Constructors - - public SerialConnection(string port, int baudRate = 38400, Parity parity = Parity.None, StopBits stopBits = StopBits.One, - Handshake handshake = Handshake.None, int timeout = 5000) - { - this._timeout = timeout; - _serialPort = new EnhancedSerialPort(port, baudRate, parity) - { - StopBits = stopBits, - Handshake = handshake, - ReadTimeout = timeout, - WriteTimeout = timeout - }; - - _serialPort.DataReceived += SerialPortOnDataReceived; - } - - #endregion - - #region Methods - - public void Connect() - { - _serialPort.Open(); - Thread.Sleep(5000); - Write("\r"); - } - - public void Write(string text) - { - if (!_hasPrompt.WaitOne(_timeout)) - throw new TimeoutException("No prompt received"); - - _serialPort.Write(text); - } - - private void SerialPortOnDataReceived(object sender, SerialDataReceivedEventArgs serialDataReceivedEventArgs) - { - int count = _serialPort.Read(_readBuffer, 0, _serialPort.BytesToRead); - for (int i = 0; i < count; i++) - { - char c = (char)_readBuffer[i]; - switch (c) - { - case '\r': - FinishLine(); - break; - - case '>': - _hasPrompt.Set(); - break; - - case '\n': - case (char)0x00: - break; // ignore - - default: - _lineBuffer.Append(c); - break; - } - } - } - - private void FinishLine() - { - string line = _lineBuffer.ToString(); - _lineBuffer.Clear(); - - MessageReceived?.Invoke(this, line); - } - - public void Dispose() - { - _serialPort?.Dispose(); - } - - #endregion - } -} diff --git a/OBD.NET/OBD.NET/OBD.NET.csproj b/OBD.NET/OBD.NET/OBD.NET.csproj deleted file mode 100644 index 0c0204a..0000000 --- a/OBD.NET/OBD.NET/OBD.NET.csproj +++ /dev/null @@ -1,197 +0,0 @@ - - - - - Debug - AnyCPU - {C97E0C5B-0571-41A3-9257-90BB48E46DCF} - Library - Properties - OBD.NET - OBD.NET - v4.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OBD.NET/OBD.NET/OBD.NET.csproj.DotSettings b/OBD.NET/OBD.NET/OBD.NET.csproj.DotSettings deleted file mode 100644 index ca3a58b..0000000 --- a/OBD.NET/OBD.NET/OBD.NET.csproj.DotSettings +++ /dev/null @@ -1,8 +0,0 @@ - - True - True - True - True - True - True - True \ No newline at end of file diff --git a/OBD.NET/OBD.NET/Properties/AssemblyInfo.cs b/OBD.NET/OBD.NET/Properties/AssemblyInfo.cs deleted file mode 100644 index 93aa0d4..0000000 --- a/OBD.NET/OBD.NET/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("OBD.NET")] -[assembly: AssemblyDescription("C#-Library to read/write data from/to a car through an ELM327-/STN1170-Adapter")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Wyrez")] -[assembly: AssemblyProduct("OBD.NET")] -[assembly: AssemblyCopyright("Copyright © Wyrez 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c97e0c5b-0571-41a3-9257-90bb48e46dcf")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")]