aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_HAL_Linux: Fix compiler warning of MAX_PWMS redefinition (previously defined)

Browse Source
This commit is contained in:
mirkix 2015-04-06 20:25:15 +02:00 committed by Andrew Tridgell
parent 793a212d28
commit 445f358839
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_HAL_Linux/RCOutput_ZYNQ.h
View File

@ -4,7 +4,7 @@
#include <AP_HAL_Linux.h>
#define RCOUT_ZYNQ_PWM_BASE 0x43c00000 //FIXME hardcoding is the devil's work
#define MAX_PWMS 8 //FIXME
#define MAX_ZYNQ_PWMS 8 /* number of pwm channels */
#define PWM_CMD_CONFIG 0 /* full configuration in one go */
#define PWM_CMD_ENABLE 1 /* enable a pwm */
#define PWM_CMD_DISABLE 2 /* disable a pwm */
@ -35,7 +35,7 @@ private:
uint32_t hi;
};
struct pwm_cmd {
struct s_period_hi periodhi[MAX_PWMS];
struct s_period_hi periodhi[MAX_ZYNQ_PWMS];
};
volatile struct pwm_cmd *sharedMem_cmd;
};