X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow_can_client.hpp;h=390d7520b49bcbb9c2b0a4b71720a29ef7ec52bd;hb=d3125b444d35384eb6db60462c184717e20fca82;hp=9cd10e218878d13a2b4a85a1d8039ed468b2a19d;hpb=a21dd2b748731f1bbe956da6d22a87cc1412de30;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/low_can_client.hpp b/src/low_can_client.hpp
index 9cd10e2..390d752 100644
--- a/src/low_can_client.hpp
+++ b/src/low_can_client.hpp
@@ -31,16 +31,40 @@ public:
     explicit LowCanClient();
     ~LowCanClient() = default;
 
+    enum SignalNo {
+        SignalNoVehicliSpeed = 0,
+        SignalNoTransGearPos,
+        SignalNoHeadlame,
+        SignalNoParkingBrake,
+        SignalNoAccelPedalPos,
+        SignalNoLightstatusBrake,
+
+        SignalNum,
+
+        SignalNoMin = SignalNoVehicliSpeed,
+        SignalNoMax = SignalNum - 1,
+    };
+
+    const std::vector<const char*> kSignalName_{
+        "vehicle.speed",
+        "transmission_gear_position",
+        "headlamp_status",
+        "parking_brake_status",
+        "accelerator.pedal.position",
+        "lightstatus.brake",
+    };
+
     void initialize();
-    void analyzeCanSignal(struct json_object *object);
-    bool isChangedTransGearState();
-    bool isChangedLampState();
-    bool isChangedParkingBrakeState();
+    const char* analyzeCanSignal(struct json_object *object);
+
+    int getCurrentTransGearState();
+    bool getCurrentHeadlampState();
+    bool getCurrentParkingBrakeState();
+    double getCurrentAccelPedalPosition();
+    bool getCurrentAccelPedalState();
+    bool getCurrentLightstatusBrakeState();
+
     bool isChangedAccelPedalState();
-    const char* getCurrentTransGearState();
-    const char* getCurrentLampState();
-    const char* getCurrentParkingBrakeState();
-    const char* getCurrentAccelPedalState();
 
 private:
     // Disable copy and move
@@ -62,33 +86,13 @@ private:
         TransGearPosValN,
     };
 
-    enum SignalNo {
-        SignalNoVehicliSpeed = 0,
-        SignalNoTransGearPos,
-        SignalNoHeadlame,
-        SignalNoParkingBrake,
-        SignalNoAccelPedalPos,
-
-        SignalNum,
-
-        SignalNoMin = SignalNoVehicliSpeed,
-        SignalNoMax = SignalNum - 1,
-    };
-
-    const std::vector<const char*> kEventName_{
-        "vehicle.speed",
-        "transmission_gear_position",
-        "headlamp_status",
-        "parking_brake_status",
-        "accelerator.pedal.position",
-    };
-
     const std::vector<const char*> kFilterValue_{
-        "",
-        "",
-        "",
-        "",
-        "", //"{ \"min\": 0, \"max\": 10}",
+        "", // vehicle.speed
+        "", // transmission_gear_position
+        "", // headlamp_status
+        "", // parking_brake_status
+        "", // accelerator.pedal.position
+        "", // lightstatus.brake
     };
 
     int vehicle_speed_;
@@ -96,20 +100,10 @@ private:
     json_bool headlamp_status_;
     json_bool parking_brake_status_;
     double accel_pedal_pos_;
+    bool accel_pedal_stt_;
+    json_bool lightstatus_brake_status_;
 
-    std::string prv_trans_gear_state_;
-    std::string crr_trans_gear_state_;
-    std::string prv_lamp_state_;
-    std::string crr_lamp_state_;
-    std::string prv_parking_brake_state_;
-    std::string crr_parking_brake_state_;
-    std::string prv_accel_pedal_state_;
-    std::string crr_accel_pedal_state_;
-
-    bool is_changed_trans_gear_state_;
-    bool is_changed_lamp_state_;
-    bool is_changed_parking_brake_state_;
-    bool is_changed_accel_pedal_state_;
+    bool is_changed_accel_pedal_stt_;
 };
 
 } // namespace wm