rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Added support for an active low USB vsense line.

Browse Source
This commit is contained in:
Brian Webb 2013-05-14 20:37:13 -07:00
parent eedfb7081c
commit 156109bb88
8 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flight/pios/inc/pios_usb_priv.h
View File

@ -37,6 +37,7 @@
struct pios_usb_cfg {
struct stm32_irq irq;
struct stm32_gpio vsense;
bool vsense_active_low;
};
extern int32_t PIOS_USB_Init(uint32_t * usb_id, const struct pios_usb_cfg * cfg);

2
flight/pios/stm32f10x/pios_usb.c
View File

@ -215,7 +215,7 @@ bool PIOS_USB_CableConnected(__attribute__((unused)) uint8_t id)
if (PIOS_USB_validate(usb_dev) != 0)
return false;
return usb_dev->cfg->vsense.gpio->IDR & usb_dev->cfg->vsense.init.GPIO_Pin;
return ((usb_dev->cfg->vsense.gpio->IDR & usb_dev->cfg->vsense.init.GPIO_Pin) != 0) ^ usb_dev->cfg->vsense_active_low;
}
/**

2
flight/pios/stm32f4xx/pios_usb.c
View File

@ -162,7 +162,7 @@ bool PIOS_USB_CheckAvailable(__attribute__((unused)) uint32_t id)
if(!PIOS_USB_validate(usb_dev))
return false;
usb_found = (usb_dev->cfg->vsense.gpio->IDR & usb_dev->cfg->vsense.init.GPIO_Pin);
usb_found = ((usb_dev->cfg->vsense.gpio->IDR & usb_dev->cfg->vsense.init.GPIO_Pin) != 0) ^ usb_dev->cfg->vsense_active_low;
return usb_found;
return usb_found != 0 && transfer_possible ? 1 : 0;
}

6
flight/targets/boards/coptercontrol/board_hw_defs.c
View File

@ -1431,7 +1431,8 @@ static const struct pios_usb_cfg pios_usb_main_cfg_cc = {
.GPIO_Speed = GPIO_Speed_10MHz,
.GPIO_Mode = GPIO_Mode_AF_OD,
},
}
},
.vsense_active_low = false
};
static const struct pios_usb_cfg pios_usb_main_cfg_cc3d = {
@ -1450,7 +1451,8 @@ static const struct pios_usb_cfg pios_usb_main_cfg_cc3d = {
.GPIO_Speed = GPIO_Speed_10MHz,
.GPIO_Mode = GPIO_Mode_AF_OD,
},
}
},
.vsense_active_low = false
};
#include "pios_usb_board_data_priv.h"

3
flight/targets/boards/oplinkmini/board_hw_defs.c
View File

@ -640,7 +640,8 @@ static const struct pios_usb_cfg pios_usb_main_cfg = {
.GPIO_Speed = GPIO_Speed_10MHz,
.GPIO_Mode = GPIO_Mode_AF_OD,
},
}
},
.vsense_active_low = false
};
#include "pios_usb_board_data_priv.h"

3
flight/targets/boards/osd/board_hw_defs.c
View File

@ -502,7 +502,8 @@ static const struct pios_usb_cfg pios_usb_main_cfg = {
.GPIO_Mode = GPIO_Mode_IN,
.GPIO_OType = GPIO_OType_OD,
},
}
},
.vsense_active_low = false
};
#include "pios_usb_board_data_priv.h"

6
flight/targets/boards/revolution/board_hw_defs.c
View File

@ -1837,7 +1837,8 @@ static const struct pios_usb_cfg pios_usb_main_rm1_cfg = {
.GPIO_Mode = GPIO_Mode_IN,
.GPIO_OType = GPIO_OType_OD,
},
}
},
.vsense_active_low = false
};
static const struct pios_usb_cfg pios_usb_main_rm2_cfg = {
@ -1857,7 +1858,8 @@ static const struct pios_usb_cfg pios_usb_main_rm2_cfg = {
.GPIO_Mode = GPIO_Mode_IN,
.GPIO_OType = GPIO_OType_OD,
},
}
},
.vsense_active_low = false
};
const struct pios_usb_cfg * PIOS_BOARD_HW_DEFS_GetUsbCfg (uint32_t board_revision)

3
flight/targets/boards/revoproto/board_hw_defs.c
View File

@ -2003,7 +2003,8 @@ static const struct pios_usb_cfg pios_usb_main_cfg = {
.GPIO_Mode = GPIO_Mode_IN,
.GPIO_OType = GPIO_OType_OD,
},
}
},
.vsense_active_low = false
};
#include "pios_usb_board_data_priv.h"