fix some naming conflicts and update obd-java-api in build.gradle

salmajouini · Aug 17, 2015 · 2e4c701 · 2e4c701
1 parent 651c69b
commit 2e4c701
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 62 deletions.
diff --git a/build.gradle b/build.gradle
@@ -37,7 +37,7 @@ android {
 
 dependencies {
     compile 'com.android.support:appcompat-v7:22.1.1'
-    compile 'com.github.pires:obd-java-api:1.0-RC6'
+    compile 'com.github.pires:obd-java-api:1.0-RC8'
     compile 'org.roboguice:roboguice:3.+'
     provided 'org.roboguice:roboblender:3.+'
     compile 'com.squareup.retrofit:retrofit:1.9.0'

diff --git a/src/main/java/com/github/pires/obd/reader/config/ObdConfig.java b/src/main/java/com/github/pires/obd/reader/config/ObdConfig.java
@@ -1,35 +1,34 @@
 package com.github.pires.obd.reader.config;
 
 import com.github.pires.obd.commands.ObdCommand;
-import com.github.pires.obd.commands.SpeedObdCommand;
-import com.github.pires.obd.commands.control.CommandControlModuleVoltageObdCommand;
-import com.github.pires.obd.commands.control.CommandEquivRatioObdCommand;
-import com.github.pires.obd.commands.control.DistanceTraveledSinceCodesClearedObdCommand;
-import com.github.pires.obd.commands.control.DistanceTraveledWithMILOnObdCommand;
-import com.github.pires.obd.commands.control.DtcNumberObdCommand;
-import com.github.pires.obd.commands.control.TimingAdvanceObdCommand;
-import com.github.pires.obd.commands.control.TroubleCodesObdCommand;
-import com.github.pires.obd.commands.control.VinObdCommand;
-import com.github.pires.obd.commands.engine.EngineLoadObdCommand;
-import com.github.pires.obd.commands.engine.EngineOilTempObdCommand;
-import com.github.pires.obd.commands.engine.EngineRPMObdCommand;
-import com.github.pires.obd.commands.engine.EngineRuntimeObdCommand;
-import com.github.pires.obd.commands.engine.MassAirFlowObdCommand;
-import com.github.pires.obd.commands.engine.ThrottlePositionObdCommand;
-import com.github.pires.obd.commands.fuel.FindFuelTypeObdCommand;
-import com.github.pires.obd.commands.fuel.FuelAirCommanded;
-import com.github.pires.obd.commands.fuel.FuelAirWidebandCommanded;
-import com.github.pires.obd.commands.fuel.FuelConsumptionRateObdCommand;
-import com.github.pires.obd.commands.fuel.FuelEconomyObdCommand;
-import com.github.pires.obd.commands.fuel.FuelLevelObdCommand;
-import com.github.pires.obd.commands.fuel.FuelTrimObdCommand;
-import com.github.pires.obd.commands.pressure.BarometricPressureObdCommand;
-import com.github.pires.obd.commands.pressure.FuelPressureObdCommand;
-import com.github.pires.obd.commands.pressure.FuelRailPressureObdCommand;
-import com.github.pires.obd.commands.pressure.IntakeManifoldPressureObdCommand;
-import com.github.pires.obd.commands.temperature.AirIntakeTemperatureObdCommand;
-import com.github.pires.obd.commands.temperature.AmbientAirTemperatureObdCommand;
-import com.github.pires.obd.commands.temperature.EngineCoolantTemperatureObdCommand;
+import com.github.pires.obd.commands.SpeedCommand;
+import com.github.pires.obd.commands.control.DistanceTraveledSinceCodesClearedCommand;
+import com.github.pires.obd.commands.control.DistanceTraveledWithMILOnCommand;
+import com.github.pires.obd.commands.control.DtcNumberCommand;
+import com.github.pires.obd.commands.control.EquivalentRatioCommand;
+import com.github.pires.obd.commands.control.ModuleVoltageCommand;
+import com.github.pires.obd.commands.control.TimingAdvanceCommand;
+import com.github.pires.obd.commands.control.TroubleCodesCommand;
+import com.github.pires.obd.commands.control.VinCommand;
+import com.github.pires.obd.commands.engine.LoadCommand;
+import com.github.pires.obd.commands.engine.MassAirFlowCommand;
+import com.github.pires.obd.commands.engine.OilTempCommand;
+import com.github.pires.obd.commands.engine.RPMCommand;
+import com.github.pires.obd.commands.engine.RuntimeCommand;
+import com.github.pires.obd.commands.engine.ThrottlePositionCommand;
+import com.github.pires.obd.commands.fuel.AirFuelRatioCommand;
+import com.github.pires.obd.commands.fuel.ConsumptionRateCommand;
+import com.github.pires.obd.commands.fuel.FindFuelTypeCommand;
+import com.github.pires.obd.commands.fuel.FuelLevelCommand;
+import com.github.pires.obd.commands.fuel.FuelTrimCommand;
+import com.github.pires.obd.commands.fuel.WidebandAirFuelRatioCommand;
+import com.github.pires.obd.commands.pressure.BarometricPressureCommand;
+import com.github.pires.obd.commands.pressure.FuelPressureCommand;
+import com.github.pires.obd.commands.pressure.FuelRailPressureCommand;
+import com.github.pires.obd.commands.pressure.IntakeManifoldPressureCommand;
+import com.github.pires.obd.commands.temperature.AirIntakeTemperatureCommand;
+import com.github.pires.obd.commands.temperature.AmbientAirTemperatureCommand;
+import com.github.pires.obd.commands.temperature.EngineCoolantTemperatureCommand;
 import com.github.pires.obd.enums.FuelTrim;
 
 import java.util.ArrayList;
@@ -43,51 +42,51 @@ public static ArrayList<ObdCommand> getCommands() {
         ArrayList<ObdCommand> cmds = new ArrayList<>();
 
         // Control
-        cmds.add(new CommandControlModuleVoltageObdCommand());
-        cmds.add(new CommandEquivRatioObdCommand());
-        cmds.add(new DistanceTraveledSinceCodesClearedObdCommand());
-        cmds.add(new DistanceTraveledWithMILOnObdCommand());
-        cmds.add(new DtcNumberObdCommand());
-        cmds.add(new TimingAdvanceObdCommand());
-        cmds.add(new TroubleCodesObdCommand());
-        cmds.add(new VinObdCommand());
+        cmds.add(new ModuleVoltageCommand());
+        cmds.add(new EquivalentRatioCommand());
+        cmds.add(new DistanceTraveledSinceCodesClearedCommand());
+        cmds.add(new DistanceTraveledWithMILOnCommand());
+        cmds.add(new DtcNumberCommand());
+        cmds.add(new TimingAdvanceCommand());
+        cmds.add(new TroubleCodesCommand());
+        cmds.add(new VinCommand());
 
         // Engine
-        cmds.add(new EngineLoadObdCommand());
-        cmds.add(new EngineRPMObdCommand());
-        cmds.add(new EngineRuntimeObdCommand());
-        cmds.add(new MassAirFlowObdCommand());
-        cmds.add(new ThrottlePositionObdCommand());
+        cmds.add(new LoadCommand());
+        cmds.add(new RPMCommand());
+        cmds.add(new RuntimeCommand());
+        cmds.add(new MassAirFlowCommand());
+        cmds.add(new ThrottlePositionCommand());
 
         // Fuel
-        cmds.add(new FindFuelTypeObdCommand());
-        cmds.add(new FuelConsumptionRateObdCommand());
+        cmds.add(new FindFuelTypeCommand());
+        cmds.add(new ConsumptionRateCommand());
         // cmds.add(new AverageFuelEconomyObdCommand());
-        cmds.add(new FuelEconomyObdCommand());
-        cmds.add(new FuelLevelObdCommand());
+        //cmds.add(new FuelEconomyCommand());
+        cmds.add(new FuelLevelCommand());
         // cmds.add(new FuelEconomyMAPObdCommand());
         // cmds.add(new FuelEconomyCommandedMAPObdCommand());
-        cmds.add(new FuelTrimObdCommand(FuelTrim.LONG_TERM_BANK_1));
-        cmds.add(new FuelTrimObdCommand(FuelTrim.LONG_TERM_BANK_2));
-        cmds.add(new FuelTrimObdCommand(FuelTrim.SHORT_TERM_BANK_1));
-        cmds.add(new FuelTrimObdCommand(FuelTrim.SHORT_TERM_BANK_2));
-        cmds.add(new FuelAirCommanded());
-        cmds.add(new FuelAirWidebandCommanded());
-        cmds.add(new EngineOilTempObdCommand());
+        cmds.add(new FuelTrimCommand(FuelTrim.LONG_TERM_BANK_1));
+        cmds.add(new FuelTrimCommand(FuelTrim.LONG_TERM_BANK_2));
+        cmds.add(new FuelTrimCommand(FuelTrim.SHORT_TERM_BANK_1));
+        cmds.add(new FuelTrimCommand(FuelTrim.SHORT_TERM_BANK_2));
+        cmds.add(new AirFuelRatioCommand());
+        cmds.add(new WidebandAirFuelRatioCommand());
+        cmds.add(new OilTempCommand());
 
         // Pressure
-        cmds.add(new BarometricPressureObdCommand());
-        cmds.add(new FuelPressureObdCommand());
-        cmds.add(new FuelRailPressureObdCommand());
-        cmds.add(new IntakeManifoldPressureObdCommand());
+        cmds.add(new BarometricPressureCommand());
+        cmds.add(new FuelPressureCommand());
+        cmds.add(new FuelRailPressureCommand());
+        cmds.add(new IntakeManifoldPressureCommand());
 
         // Temperature
-        cmds.add(new AirIntakeTemperatureObdCommand());
-        cmds.add(new AmbientAirTemperatureObdCommand());
-        cmds.add(new EngineCoolantTemperatureObdCommand());
+        cmds.add(new AirIntakeTemperatureCommand());
+        cmds.add(new AmbientAirTemperatureCommand());
+        cmds.add(new EngineCoolantTemperatureCommand());
 
         // Misc
-        cmds.add(new SpeedObdCommand());
+        cmds.add(new SpeedCommand());
 
 
         return cmds;