Browse Source

add log num

master
z 5 years ago
parent
commit
c3f401111f
  1. 2
      .gitignore
  2. 2
      ArduCopter/Parameters.cpp
  3. 2
      ArduCopter/version.h
  4. 4
      libraries/AP_Logger/AP_Logger.cpp
  5. 3
      libraries/AP_Logger/AP_Logger.h

2
.gitignore vendored

@ -123,3 +123,5 @@ segv_*out
/ArduPlane/scripts/ /ArduPlane/scripts/
/ArduSub/scripts/ /ArduSub/scripts/
persistent.dat persistent.dat
.history

2
ArduCopter/Parameters.cpp

@ -1633,7 +1633,7 @@ const char* Copter::get_sysid_board_id(void)
int32_t nameValue2 = (int32_t)g.sysid_board_name_2nd; int32_t nameValue2 = (int32_t)g.sysid_board_name_2nd;
// snprintf(buf, sizeof(buf), "Version: zr-v4.0.1 ,Board ID: ZRZK.20QT2.%d",(int)nameValue2); // snprintf(buf, sizeof(buf), "Version: zr-v4.0.1 ,Board ID: ZRZK.20QT2.%d",(int)nameValue2);
snprintf(buf, sizeof(buf), "Version: zr-v4.0.2 ,ID: RS100%04d%05d",(int)nameValue1,(int)nameValue2); snprintf(buf, sizeof(buf), "Version: zr-v4.0.3 ,ID: RS100%04d%05d",(int)nameValue1,(int)nameValue2);
AP::logger().Write_Message(buf); AP::logger().Write_Message(buf);
return buf; return buf;
} }

2
ArduCopter/version.h

@ -9,7 +9,7 @@
#define THISFIRMWARE "ZRUAV" //"ArduCopter V4.0.0" #define THISFIRMWARE "ZRUAV" //"ArduCopter V4.0.0"
// the following line is parsed by the autotest scripts // the following line is parsed by the autotest scripts
#define FIRMWARE_VERSION 4,0,0,FIRMWARE_VERSION_TYPE_OFFICIAL #define FIRMWARE_VERSION 4,0,3,FIRMWARE_VERSION_TYPE_OFFICIAL
#define FW_MAJOR 4 #define FW_MAJOR 4
#define FW_MINOR 0 #define FW_MINOR 0

4
libraries/AP_Logger/AP_Logger.cpp

@ -93,6 +93,9 @@ const AP_Param::GroupInfo AP_Logger::var_info[] = {
// @Units: s // @Units: s
AP_GROUPINFO("_FILE_TIMEOUT", 6, AP_Logger, _params.file_timeout, HAL_LOGGING_FILE_TIMEOUT), AP_GROUPINFO("_FILE_TIMEOUT", 6, AP_Logger, _params.file_timeout, HAL_LOGGING_FILE_TIMEOUT),
AP_GROUPINFO("_LAST_LOG", 7, AP_Logger, _params.last_log_num, 0),
AP_GROUPEND AP_GROUPEND
}; };
@ -211,6 +214,7 @@ void AP_Logger::Init(const struct LogStructure *structures, uint8_t num_types)
EnableWrites(true); EnableWrites(true);
gcs().send_text(MAV_SEVERITY_INFO, "Prepared log system"); gcs().send_text(MAV_SEVERITY_INFO, "Prepared log system");
set_last_log_num();
} }
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL #if CONFIG_HAL_BOARD == HAL_BOARD_SITL

3
libraries/AP_Logger/AP_Logger.h

@ -338,8 +338,11 @@ public:
AP_Int8 log_replay; AP_Int8 log_replay;
AP_Int8 mav_bufsize; // in kilobytes AP_Int8 mav_bufsize; // in kilobytes
AP_Int16 file_timeout; // in seconds AP_Int16 file_timeout; // in seconds
AP_Int16 last_log_num; // in seconds
} _params; } _params;
void set_last_log_num() { _params.last_log_num = find_last_log() ; }
const struct LogStructure *structure(uint16_t num) const; const struct LogStructure *structure(uint16_t num) const;
const struct UnitStructure *unit(uint16_t num) const; const struct UnitStructure *unit(uint16_t num) const;
const struct MultiplierStructure *multiplier(uint16_t num) const; const struct MultiplierStructure *multiplier(uint16_t num) const;

Loading…
Cancel
Save