Sungwoo Kim
/
HydraulicControlBoard_Base
distribution-201229
Diff: CAN/function_CAN.h
- Revision:
- 14:8e7590227d22
- Parent:
- 12:6f2531038ea4
- Child:
- 19:23b7c1ad8683
diff -r 747daba9cf59 -r 8e7590227d22 CAN/function_CAN.h --- a/CAN/function_CAN.h Tue Aug 27 06:50:54 2019 +0000 +++ b/CAN/function_CAN.h Thu Aug 29 07:38:00 2019 +0000 @@ -13,6 +13,7 @@ #define INIT_CID_RX_REF_PRES_DIFF 400 #define INIT_CID_RX_REF_VOUT 500 #define INIT_CID_RX_REF_VALVE_POSITION 600 +#define INIT_CID_RX_REF_CURRENT 700 #define INIT_CID_TX_INFO 1100 #define INIT_CID_TX_POSITION 1200 @@ -190,6 +191,7 @@ double err_int; double err_old; double err_diff; + double err_sum; public: State(){ sen = 0.0; @@ -210,6 +212,12 @@ extern State pres_A; extern State pres_B; extern State cur; +extern State valve_pos; + +extern State INIT_Vout; +extern State INIT_Valve_Pos; +extern State INIT_Pos; +extern State INIT_torq; // CAN Receive Functions void ReadCMD();