Move global variable to PolicyManager member

[apps/agl-service-windowmanager.git] / src / low_can_client.hpp

diff --git a/src/low_can_client.hpp b/src/low_can_client.hpp
index 58d0d8f..3eb654e 100644 (file)
--- a/src/low_can_client.hpp
+++ b/src/low_can_client.hpp
@@ -31,28 +31,13 @@ public:
     explicit LowCanClient();
     ~LowCanClient() = default;
 
-    void initialize();
-    void analyzeCanSignal(struct json_object *object);
-    bool isChangedLampState();
-    bool isChangedParkingBrakeState();
-    bool isChangedAccelPedalState();
-    const char* getCurrentLampState();
-    const char* getCurrentParkingBrakeState();
-    const char* getCurrentAccelPedalState();
-
-private:
-    // Disable copy and move
-    LowCanClient(LowCanClient const &) = delete;
-    LowCanClient &operator=(LowCanClient const &) = delete;
-    LowCanClient(LowCanClient &&) = delete;
-    LowCanClient &operator=(LowCanClient &&) = delete;
-
     enum SignalNo {
         SignalNoVehicliSpeed = 0,
         SignalNoTransGearPos,
         SignalNoHeadlame,
         SignalNoParkingBrake,
         SignalNoAccelPedalPos,
+        SignalNoLightstatusBrake,
 
         SignalNum,
 
@@ -60,38 +45,65 @@ private:
         SignalNoMax = SignalNum - 1,
     };
 
-    const std::vector<const char*> kEventName_{
+    const std::vector<const char*> kSignalName{
         "vehicle.speed",
         "transmission_gear_position",
         "headlamp_status",
         "parking_brake_status",
         "accelerator.pedal.position",
+        "lightstatus.brake",
     };
 
-    const std::vector<const char*> kFilterValue_{
-        "",
-        "",
-        "",
-        "",
-        "", //"{ \"min\": 0, \"max\": 10}",
+    void initialize();
+    const char* analyzeCanSignal(struct json_object *object);
+
+    int getCurrentTransGearState();
+    bool getCurrentHeadlampState();
+    bool getCurrentParkingBrakeState();
+    double getCurrentAccelPedalPosition();
+    bool getCurrentAccelPedalState();
+    bool getCurrentLightstatusBrakeState();
+
+    bool isChangedAccelPedalState();
+
+private:
+    // Disable copy and move
+    LowCanClient(LowCanClient const &) = delete;
+    LowCanClient &operator=(LowCanClient const &) = delete;
+    LowCanClient(LowCanClient &&) = delete;
+    LowCanClient &operator=(LowCanClient &&) = delete;
+
+    enum TransGearPosVal {
+        TransGearPosValD1 = 1,
+        TransGearPosValD2,
+        TransGearPosValD3,
+        TransGearPosValD4,
+        TransGearPosValD5,
+        TransGearPosValD6,
+        TransGearPosValD7,
+        TransGearPosValD8,
+        TransGearPosValR,
+        TransGearPosValN,
     };
 
-    int vehicle_speed_;
-    int trans_gear_pos_;
-    json_bool headlamp_status_;
-    json_bool parking_brake_status_;
-    double accel_pedal_pos_;
-
-    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_lamp_state_;
-    bool is_changed_parking_brake_state_;
-    bool is_changed_accel_pedal_state_;
+    const std::vector<const char*> kFilterValue{
+        "", // vehicle.speed
+        "", // transmission_gear_position
+        "", // headlamp_status
+        "", // parking_brake_status
+        "", // accelerator.pedal.position
+        "", // lightstatus.brake
+    };
+
+    int vehicle_speed;
+    int trans_gear_pos;
+    json_bool headlamp_status;
+    json_bool parking_brake_status;
+    double accel_pedal_pos;
+    bool accel_pedal_stt;
+    json_bool lightstatus_brake_status;
+
+    bool is_changed_accel_pedal_stt;
 };
 
 } // namespace wm