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

AP_Logger: use nullptr

This commit is contained in:
Pierre Kancir 2022-01-03 14:35:29 +01:00 committed by Peter Barker
parent fdfdc9f999
commit 4add35355e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Logger/AP_Logger.cpp
View File

@ -250,7 +250,7 @@ const char* AP_Logger::unit_name(const uint8_t unit_id)
return _units[i].unit; return _units[i].unit;
} }
} }
return NULL; return nullptr;
} }
/// return a multiplier value given its ID /// return a multiplier value given its ID

12
libraries/AP_Logger/AP_Logger_DataFlash.cpp
View File

@ -184,7 +184,7 @@ void AP_Logger_DataFlash::Enter4ByteAddressMode(void)
WITH_SEMAPHORE(dev_sem); WITH_SEMAPHORE(dev_sem);
const uint8_t cmd = 0xB7; const uint8_t cmd = 0xB7;
dev->transfer(&cmd, 1, NULL, 0); dev->transfer(&cmd, 1, nullptr, 0);
} }
/* /*
@ -205,7 +205,7 @@ void AP_Logger_DataFlash::send_command_addr(uint8_t command, uint32_t PageAdr)
cmd[3] = (PageAdr >> 0) & 0xff; cmd[3] = (PageAdr >> 0) & 0xff;
} }
dev->transfer(cmd, use_32bit_address?5:4, NULL, 0); dev->transfer(cmd, use_32bit_address?5:4, nullptr, 0);
} }
@ -223,7 +223,7 @@ void AP_Logger_DataFlash::PageToBuffer(uint32_t pageNum)
WITH_SEMAPHORE(dev_sem); WITH_SEMAPHORE(dev_sem);
dev->set_chip_select(true); dev->set_chip_select(true);
send_command_addr(JEDEC_READ_DATA, PageAdr); send_command_addr(JEDEC_READ_DATA, PageAdr);
dev->transfer(NULL, 0, buffer, df_PageSize); dev->transfer(nullptr, 0, buffer, df_PageSize);
dev->set_chip_select(false); dev->set_chip_select(false);
} }
@ -241,7 +241,7 @@ void AP_Logger_DataFlash::BufferToPage(uint32_t pageNum)
dev->set_chip_select(true); dev->set_chip_select(true);
send_command_addr(JEDEC_PAGE_WRITE, PageAdr); send_command_addr(JEDEC_PAGE_WRITE, PageAdr);
dev->transfer(buffer, df_PageSize, NULL, 0); dev->transfer(buffer, df_PageSize, nullptr, 0);
dev->set_chip_select(false); dev->set_chip_select(false);
} }
@ -277,7 +277,7 @@ void AP_Logger_DataFlash::StartErase()
WITH_SEMAPHORE(dev_sem); WITH_SEMAPHORE(dev_sem);
uint8_t cmd = JEDEC_BULK_ERASE; uint8_t cmd = JEDEC_BULK_ERASE;
dev->transfer(&cmd, 1, NULL, 0); dev->transfer(&cmd, 1, nullptr, 0);
erase_start_ms = AP_HAL::millis(); erase_start_ms = AP_HAL::millis();
printf("Dataflash: erase started\n"); printf("Dataflash: erase started\n");
@ -297,7 +297,7 @@ void AP_Logger_DataFlash::WriteEnable(void)
WaitReady(); WaitReady();
WITH_SEMAPHORE(dev_sem); WITH_SEMAPHORE(dev_sem);
uint8_t b = JEDEC_WRITE_ENABLE; uint8_t b = JEDEC_WRITE_ENABLE;
dev->transfer(&b, 1, NULL, 0); dev->transfer(&b, 1, nullptr, 0);
} }
void AP_Logger_DataFlash::flash_test() void AP_Logger_DataFlash::flash_test()

2
libraries/AP_Logger/AP_Logger_File.cpp
View File

@ -505,7 +505,7 @@ uint16_t AP_Logger_File::find_last_log()
FileData *fd = AP::FS().load_file(fname); FileData *fd = AP::FS().load_file(fname);
free(fname); free(fname);
if (fd != nullptr) { if (fd != nullptr) {
ret = strtol((const char *)fd->data, NULL, 10); ret = strtol((const char *)fd->data, nullptr, 10);
delete fd; delete fd;
} }
return ret; return ret;