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

DataFlash: replaced "int" with "int16_t"

This commit is contained in:
rmackay9 2012-08-18 18:31:20 +09:00
parent e5d8efdb7e
commit 9973e4ae13
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/DataFlash/DataFlash.cpp
View File

@ -275,8 +275,8 @@ void DataFlash_Class::start_new_log(void)
// The first page may be greater than the last page if the DataFlash has been filled and partially overwritten. // The first page may be greater than the last page if the DataFlash has been filled and partially overwritten.
void DataFlash_Class::get_log_boundaries(uint8_t log_num, int16_t & start_page, int16_t & end_page) void DataFlash_Class::get_log_boundaries(uint8_t log_num, int16_t & start_page, int16_t & end_page)
{ {
int num = get_num_logs(); int16_t num = get_num_logs();
int look; int16_t look;
if(num == 1) if(num == 1)
{ {
@ -310,7 +310,7 @@ void DataFlash_Class::get_log_boundaries(uint8_t log_num, int16_t & start_page,
} }
} }
} }
if(start_page == (int)df_NumPages+1 || start_page == 0) start_page=1; if(start_page == (int16_t)df_NumPages+1 || start_page == 0) start_page=1;
end_page = find_last_page_of_log((uint16_t)log_num); end_page = find_last_page_of_log((uint16_t)log_num);
if(end_page <= 0) end_page = start_page; if(end_page <= 0) end_page = start_page;
} }
@ -326,15 +326,15 @@ bool DataFlash_Class::check_wrapped(void)
// This funciton finds the last log number // This funciton finds the last log number
int DataFlash_Class::find_last_log(void) int16_t DataFlash_Class::find_last_log(void)
{ {
int last_page = find_last_page(); int16_t last_page = find_last_page();
StartRead(last_page); StartRead(last_page);
return GetFileNumber(); return GetFileNumber();
} }
// This function finds the last page of the last file // This function finds the last page of the last file
int DataFlash_Class::find_last_page(void) int16_t DataFlash_Class::find_last_page(void)
{ {
uint16_t look; uint16_t look;
uint16_t bottom = 1; uint16_t bottom = 1;
@ -375,7 +375,7 @@ int DataFlash_Class::find_last_page(void)
} }
// This function finds the last page of a particular log file // This function finds the last page of a particular log file
int DataFlash_Class::find_last_page_of_log(uint16_t log_number) int16_t DataFlash_Class::find_last_page_of_log(uint16_t log_number)
{ {
uint16_t look; uint16_t look;
uint16_t bottom; uint16_t bottom;

8
libraries/DataFlash/DataFlash.h
View File

@ -36,11 +36,11 @@ class DataFlash_Class
virtual unsigned char BufferRead (unsigned char BufferNum, uint16_t IntPageAdr) = 0; virtual unsigned char BufferRead (unsigned char BufferNum, uint16_t IntPageAdr) = 0;
virtual void PageErase(uint16_t PageAdr) = 0; virtual void PageErase(uint16_t PageAdr) = 0;
virtual void BlockErase(uint16_t BlockAdr) = 0; virtual void BlockErase(uint16_t BlockAdr) = 0;
virtual void ChipErase(void (*delay_cb)(unsigned long)) = 0; virtual void ChipErase(void (*delay_cb)(uint32_t)) = 0;
// internal high level functions // internal high level functions
int find_last_page(void); int16_t find_last_page(void);
int find_last_page_of_log(uint16_t log_number); int16_t find_last_page_of_log(uint16_t log_number);
bool check_wrapped(void); bool check_wrapped(void);
public: public:
@ -83,7 +83,7 @@ class DataFlash_Class
uint16_t df_NumPages; uint16_t df_NumPages;
// high level interface // high level interface
int find_last_log(void); int16_t find_last_log(void);
void get_log_boundaries(uint8_t log_num, int16_t & start_page, int16_t & end_page); void get_log_boundaries(uint8_t log_num, int16_t & start_page, int16_t & end_page);
uint8_t get_num_logs(void); uint8_t get_num_logs(void);
void start_new_log(void); void start_new_log(void);