Waiting for the surface of new app is created before setting the size

[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..4bc3747 100644 (file)
--- a/src/low_can_client.hpp
+++ b/src/low_can_client.hpp
@@ -31,22 +31,6 @@ 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,
@@ -60,7 +44,7 @@ private:
         SignalNoMax = SignalNum - 1,
     };
 
-    const std::vector<const char*> kEventName_{
+    const std::vector<const char*> kSignalName_{
         "vehicle.speed",
         "transmission_gear_position",
         "headlamp_status",
@@ -68,6 +52,37 @@ private:
         "accelerator.pedal.position",
     };
 
+    void initialize();
+    const char* analyzeCanSignal(struct json_object *object);
+
+    int getCurrentTransGearState();
+    bool getCurrentHeadlampState();
+    bool getCurrentParkingBrakeState();
+    double getCurrentAccelPedalPosition();
+    bool getCurrentAccelPedalState();
+
+    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,
+    };
+
     const std::vector<const char*> kFilterValue_{
         "",
         "",
@@ -81,17 +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_;
-
-    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