X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow_can_client.hpp;h=4bc3747af74eac3cd5e8dfa061e015981dd90643;hb=5b404b92f28630649d1a4063339a3d2663072a55;hp=2941e6e8e97bcb02689d7a0f3210e5743c8bc282;hpb=160b8947d684ce037120cf5237bd221bd9ea9785;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/low_can_client.hpp b/src/low_can_client.hpp
index 2941e6e..4bc3747 100644
--- a/src/low_can_client.hpp
+++ b/src/low_can_client.hpp
@@ -31,16 +31,37 @@ public:
     explicit LowCanClient();
     ~LowCanClient() = default;
 
+    enum SignalNo {
+        SignalNoVehicliSpeed = 0,
+        SignalNoTransGearPos,
+        SignalNoHeadlame,
+        SignalNoParkingBrake,
+        SignalNoAccelPedalPos,
+
+        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",
+    };
+
     void initialize();
-    void analyzeCanSignal(struct json_object *object);
-    bool isChangedLampState();
-    bool isChangedParkingBrakeState();
+    const char* analyzeCanSignal(struct json_object *object);
+
+    int getCurrentTransGearState();
+    bool getCurrentHeadlampState();
+    bool getCurrentParkingBrakeState();
+    double getCurrentAccelPedalPosition();
+    bool getCurrentAccelPedalState();
+
     bool isChangedAccelPedalState();
-    bool isChangedCarState();
-    const char* getCurrentLampState();
-    const char* getCurrentParkingBrakeState();
-    const char* getCurrentAccelPedalState();
-    const char* getCurrentCarState();
 
 private:
     // Disable copy and move
@@ -49,12 +70,25 @@ private:
     LowCanClient(LowCanClient &&) = delete;
     LowCanClient &operator=(LowCanClient &&) = delete;
 
-    const std::vector<const char*> kEventName_{
-        "vehicle.speed",
-        "transmission_gear_position",
-        "headlamp_status",
-        "parking_brake_status",
-        "accelerator.pedal.position",
+    enum TransGearPosVal {
+        TransGearPosValD1 = 1,
+        TransGearPosValD2,
+        TransGearPosValD3,
+        TransGearPosValD4,
+        TransGearPosValD5,
+        TransGearPosValD6,
+        TransGearPosValD7,
+        TransGearPosValD8,
+        TransGearPosValR,
+        TransGearPosValN,
+    };
+
+    const std::vector<const char*> kFilterValue_{
+        "",
+        "",
+        "",
+        "",
+        "", //"{ \"min\": 0, \"max\": 10}",
     };
 
     int vehicle_speed_;
@@ -62,20 +96,9 @@ private:
     json_bool headlamp_status_;
     json_bool parking_brake_status_;
     double accel_pedal_pos_;
+    bool accel_pedal_stt_;
 
-    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_;
-    std::string prv_car_state_;
-    std::string crr_car_state_;
-
-    bool is_changed_lamp_state_;
-    bool is_changed_parking_brake_state_;
-    bool is_changed_accel_pedal_state_;
-    bool is_changed_car_state_;
+    bool is_changed_accel_pedal_stt_;
 };
 
 } // namespace wm