rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-26 15:54:15 +01:00
Code Issues Releases Activity

More HID work.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@173 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
gussy 2010-02-05 09:34:45 +00:00 committed by gussy
parent eb7787e2ee
commit e39f2801d1
2 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/PiOS/STM32F10x/pios_usb.c
View File

@ -42,7 +42,8 @@
/* ISTR events */ /* ISTR events */
/* mask defining which events has to be handled by the device application software */ /* mask defining which events has to be handled by the device application software */
#define IMR_MSK (CNTR_CTRM | CNTR_WKUPM | CNTR_SUSPM | CNTR_ERRM | CNTR_SOFM | CNTR_ESOFM | CNTR_RESETM) /* Unused; #define IMR_MSK (CNTR_CTRM | CNTR_WKUPM | CNTR_SUSPM | CNTR_ERRM | CNTR_SOFM | CNTR_ESOFM | CNTR_RESETM) */
#define IMR_MSK (CNTR_RESETM | CNTR_SOFM | CNTR_CTRM)
/* Local types */ /* Local types */
typedef enum _DEVICE_STATE { typedef enum _DEVICE_STATE {
@ -220,6 +221,7 @@ static const USER_STANDARD_REQUESTS My_User_Standard_Requests = {
static DEVICE_INFO My_Device_Info; static DEVICE_INFO My_Device_Info;
/* USB device status */ /* USB device status */
static volatile uint32_t bDeviceState = UNCONNECTED; static volatile uint32_t bDeviceState = UNCONNECTED;
__IO uint8_t bIntPackSOF = 0;
/** /**
* Initialises USB interface * Initialises USB interface

56
flight/PiOS/pios.c
View File

@ -44,6 +44,7 @@ static uint8_t sdcard_available;
/* Function Prototypes */ /* Function Prototypes */
static void TaskTick(void *pvParameters); static void TaskTick(void *pvParameters);
static void TaskHIDTest(void *pvParameters);
static void TaskServos(void *pvParameters); static void TaskServos(void *pvParameters);
static void TaskHooks(void *pvParameters); static void TaskHooks(void *pvParameters);
static void TaskSDCard(void *pvParameters); static void TaskSDCard(void *pvParameters);
@ -61,6 +62,8 @@ int main()
/* Delay system */ /* Delay system */
PIOS_DELAY_Init(); PIOS_DELAY_Init();
/* SPI Init */ /* SPI Init */
PIOS_SPI_Init(); PIOS_SPI_Init();
@ -101,34 +104,14 @@ int main()
PIOS_USB_Init(0); PIOS_USB_Init(0);
__IO uint8_t Send_Buffer[2]; PIOS_COM_ReceiveCallbackInit(CONSOLE_Parse);
uint8_t count = 0;
for(;;)
{
/* Report ID */
Send_Buffer[0] = 0x07;
/* Report Data */
Send_Buffer[1] = count;
USB_SIL_Write(EP1_IN, (uint8_t*) Send_Buffer, 2);
if(count >= 255) {
count = 0;
} else {
count++;
}
PIOS_DELAY_WaitmS(50);
}
//PIOS_COM_ReceiveCallbackInit(CONSOLE_Parse);
/* Initialise OpenPilot application */ /* Initialise OpenPilot application */
// OpenPilotInit(); // OpenPilotInit();
/* Create a FreeRTOS task */ /* Create a FreeRTOS task */
xTaskCreate(TaskTick, (signed portCHAR *)"Test", configMINIMAL_STACK_SIZE , NULL, 1, NULL); xTaskCreate(TaskTick, (signed portCHAR *)"Test", configMINIMAL_STACK_SIZE , NULL, 1, NULL);
xTaskCreate(TaskHIDTest, (signed portCHAR *)"HIDTest", configMINIMAL_STACK_SIZE , NULL, 4, NULL);
//xTaskCreate(TaskServos, (signed portCHAR *)"Servos", configMINIMAL_STACK_SIZE , NULL, 4, NULL); //xTaskCreate(TaskServos, (signed portCHAR *)"Servos", configMINIMAL_STACK_SIZE , NULL, 4, NULL);
//xTaskCreate(TaskHooks, (signed portCHAR *)"Hooks", configMINIMAL_STACK_SIZE, NULL, PRIORITY_TASK_HOOKS, NULL); //xTaskCreate(TaskHooks, (signed portCHAR *)"Hooks", configMINIMAL_STACK_SIZE, NULL, PRIORITY_TASK_HOOKS, NULL);
//xTaskCreate(TaskSDCard, (signed portCHAR *)"SDCard", configMINIMAL_STACK_SIZE, NULL, (tskIDLE_PRIORITY + 2), NULL); //xTaskCreate(TaskSDCard, (signed portCHAR *)"SDCard", configMINIMAL_STACK_SIZE, NULL, (tskIDLE_PRIORITY + 2), NULL);
@ -187,6 +170,35 @@ static void TaskTick(void *pvParameters)
} }
} }
static void TaskHIDTest(void *pvParameters)
{
portTickType xDelay = 250 / portTICK_RATE_MS;;
__IO uint8_t Send_Buffer[2];
uint8_t count = 0;
for(;;)
{
/* Report ID */
Send_Buffer[0] = 0x07;
/* Report Data */
Send_Buffer[1] = count;
/* Write the data to the pipe */
USB_SIL_Write(EP1_IN, (uint8_t*) Send_Buffer, 2);
SetEPTxValid(ENDP1);
if(count >= 255) {
count = 0;
} else {
count++;
}
vTaskDelay(xDelay);
}
}
static void TaskServos(void *pvParameters) static void TaskServos(void *pvParameters)
{ {
/* For testing servo outputs */ /* For testing servo outputs */