diff options
| -rw-r--r-- | src/org/traccar/BaseProtocolEncoder.java | 4 | ||||
| -rw-r--r-- | src/org/traccar/events/OverspeedEventHandler.java | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/org/traccar/BaseProtocolEncoder.java b/src/org/traccar/BaseProtocolEncoder.java index 2bf6cde66..a9aa24cb0 100644 --- a/src/org/traccar/BaseProtocolEncoder.java +++ b/src/org/traccar/BaseProtocolEncoder.java @@ -50,8 +50,8 @@ public abstract class BaseProtocolEncoder extends OneToOneEncoder { // Log command StringBuilder s = new StringBuilder(); s.append(String.format("[%08X] ", channel.getId())); - s.append("command type: ").append(command.getType()).append(", "); - s.append("id : ").append(command.getDeviceId()).append(" "); + s.append("id: ").append(getUniqueId(command.getDeviceId())).append(", "); + s.append("command type: ").append(command.getType()).append(" "); if (encodedCommand != null) { s.append("sent"); } else { diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java index c739348eb..302fa87cd 100644 --- a/src/org/traccar/events/OverspeedEventHandler.java +++ b/src/org/traccar/events/OverspeedEventHandler.java @@ -23,7 +23,6 @@ import org.traccar.Context; import org.traccar.model.Device; import org.traccar.model.Event; import org.traccar.model.Position; -import org.traccar.helper.UnitsConverter; public class OverspeedEventHandler extends BaseEventHandler { @@ -63,7 +62,6 @@ public class OverspeedEventHandler extends BaseEventHandler { oldSpeed = lastPosition.getSpeed(); } } - speedLimit = UnitsConverter.knotsFromKph(speedLimit); if (speed > speedLimit && oldSpeed <= speedLimit) { events.add(new Event(Event.TYPE_DEVICE_OVERSPEED, position.getDeviceId(), position.getId())); } |