Feature add database

.gitignore

@@ -2,4 +2,5 @@
 */.idea
 *.pyc
 /logs
-.env
+.vs/*
+.env

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "python.linting.pylintEnabled": false,
     "python.linting.pep8Enabled": true,
-    "python.linting.enabled": true,
-    "python.linting.pep8Path": "pycodestyle"
+    "python.linting.enabled": false,
+    "python.linting.pep8Path": "pycodestyle",
 }

can_mgmt/CANID.h

@@ -1,4 +1,4 @@
-/* Generated on 2019-03-02 12:35:46.467557
+/* Generated on 2019-09-07 14:44:25.169641
 * This file contains all of the constants that are
 * being used on the CAN bus.
 *
@@ -9,17 +9,27 @@
 
 #ifndef CANID_H
 #define CANID_H
+#define RAW_THROTTLE_CAN_ID 0x500
+#define RAW_THROTTLE_ONE_START_BIT 0
+#define RAW_THROTTLE_ONE_END_BIT 7
+#define RAW_THROTTLE_TWO_START_BIT 8
+#define RAW_THROTTLE_TWO_END_BIT 15
+#define BRAKE_VALUE_ONE_START_BIT 16
+#define BRAKE_VALUE_ONE_END_BIT 23
+#define BRAKE_VALUE_TWO_START_BIT 24
+#define BRAKE_VALUE_TWO_END_BIT 31
+
 #define WHEEL_SPEED_FRONT_CAN_ID 0x700
 #define WHEEL_SPEED_FRONT_L_START_BIT 0
-#define WHEEL_SPEED_FRONT_L_END_BIT 15
-#define WHEEL_SPEED_FRONT_R_START_BIT 16
-#define WHEEL_SPEED_FRONT_R_END_BIT 31
+#define WHEEL_SPEED_FRONT_L_END_BIT 31
+#define WHEEL_SPEED_FRONT_R_START_BIT 32
+#define WHEEL_SPEED_FRONT_R_END_BIT 63
 
 #define WHEEL_SPEED_REAR_CAN_ID 0x701
 #define WHEEL_SPEED_REAR_L_START_BIT 0
-#define WHEEL_SPEED_REAR_L_END_BIT 15
-#define WHEEL_SPEED_REAR_R_START_BIT 16
-#define WHEEL_SPEED_REAR_R_END_BIT 31
+#define WHEEL_SPEED_REAR_L_END_BIT 31
+#define WHEEL_SPEED_REAR_R_START_BIT 32
+#define WHEEL_SPEED_REAR_R_END_BIT 63
 
 #define TIRE_TEMP_FRONT_CAN_ID 0x710
 #define TIRE_TEMP_FRONT_R_START_BIT 0
@@ -36,12 +46,14 @@
 #define COOLANT_CAN_ID 0x720
 #define COOLANT_MOTOR_START_BIT 0
 #define COOLANT_MOTOR_END_BIT 15
-#define COOLANT_FLOW_START_BIT 16
+#define COOLANT_RAD_START_BIT 16
+#define COOLANT_RAD_END_BIT 31
+#define COOLANT_MC_START_BIT 32
+#define COOLANT_MC_END_BIT 47
+
+#define COOLANT_CAN_ID 0x721
+#define COOLANT_FLOW_START_BIT 0
 #define COOLANT_FLOW_END_BIT 31
-#define COOLANT_RAD_START_BIT 32
-#define COOLANT_RAD_END_BIT 47
-#define COOLANT_MC_START_BIT 48
-#define COOLANT_MC_END_BIT 63
 
 #define SHOCK_POT_FRONT_CAN_ID 0x730
 #define SHOCK_POT_FRONT_L_START_BIT 0
@@ -61,65 +73,65 @@
 #define DROP_LINK_RIGHT_START_BIT 16
 #define DROP_LINK_RIGHT_END_BIT 31
 
-#define STEER_ROD_FRONT_CAN_ID 0x750
-#define STEER_ROD_FRONT_L_START_BIT 0
-#define STEER_ROD_FRONT_L_END_BIT 15
-#define PUSHROD_FRONT_R_START_BIT 16
-#define PUSHROD_FRONT_R_END_BIT 31
+#define PUSHROD_FRONT_CAN_ID 0x750
+#define PUSHROD_FRONT_R_START_BIT 0
+#define PUSHROD_FRONT_R_END_BIT 15
+#define STEER_ROD_FRONT_R_START_BIT 16
+#define STEER_ROD_FRONT_R_END_BIT 31
 #define PUSHROD_FRONT_L_START_BIT 32
 #define PUSHROD_FRONT_L_END_BIT 47
-#define STEER_ROD_FRONT_R_START_BIT 48
-#define STEER_ROD_FRONT_R_END_BIT 63
+#define STEER_ROD_FRONT_L_START_BIT 48
+#define STEER_ROD_FRONT_L_END_BIT 63
 
 #define PUSHROD_REAR_CAN_ID 0x760
 #define PUSHROD_REAR_R_START_BIT 0
 #define PUSHROD_REAR_R_END_BIT 15
-#define TIEROD_REAR_L_START_BIT 16
-#define TIEROD_REAR_L_END_BIT 31
-#define TIEROD_REAR_R_START_BIT 32
-#define TIEROD_REAR_R_END_BIT 47
-#define PUSHROD_REAR_L_START_BIT 48
-#define PUSHROD_REAR_L_END_BIT 63
+#define TIEROD_REAR_R_START_BIT 16
+#define TIEROD_REAR_R_END_BIT 31
+#define PUSHROD_REAR_L_START_BIT 32
+#define PUSHROD_REAR_L_END_BIT 47
+#define TIEROD_REAR_L_START_BIT 48
+#define TIEROD_REAR_L_END_BIT 63
 
 #define LCA_FRONT_CAN_ID 0x770
-#define LCA_FRONT_LB_START_BIT 0
-#define LCA_FRONT_LB_END_BIT 15
-#define LCA_FRONT_RF_START_BIT 16
-#define LCA_FRONT_RF_END_BIT 31
-#define LCA_FRONT_LF_START_BIT 32
-#define LCA_FRONT_LF_END_BIT 47
+#define LCA_FRONT_LF_START_BIT 0
+#define LCA_FRONT_LF_END_BIT 15
+#define LCA_FRONT_LB_START_BIT 16
+#define LCA_FRONT_LB_END_BIT 31
+#define LCA_FRONT_RF_START_BIT 32
+#define LCA_FRONT_RF_END_BIT 47
 #define LCA_FRONT_RB_START_BIT 48
 #define LCA_FRONT_RB_END_BIT 63
 
 #define LCA_REAR_CAN_ID 0x780
 #define LCA_REAR_LF_START_BIT 0
 #define LCA_REAR_LF_END_BIT 15
-#define LCA_REAR_RF_START_BIT 16
-#define LCA_REAR_RF_END_BIT 31
-#define LCA_REAR_LB_START_BIT 32
-#define LCA_REAR_LB_END_BIT 47
+#define LCA_REAR_LB_START_BIT 16
+#define LCA_REAR_LB_END_BIT 31
+#define LCA_REAR_RF_START_BIT 32
+#define LCA_REAR_RF_END_BIT 47
 #define LCA_REAR_RB_START_BIT 48
 #define LCA_REAR_RB_END_BIT 63
 
 #define UCA_FRONT_CAN_ID 0x790
-#define UCA_FRONT_RB_START_BIT 0
-#define UCA_FRONT_RB_END_BIT 15
+#define UCA_FRONT_LF_START_BIT 0
+#define UCA_FRONT_LF_END_BIT 15
 #define UCA_FRONT_LB_START_BIT 16
 #define UCA_FRONT_LB_END_BIT 31
 #define UCA_FRONT_RF_START_BIT 32
 #define UCA_FRONT_RF_END_BIT 47
-#define UCA_FRONT_LF_START_BIT 48
-#define UCA_FRONT_LF_END_BIT 63
+#define UCA_FRONT_RB_START_BIT 48
+#define UCA_FRONT_RB_END_BIT 63
 
 #define UCA_REAR_CAN_ID 0x7a0
 #define UCA_REAR_LF_START_BIT 0
 #define UCA_REAR_LF_END_BIT 15
-#define UCA_REAR_RB_START_BIT 16
-#define UCA_REAR_RB_END_BIT 31
-#define UCA_REAR_LB_START_BIT 32
-#define UCA_REAR_LB_END_BIT 47
-#define UCA_REAR_RF_START_BIT 48
-#define UCA_REAR_RF_END_BIT 63
+#define UCA_REAR_LB_START_BIT 16
+#define UCA_REAR_LB_END_BIT 31
+#define UCA_REAR_RF_START_BIT 32
+#define UCA_REAR_RF_END_BIT 47
+#define UCA_REAR_RB_START_BIT 48
+#define UCA_REAR_RB_END_BIT 63
 
 #define FRONT_TORSIONAL_CAN_ID 0x7b0
 #define FRONT_TORSIONAL_ARB_START_BIT 0
@@ -135,27 +147,46 @@
 #define STEERING_ANGLE_START_BIT 16
 #define STEERING_ANGLE_END_BIT 31
 
-#define IMU_CAN_ID 0x7d0
-#define IMU_TYPE_START_BIT 0
-#define IMU_TYPE_END_BIT 7
-#define IMU_DATA_START_BIT 8
-#define IMU_DATA_END_BIT 23
-#define IMU_TIME_START_BIT 24
-#define IMU_TIME_END_BIT 47
-
-#define FLAG_WHEEL_SPEED_BIT 7
-#define FLAG_TIRE_TEMP_BIT 6
-#define FLAG_COOLANT_TEMP_BIT 5
-#define FLAG_COOLANT_FLOW_BIT 4
-#define FLAG_SHOCK_POTS_BIT 3
-#define FLAG_ARB_DROPLINKS_BIT 2
-#define FLAG_PUSH_RODS_BIT 1
-#define FLAG_TIRE_RODS_BIT 0
-#define FLAG_LCA_BIT 15
-#define FLAG_UCA_BIT 14
-#define FLAG_ARB_TORSIONAL_BIT 13
-#define FLAG_STEERING_ANGLE_BIT 12
-#define FLAG_STEERING_TORSIONAL_BIT 11
-#define FLAG_ACCELEROMETER_BIT 10
-#define FLAG_GYROSCOPE_BIT 9
+#define IMU_TYPE_CAN_ID 0x7d0
+#define IMU_TYPE_AXIS_START_BIT 0
+#define IMU_TYPE_AXIS_END_BIT 7
+#define IMU_X_AXIS_START_BIT 8
+#define IMU_X_AXIS_END_BIT 23
+#define IMU_Y_AXIS_START_BIT 24
+#define IMU_Y_AXIS_END_BIT 39
+#define IMU_Z_AXIS_START_BIT 40
+#define IMU_Z_AXIS_END_BIT 55
+#define IMU_RESOLUTION_START_BIT 56
+#define IMU_RESOLUTION_END_BIT 63
+
+#define L_WHEEL_SPD_CAN_ID 0x7f0
+#define L_WHEEL_SPD_ERROR_START_BIT 0
+#define L_WHEEL_SPD_ERROR_END_BIT 7
+#define R_WHEEL_SPEED_ERROR_START_BIT 8
+#define R_WHEEL_SPEED_ERROR_END_BIT 15
+#define MAX11614_ERROR_START_BIT 16
+#define MAX11614_ERROR_END_BIT 23
+#define MAX11616_ERROR_START_BIT 24
+#define MAX11616_ERROR_END_BIT 31
+
+#define L_WHEEL_SPD_CAN_ID 0x7f1
+#define L_WHEEL_SPD_ERROR_START_BIT 0
+#define L_WHEEL_SPD_ERROR_END_BIT 7
+#define R_WHEEL_SPEED_ERROR_START_BIT 8
+#define R_WHEEL_SPEED_ERROR_END_BIT 15
+#define MAX11614_ERROR_START_BIT 16
+#define MAX11614_ERROR_END_BIT 23
+#define MAX11616_ERROR_START_BIT 24
+#define MAX11616_ERROR_END_BIT 31
+#define COOL_SPD_ERROR_START_BIT 32
+#define COOL_SPD_ERROR_END_BIT 39
+
+#define FLAG_SPEED_CAN_MASK_BIT 7
+#define FLAG_UCA_CAN_MASK _BIT 6
+#define FLAG_LCA_CAN_MASK   _BIT 5
+#define FLAG_SHOCK_CAN_MASK  _BIT 4
+#define FLAG_ARB_TORS_CAN_MASK _BIT 3
+#define FLAG_PUSH_ROD_CAN_MASK _BIT 2
+#define FLAG_COOLANT_CAN_MASK  _BIT 1
+#define FLAG_DROP_LINK_CAN_MASK_BIT 0
 #endif /* CANID_H */