fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 02:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

PX4 System:Expunge the nuttx adc structure from the system

Browse Source 
This PR is preliminary ground work for FMUv5.

   PX4 does not use the NuttX adc driver. But used the same format
   for the data returned by the nuttx ADC driver.

   There was a fixme:in src/platforms/px4_adc.h "this needs to be
   a px4_adc_msg_s type" With this PR the need for
   src/platforms/px4_adc.h goes away as the driver drv_adc.h now
   describes the px4_adc_msg_t.
This commit is contained in:
David Sidrane
2017-07-17 22:28:29 +02:00
committed by Lorenz Meier
parent d92377a6e6
commit 4349f49610
13 changed files with 50 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/navio_adc/navio_adc.cpp
+5 -6
View File
@@ -44,7 +44,6 @@
#include <px4_config.h>
#include <px4_tasks.h>
#include <px4_posix.h>
#include <px4_adc.h>
#include <drivers/drv_adc.h>
#include <VirtDevObj.hpp>
@@ -90,11 +89,11 @@ protected:
virtual void _measure() override;
private:
int read_channel(struct adc_msg_s *adc_msg, int channel);
int read_channel(px4_adc_msg_t *adc_msg, int channel);
pthread_mutex_t _samples_lock;
int _fd[ADC_MAX_CHAN];
adc_msg_s _samples[ADC_MAX_CHAN];
px4_adc_msg_t _samples[ADC_MAX_CHAN];
};
NavioADC::NavioADC()
@@ -120,7 +119,7 @@ NavioADC::~NavioADC()
void NavioADC::_measure()
{
adc_msg_s tmp_samples[ADC_MAX_CHAN];
px4_adc_msg_t tmp_samples[ADC_MAX_CHAN];
for (int i = 0; i < ADC_MAX_CHAN; ++i) {
int ret;
@@ -216,7 +215,7 @@ ssize_t NavioADC::devRead(void *buf, size_t count)
return count;
}
int NavioADC::read_channel(struct adc_msg_s *adc_msg, int channel)
int NavioADC::read_channel(px4_adc_msg_t *adc_msg, int channel)
{
char buffer[11]; /* 32bit max INT has maximum 10 chars */
int ret;
@@ -304,7 +303,7 @@ int navio_adc_main(int argc, char *argv[])
return PX4_ERROR;
}
struct adc_msg_s adc_msgs[ADC_MAX_CHAN];
px4_adc_msg_t adc_msgs[ADC_MAX_CHAN];
ret = instance->devRead((char *)&adc_msgs, sizeof(adc_msgs));