ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed EVENT_USB_CDC_ControLineStateChanged() event not taking the CDC interface structure as a parameter.

Browse source 
Converted TestApp demo over to the new demo structure.

More class driver documentation improvements.
This commit is contained in:
Dean Camera 2009-06-04 06:26:35 +00:00
parent dc42c5eb6b
commit 7665bf323e
9 changed files with 100 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

105
Demos/OTG/TestApp/TestApp.c
View file

@ -36,19 +36,30 @@
#include "TestApp.h"
/* Scheduler Task List */
TASK_LIST
{
{ .Task = TestApp_CheckJoystick, .TaskStatus = TASK_RUN },
{ .Task = TestApp_CheckButton , .TaskStatus = TASK_RUN },
{ .Task = TestApp_CheckTemp , .TaskStatus = TASK_RUN },
{ .Task = USB_USBTask , .TaskStatus = TASK_RUN },
};
/** Main program entry point. This routine configures the hardware required by the application, then
* starts the scheduler to run the application tasks.
*/
int main(void)
{
SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"LUFA Demo running.\r\n" ESC_INVERSE_OFF));
for (;;)
{
CheckJoystick();
CheckButton();
CheckTemperature();
/* Clear output-compare flag (logic 1 clears the flag) */
TIFR0 |= (1 << OCF0A);
USB_USBTask();
}
}
void SetupHardware(void)
{
/* Disable watchdog if enabled by bootloader/fuses */
MCUSR &= ~(1 << WDRF);
@ -65,41 +76,20 @@ int main(void)
LEDs_Init();
Buttons_Init();
/* Millisecond timer initialization, with output compare interrupt enabled */
/* Millisecond timer initialization */
OCR0A = 0x7D;
TCCR0A = (1 << WGM01);
TCCR0B = ((1 << CS01) | (1 << CS00));
TIMSK0 = (1 << OCIE0A);
/* Turn on interrupts */
sei();
/* Start-up message via USART */
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"LUFA Demo running.\r\n" ESC_INVERSE_OFF));
/* Scheduling - routine never returns, so put this last in the main function */
Scheduler_Start();
}
/** ISR for the timer 0 compare vector. This ISR fires once each millisecond, and increments the
* scheduler tick counter.
*/
ISR(TIMER0_COMPA_vect, ISR_BLOCK)
{
/* Scheduler test - increment scheduler tick counter once each millisecond */
Scheduler_TickCounter++;
}
/** Task responsible for checking the joystick position, and displaying the joystick position onto the
* board LEDs.
*/
TASK(TestApp_CheckJoystick)
void CheckJoystick(void)
{
uint8_t JoyStatus_LCL = Joystick_GetStatus();
uint8_t LEDMask = 0;
uint8_t LEDMask = LEDS_NO_LEDS;
/* Test of the Joystick - change a mask in response to joystick */
if (JoyStatus_LCL & JOY_UP)
LEDMask |= LEDS_LED1;
@ -115,78 +105,61 @@ TASK(TestApp_CheckJoystick)
if (JoyStatus_LCL & JOY_PRESS)
LEDMask = LEDS_ALL_LEDS;
/* Test of LEDs - light up in response to joystick */
LEDs_SetAllLEDs(LEDMask);
}
/** Task responsible for checking the current temperature via the temperature sensor mounted on the
* board, and displaying it through the serial USART.
*/
TASK(TestApp_CheckTemp)
void CheckTemperature(void)
{
static SchedulerDelayCounter_t DelayCounter = 10000; // Force immediate run on start-up
static uint16_t MSElapsed = 0;
if (TIFR0 & (1 << OCF0A))
MSElapsed++;
/* Task runs every 10000 ticks, 10 seconds for this demo */
if (Scheduler_HasDelayElapsed(10000, &DelayCounter))
if (MSElapsed == 1000)
{
printf_P(PSTR("Current temperature: %d Degrees Celcius\r\n\r\n"),
(int8_t)Temperature_GetTemperature());
/* Reset the delay counter, ready to count another 10000 tick interval */
Scheduler_ResetDelay(&DelayCounter);
MSElapsed = 0;
}
}
/** Task responsible for checking the board's first button' position, and start-stopping other tasks and the USB
* interface in response to user joystick movements.
*/
TASK(TestApp_CheckButton)
void CheckButton(void)
{
static SchedulerDelayCounter_t DelayCounter = 0;
static bool IsPressed;
static bool BlockingJoystickTask;
static uint16_t DebounceMSElapsed = 0;
static bool IsPressed;
/* Check if board button pressed (start USB) */
if (TIFR0 & (1 << OCF0A))
DebounceMSElapsed++;
if (Buttons_GetStatus() & BUTTONS_BUTTON1)
{
/* Debounce - check 100 ticks later to see if button is still being pressed */
if ((IsPressed == false) && (Scheduler_HasDelayElapsed(100, &DelayCounter)))
if (!(IsPressed) && (DebounceMSElapsed == 100))
{
/* Set flag, indicating that current pressed state has been handled */
IsPressed = true;
/* First start of the USB interface permanently blocks the joystick task */
if (BlockingJoystickTask == false)
{
Scheduler_SetTaskMode(TestApp_CheckJoystick, TASK_STOP);
BlockingJoystickTask = true;
}
/* Toggle USB interface */
if (USB_IsInitialized == true)
{
USB_ShutDown();
LEDs_SetAllLEDs(LEDS_LED1);
puts_P(PSTR(ESC_BG_WHITE "USB Power Off.\r\n"));
Scheduler_SetTaskMode(TestApp_CheckTemp, TASK_RUN);
}
else
{
Scheduler_SetTaskMode(TestApp_CheckTemp, TASK_STOP);
LEDs_SetAllLEDs(LEDS_LED2 | LEDS_LED3);
puts_P(PSTR(ESC_BG_YELLOW "USB Power On.\r\n"));
puts_P(PSTR(ESC_BG_YELLOW "USB Power On.\r\n"));
USB_Init(USB_MODE_UID, USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL);
}
}
}
else
{
/* Board button not pressed - reset debounce interval counter and press handled flag */
Scheduler_ResetDelay(&DelayCounter);
DebounceMSElapsed = 0;
IsPressed = false;
}
}