Merged with master

This commit is contained in:
Lorenz Meier
2013-01-08 21:25:38 +01:00
3 changed files with 15 additions and 1 deletions
+8
View File
@@ -131,6 +131,13 @@ enum VEHICLE_TYPE {
VEHICLE_TYPE_ENUM_END=18, /* | */
};
enum VEHICLE_BATTERY_WARNING {
VEHICLE_BATTERY_WARNING_NONE = 0, /**< no battery low voltage warning active */
VEHICLE_BATTERY_WARNING_WARNING, /**< warning of low voltage 1. stage */
VEHICLE_BATTERY_WARNING_ALERT /**< aleting of low voltage 2. stage */
};
/**
* state machine / state of vehicle.
*
@@ -188,6 +195,7 @@ struct vehicle_status_s
float voltage_battery;
float current_battery;
float battery_remaining;
enum VEHICLE_BATTERY_WARNING battery_warning; /**< current battery warning mode, as defined by VEHICLE_BATTERY_WARNING enum */
uint16_t drop_rate_comm;
uint16_t errors_comm;
uint16_t errors_count1;