Fix typo in alarm name

10 files changed, 17 insertions, 17 deletions

diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 93456b1b0..099e6d686 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -115,7 +115,7 @@ public class Position extends Message {
     public static final String ALARM_ACCIDENT = "accident";
     public static final String ALARM_TOW = "tow";
     public static final String ALARM_ACCELERATION = "hardAcceleration";
-    public static final String ALARM_BREAKING = "hardBreaking";
+    public static final String ALARM_BRAKING = "hardBraking";
     public static final String ALARM_CORNERING = "hardCornering";
     public static final String ALARM_FATIGUE_DRIVING = "fatigueDriving";
     public static final String ALARM_POWER_CUT = "powerCut";
diff --git a/src/org/traccar/protocol/AplicomProtocolDecoder.java b/src/org/traccar/protocol/AplicomProtocolDecoder.java
index 94d12c633..154451b5b 100644
--- a/src/org/traccar/protocol/AplicomProtocolDecoder.java
+++ b/src/org/traccar/protocol/AplicomProtocolDecoder.java
@@ -568,7 +568,7 @@ public class AplicomProtocolDecoder extends BaseProtocolDecoder {
             position.set(Position.KEY_OBD_SPEED, buf.readUnsignedByte());
             position.set("speedMax", buf.readUnsignedByte());
             position.set("speedMin", buf.readUnsignedByte());
-            position.set("hardBreaking", buf.readUnsignedByte());
+            position.set("hardBraking", buf.readUnsignedByte());
         }
 
         if ((selector & 0x0200) != 0) {
diff --git a/src/org/traccar/protocol/AquilaProtocolDecoder.java b/src/org/traccar/protocol/AquilaProtocolDecoder.java
index 5ff974a7d..773210b04 100644
--- a/src/org/traccar/protocol/AquilaProtocolDecoder.java
+++ b/src/org/traccar/protocol/AquilaProtocolDecoder.java
@@ -81,7 +81,7 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
             .number("[01],")                     // corner packet
             .number("(?:d+,){6}")                // reserved
             .number("[01],")                     // hard acceleration
-            .number("[01],")                     // hard breaking
+            .number("[01],")                     // hard braking
             .number("[01],[01],[01],[01],")      // course bits
             .number("(d+),")                     // external voltage
             .number("(d+),")                     // internal voltage
@@ -115,7 +115,7 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
             .number("[01],")                     // do 1
             .number("[01],")                     // reserved
             .number("[01],")                     // hard acceleration
-            .number("[01],")                     // hard breaking
+            .number("[01],")                     // hard braking
             .number("(?:[01],){4}")              // reserved
             .number("(d+),")                     // external voltage
             .number("(d+),")                     // internal voltage
diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
index b9725337b..e41a42843 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -94,8 +94,8 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
             .number("(d+.d+),")                  // single fuel consumption
             .number("(d+.d+),")                  // total fuel consumption
             .number("(d+),")                     // error code count
-            .number("(d+),")                     // harsh acceleration count
-            .number("(d+)")                      // harsh break count
+            .number("(d+),")                     // hard acceleration count
+            .number("(d+)")                      // hard brake count
             .compile();
 
     private static final Pattern PATTERN_OBDA = new PatternBuilder()
@@ -106,8 +106,8 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
             .number("(d+),")                     // average speed
             .number("(d+),")                     // history highest speed
             .number("(d+),")                     // history highest rpm
-            .number("(d+),")                     // total harsh acceleration
-            .number("(d+)")                      // total harsh break n0
+            .number("(d+),")                     // total hard acceleration
+            .number("(d+)")                      // total hard brake
             .compile();
 
     public static final int MSG_HEARTBEAT = 0x0001;
@@ -201,7 +201,7 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
             case 0x53:
                 return Position.ALARM_GPS_ANTENNA_CUT;
             case 0x72:
-                return Position.ALARM_BREAKING;
+                return Position.ALARM_BRAKING;
             case 0x73:
                 return Position.ALARM_ACCELERATION;
             default:
@@ -301,8 +301,8 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
         position.set("singleFuelConsumption", parser.nextDouble());
         position.set("totalFuelConsumption", parser.nextDouble());
         position.set(Position.KEY_DTCS, parser.nextInt());
-        position.set("harshAcelerationNo", parser.nextInt());
-        position.set("harshBreakerNo", parser.nextInt());
+        position.set("hardAccelerationCount", parser.nextInt());
+        position.set("hardBrakingCount", parser.nextInt());
 
         return position;
     }
diff --git a/src/org/traccar/protocol/Pt502ProtocolDecoder.java b/src/org/traccar/protocol/Pt502ProtocolDecoder.java
index e12bbdf28..fef5d9b39 100644
--- a/src/org/traccar/protocol/Pt502ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Pt502ProtocolDecoder.java
@@ -67,7 +67,7 @@ public class Pt502ProtocolDecoder extends BaseProtocolDecoder {
             case "HDA":

                 return Position.ALARM_ACCELERATION;

             case "HDB":

-                return Position.ALARM_BREAKING;

+                return Position.ALARM_BRAKING;

             case "FDA":

                 return Position.ALARM_FATIGUE_DRIVING;

             case "SKA":

diff --git a/src/org/traccar/protocol/SuntechProtocolDecoder.java b/src/org/traccar/protocol/SuntechProtocolDecoder.java
index 320df9c94..6dfc6f77f 100644
--- a/src/org/traccar/protocol/SuntechProtocolDecoder.java
+++ b/src/org/traccar/protocol/SuntechProtocolDecoder.java
@@ -147,7 +147,7 @@ public class SuntechProtocolDecoder extends BaseProtocolDecoder {
             case 46:
                 return Position.ALARM_ACCELERATION;
             case 47:
-                return Position.ALARM_BREAKING;
+                return Position.ALARM_BRAKING;
             case 48:
                 return Position.ALARM_ACCIDENT;
             case 50:
diff --git a/src/org/traccar/protocol/TaipProtocolDecoder.java b/src/org/traccar/protocol/TaipProtocolDecoder.java
index 6edf4a93e..c6220ab1d 100644
--- a/src/org/traccar/protocol/TaipProtocolDecoder.java
+++ b/src/org/traccar/protocol/TaipProtocolDecoder.java
@@ -124,7 +124,7 @@ public class TaipProtocolDecoder extends BaseProtocolDecoder {
                     position.set(Position.KEY_ALARM, Position.ALARM_ACCELERATION);
                     break;
                 case 23:
-                    position.set(Position.KEY_ALARM, Position.ALARM_BREAKING);
+                    position.set(Position.KEY_ALARM, Position.ALARM_BRAKING);
                     break;
                 case 24:
                     position.set(Position.KEY_ALARM, Position.ALARM_ACCIDENT);
diff --git a/src/org/traccar/protocol/TzoneProtocolDecoder.java b/src/org/traccar/protocol/TzoneProtocolDecoder.java
index 69aa916df..76903c90c 100644
--- a/src/org/traccar/protocol/TzoneProtocolDecoder.java
+++ b/src/org/traccar/protocol/TzoneProtocolDecoder.java
@@ -43,7 +43,7 @@ public class TzoneProtocolDecoder extends BaseProtocolDecoder {
             case 0x11:
                 return Position.ALARM_OVERSPEED;
             case 0x14:
-                return Position.ALARM_BREAKING;
+                return Position.ALARM_BRAKING;
             case 0x15:
                 return Position.ALARM_ACCELERATION;
             case 0x30:
diff --git a/src/org/traccar/protocol/Vt200ProtocolDecoder.java b/src/org/traccar/protocol/Vt200ProtocolDecoder.java
index 6be70c3c1..2ae24efbb 100644
--- a/src/org/traccar/protocol/Vt200ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Vt200ProtocolDecoder.java
@@ -124,7 +124,7 @@ public class Vt200ProtocolDecoder extends BaseProtocolDecoder {
             position.set("maxRpm", buf.readUnsignedShort());
             position.set("maxTemp", buf.readUnsignedByte() - 40);
             position.set("hardAccelerationCount", buf.readUnsignedByte());
-            position.set("hardBreakingCount", buf.readUnsignedByte());
+            position.set("hardBrakingCount", buf.readUnsignedByte());
 
             for (String speedType : Arrays.asList("over", "high", "normal", "low")) {
                 position.set(speedType + "SpeedTime", buf.readUnsignedShort());
diff --git a/src/org/traccar/protocol/VtfmsProtocolDecoder.java b/src/org/traccar/protocol/VtfmsProtocolDecoder.java
index 852b9a749..5fb687e6d 100644
--- a/src/org/traccar/protocol/VtfmsProtocolDecoder.java
+++ b/src/org/traccar/protocol/VtfmsProtocolDecoder.java
@@ -84,7 +84,7 @@ public class VtfmsProtocolDecoder extends BaseProtocolDecoder {
             case 15:
                 return Position.ALARM_POWER_RESTORED;
             case 32:
-                return Position.ALARM_BREAKING;
+                return Position.ALARM_BRAKING;
             case 33:
                 return Position.ALARM_ACCELERATION;
             default: