Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-07 09:13:32 +08:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

dsm: fixed shadowed variables errors

Browse Source
This commit is contained in:
Andrew Tridgell
2016-04-12 18:39:21 +10:00
committed by Lorenz Meier
parent fc6b074d40
commit 091515956d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/rc/dsm.c
+6 -6
View File
@@ -231,7 +231,7 @@ dsm_guess_format(bool reset)
}
int
dsm_config(int dsm_fd)
dsm_config(int fd)
{
#ifdef GPIO_SPEKTRUM_PWR_EN
// enable power on DSM connector
@@ -240,15 +240,15 @@ dsm_config(int dsm_fd)
int ret = -1;
if (dsm_fd >= 0) {
if (fd >= 0) {
struct termios t;
/* 115200bps, no parity, one stop bit */
tcgetattr(dsm_fd, &t);
tcgetattr(fd, &t);
cfsetspeed(&t, 115200);
t.c_cflag &= ~(CSTOPB | PARENB);
tcsetattr(dsm_fd, TCSANOW, &t);
tcsetattr(fd, TCSANOW, &t);
/* initialise the decoder */
dsm_partial_frame_count = 0;
@@ -526,7 +526,7 @@ dsm_decode(hrt_abstime frame_time, uint16_t *values, uint16_t *num_values, bool
* @return true=decoded raw channel values updated, false=no update
*/
bool
dsm_input(int dsm_fd, uint16_t *values, uint16_t *num_values, bool *dsm_11_bit, uint8_t *n_bytes, uint8_t **bytes,
dsm_input(int fd, uint16_t *values, uint16_t *num_values, bool *dsm_11_bit, uint8_t *n_bytes, uint8_t **bytes,
unsigned max_values)
{
int ret = 1;
@@ -554,7 +554,7 @@ dsm_input(int dsm_fd, uint16_t *values, uint16_t *num_values, bool *dsm_11_bit,
* a complete frame.
*/
ret = read(dsm_fd, &dsm_buf[0], sizeof(dsm_buf) / sizeof(dsm_buf[0]));
ret = read(fd, &dsm_buf[0], sizeof(dsm_buf) / sizeof(dsm_buf[0]));
/* if the read failed for any reason, just give up here */
if (ret < 1) {