Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rover: CUR and CURR renamed to CURRENT in dataflash 

Based on user complaint re inconsistency of disabling/enabling and
output in dataflash
This commit is contained in:
Randy Mackay 2013-01-26 17:41:38 +09:00
parent 648caff1c6
commit bb21194fd7
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APMrover2/APMrover2.pde
View File

@ -894,7 +894,7 @@ static void slow_loop()
static void one_second_loop() static void one_second_loop()
{ {
#if LITE == DISABLED #if LITE == DISABLED
if (g.log_bitmask & MASK_LOG_CUR) if (g.log_bitmask & MASK_LOG_CURRENT)
Log_Write_Current(); Log_Write_Current();
#endif #endif
// send a heartbeat // send a heartbeat

6
APMrover2/Log.pde
View File

@ -57,7 +57,7 @@ print_log_menu(void)
PLOG(MODE); PLOG(MODE);
PLOG(IMU); PLOG(IMU);
PLOG(CMD); PLOG(CMD);
PLOG(CUR); PLOG(CURRENT);
#undef PLOG #undef PLOG
} }
@ -178,7 +178,7 @@ select_logs(uint8_t argc, const Menu::arg *argv)
TARG(MODE); TARG(MODE);
TARG(IMU); TARG(IMU);
TARG(CMD); TARG(CMD);
TARG(CUR); TARG(CURRENT);
#undef TARG #undef TARG
} }
@ -370,7 +370,7 @@ static void Log_Write_Current()
// Read a Current packet // Read a Current packet
static void Log_Read_Current() static void Log_Read_Current()
{ {
cliSerial->printf_P(PSTR("CURR, %d, %4.4f, %4.4f, %d\n"), cliSerial->printf_P(PSTR("CURRENT, %d, %4.4f, %4.4f, %d\n"),
DataFlash.ReadInt(), DataFlash.ReadInt(),
((float)DataFlash.ReadInt() / 100.f), ((float)DataFlash.ReadInt() / 100.f),
((float)DataFlash.ReadInt() / 100.f), ((float)DataFlash.ReadInt() / 100.f),

6
APMrover2/config.h
View File

@ -661,8 +661,8 @@
#ifndef LOG_CMD #ifndef LOG_CMD
# define LOG_CMD ENABLED # define LOG_CMD ENABLED
#endif #endif
#ifndef LOG_CUR #ifndef LOG_CURRENT
# define LOG_CUR DISABLED # define LOG_CURRENT DISABLED
#endif #endif
// calculate the default log_bitmask // calculate the default log_bitmask
@ -678,7 +678,7 @@
LOGBIT(MODE) | \ LOGBIT(MODE) | \
LOGBIT(IMU) | \ LOGBIT(IMU) | \
LOGBIT(CMD) | \ LOGBIT(CMD) | \
LOGBIT(CUR) LOGBIT(CURRENT)
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

2
APMrover2/defines.h
View File

@ -157,7 +157,7 @@ enum gcs_severity {
#define MASK_LOG_MODE (1<<6) #define MASK_LOG_MODE (1<<6)
#define MASK_LOG_IMU (1<<7) #define MASK_LOG_IMU (1<<7)
#define MASK_LOG_CMD (1<<8) #define MASK_LOG_CMD (1<<8)
#define MASK_LOG_CUR (1<<9) #define MASK_LOG_CURRENT (1<<9)
// Waypoint Modes // Waypoint Modes
// ---------------- // ----------------