Match other frames

include/status/brake_frame.h

@@ -12,31 +12,40 @@
 
 class BrakeFrame : public ProcessFrame
 {
-public:
+  public:
+    enum BrakeState
+    {
+        INITIALISING = CANDATA_VCU2_AI_BRAKE_STATUS_BRK_INITIALISING_CHOICE,
+        READY = CANDATA_VCU2_AI_BRAKE_STATUS_BRK_READY_CHOICE,
+        SHUTTING_DOWN = CANDATA_VCU2_AI_BRAKE_STATUS_BRK_SHUTTING_DOWN_CHOICE,
+        SHUTDOWN_COMPLETE = CANDATA_VCU2_AI_BRAKE_STATUS_BRK_SHUTDOWN_COMPLETE_CHOICE,
+        FAULT = CANDATA_VCU2_AI_BRAKE_STATUS_BRK_FAULT_CHOICE
+    };
+
+    enum EbsState
+    {
+        UNAVAILABLE = CANDATA_VCU2_AI_BRAKE_STATUS_EBS_UNAVAILABLE_CHOICE,
+        ARMED = CANDATA_VCU2_AI_BRAKE_STATUS_EBS_ARMED_CHOICE,
+        TRIGGERED = CANDATA_VCU2_AI_BRAKE_STATUS_EBS_TRIGGERED_CHOICE
+    };
+
     const float front_hydrolic_brake() const;
     const float front_hydrolic_brake_request() const;
-    const float rear_hydroolic_brake() const;
-    const float rear_hydroolic_brake_request() const;
-    enum brake_status { initialising = CANDATA_VCU2_AI_BRAKE_STATUS_BRK_INITIALISING_CHOICE, 
-                        ready = CANDATA_VCU2_AI_BRAKE_STATUS_BRK_INITIALISING_CHOICE, 
-                        shutting_down = CANDATA_VCU2_AI_BRAKE_STATUS_BRK_INITIALISING_CHOICE, 
-                        shutdown_complete = CANDATA_VCU2_AI_BRAKE_STATUS_BRK_INITIALISING_CHOICE, 
-                        fault = CANDATA_VCU2_AI_BRAKE_STATUS_BRK_INITIALISING_CHOICE 
-                        };
-    const enum status_brake() const;
-    enum ebs_status { unavailable = CANDATA_VCU2_AI_EBS_STATUS_INITIALISING_CHOICE, 
-                      armed = CANDATA_VCU2_AI_EBS_STATUS_INITIALISING_CHOICE, 
-                      triggered = CANDATA_VCU2_AI_EBS_STATUS_INITIALISING_CHOICE};
-    const enum status_ebs() const;
+    const float rear_hydrolic_brake() const;
+    const float rear_hydrolic_brake_request() const;
+
+    const enum brake_state() const;
+
+    const enum ebs_state() const;
 
     BrakeFrame();
-    ~BrakeFrame();
+    virtual ~BrakeFrame() = default;
 
-private:
-    virtual void _process( const can_frame& frame ) override;
-    virtual void _print( std::ostream& os ) const override;
+  private:
+    virtual void _process( const can_frame &frame ) override;
+    virtual void _print( std::ostream &os ) const override;
 
-    std::variant<candata_vcu2_ai_drive_f_t, candata_vcu2_ai_drive_r_t> data;
+    candata_vcu2_ai_brake_t data;
 };
 
 #endif // BRAKE_FRAME_H