diff options
author | 2018-06-20 21:17:41 +0900 | |
---|---|---|
committer | 2018-06-20 21:17:41 +0900 | |
commit | 64643feb50a184030a6f25ba9354d5fe41df49c8 (patch) | |
tree | bbd2d04b20e41c17e22933790cb079ab7fc2470d /src/main.cpp | |
parent | cffad8be821cf9226bce993f18a2451fc9fd8646 (diff) |
Modify member variable name
Change-Id: Ic9100cfc33c664d3dfa935c4c7131efd8dd2f1f7
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index e07c2a1..f7ec927 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,10 +40,10 @@ typedef struct wmClientCtxt{ struct afb_instance { std::unique_ptr<wl::display> display; - wm::LowCanClient lcc_; + wm::LowCanClient lcc; wm::App app; - afb_instance() : display{new wl::display}, lcc_{}, app{this->display.get()} {} + afb_instance() : display{new wl::display}, lcc{}, app{this->display.get()} {} int init(); }; @@ -53,7 +53,7 @@ std::mutex binding_m; int afb_instance::init() { // Initialize LowCanClient class - this->lcc_.initialize(); + this->lcc.initialize(); // Initialize App class return this->app.init(); @@ -654,7 +654,7 @@ void on_event(const char *event, struct json_object *object){ // If receive low can signal if (strstr(event, "low-can")) { - wm::LowCanClient *lcc = &(g_afb_instance->lcc_); + wm::LowCanClient *lcc = &(g_afb_instance->lcc); wm::App *app = &(g_afb_instance->app); // Analyze low can signal @@ -662,7 +662,7 @@ void on_event(const char *event, struct json_object *object){ // If car info is updated, set event name const char *can_event = nullptr; - if (strstr(signal_name, lcc->kSignalName_[lcc->SignalNoParkingBrake])) { + if (strstr(signal_name, lcc->kSignalName[lcc->SignalNoParkingBrake])) { HMI_DEBUG("wm", "Parking Brake state is changed"); // Set event @@ -673,7 +673,7 @@ void on_event(const char *event, struct json_object *object){ can_event = "parking_brake_off"; } } - else if (strstr(signal_name, lcc->kSignalName_[lcc->SignalNoAccelPedalPos])) { + else if (strstr(signal_name, lcc->kSignalName[lcc->SignalNoAccelPedalPos])) { // Update accel pedal position app->setAccelPedalPos(lcc->getCurrentAccelPedalPosition()); @@ -689,7 +689,7 @@ void on_event(const char *event, struct json_object *object){ } } } - else if (strstr(signal_name, lcc->kSignalName_[lcc->SignalNoHeadlame])) { + else if (strstr(signal_name, lcc->kSignalName[lcc->SignalNoHeadlame])) { HMI_DEBUG("wm", "Headlamp state is changed"); // Set event @@ -700,7 +700,7 @@ void on_event(const char *event, struct json_object *object){ can_event = "headlamp_off"; } } - else if (strstr(signal_name, lcc->kSignalName_[lcc->SignalNoLightstatusBrake])) { + else if (strstr(signal_name, lcc->kSignalName[lcc->SignalNoLightstatusBrake])) { HMI_DEBUG("wm", "Lightstatus Brake state is changed"); // Set event |