From 63a8f66d92b5d7018a4d962f4f7b23774a621771 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 6 May 2009 07:50:34 +0000 Subject: Changed HWB board driver to Buttons driver, to allow for the support of future boards with more than one mounted GPIO button. --- Demos/Device/Joystick/Joystick.c | 4 ++-- Demos/Device/Joystick/Joystick.h | 2 +- Demos/Device/KeyboardMouse/KeyboardMouse.c | 8 ++++---- Demos/Device/KeyboardMouse/KeyboardMouse.h | 2 +- Demos/Device/MIDI/MIDI.c | 6 +++--- Demos/Device/MIDI/MIDI.h | 2 +- Demos/Device/Mouse/Mouse.c | 4 ++-- Demos/Device/Mouse/Mouse.h | 2 +- Demos/Host/MassStorageHost/MassStorageHost.c | 8 ++++---- Demos/Host/MassStorageHost/MassStorageHost.h | 2 +- Demos/OTG/TestApp/TestApp.c | 14 +++++++------- Demos/OTG/TestApp/TestApp.h | 4 ++-- 12 files changed, 29 insertions(+), 29 deletions(-) (limited to 'Demos') diff --git a/Demos/Device/Joystick/Joystick.c b/Demos/Device/Joystick/Joystick.c index a5c3242fe..b2de42fc2 100644 --- a/Demos/Device/Joystick/Joystick.c +++ b/Demos/Device/Joystick/Joystick.c @@ -58,7 +58,7 @@ int main(void) /* Hardware Initialization */ Joystick_Init(); LEDs_Init(); - HWB_Init(); + Buttons_Init(); /* Indicate USB not ready */ UpdateStatus(Status_USBNotReady); @@ -173,7 +173,7 @@ bool GetNextReport(USB_JoystickReport_Data_t* ReportData) if (JoyStatus_LCL & JOY_PRESS) ReportData->Button = (1 << 1); - if (HWB_GetStatus()) + if (Buttons_GetStatus() & BUTTONS_BUTTON1) ReportData->Button |= (1 << 0); /* Check if the new report is different to the previous report */ diff --git a/Demos/Device/Joystick/Joystick.h b/Demos/Device/Joystick/Joystick.h index 2a5cc2588..c274b5bc5 100644 --- a/Demos/Device/Joystick/Joystick.h +++ b/Demos/Device/Joystick/Joystick.h @@ -48,7 +48,7 @@ #include // USB Functionality #include // Joystick driver #include // LEDs driver - #include // Hardware Button driver + #include // Board Buttons driver #include // Simple scheduler for task management /* Task Definitions: */ diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.c b/Demos/Device/KeyboardMouse/KeyboardMouse.c index dc039eec0..5c9332849 100644 --- a/Demos/Device/KeyboardMouse/KeyboardMouse.c +++ b/Demos/Device/KeyboardMouse/KeyboardMouse.c @@ -240,8 +240,8 @@ TASK(USB_Keyboard) { uint8_t JoyStatus_LCL = Joystick_GetStatus(); - /* Check if HWB is not pressed, if so mouse mode enabled */ - if (!(HWB_GetStatus())) + /* Check if board button is not pressed, if so mouse mode enabled */ + if (!(Buttons_GetStatus() & BUTTONS_BUTTON1)) { if (JoyStatus_LCL & JOY_UP) KeyboardReportData.KeyCode[0] = 0x04; // A @@ -311,8 +311,8 @@ TASK(USB_Mouse) { uint8_t JoyStatus_LCL = Joystick_GetStatus(); - /* Check if HWB is pressed, if so mouse mode enabled */ - if (HWB_GetStatus()) + /* Check if board button is pressed, if so mouse mode enabled */ + if (Buttons_GetStatus() & BUTTONS_BUTTON1) { if (JoyStatus_LCL & JOY_UP) MouseReportData.Y = 1; diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.h b/Demos/Device/KeyboardMouse/KeyboardMouse.h index a69293c41..9a1fee1f4 100644 --- a/Demos/Device/KeyboardMouse/KeyboardMouse.h +++ b/Demos/Device/KeyboardMouse/KeyboardMouse.h @@ -45,7 +45,7 @@ #include // USB Functionality #include // Joystick driver #include // LEDs driver - #include // Hardware Button driver + #include // Board Buttons driver #include // Simple scheduler for task management /* Task Definitions: */ diff --git a/Demos/Device/MIDI/MIDI.c b/Demos/Device/MIDI/MIDI.c index 7e1d21156..1323e1163 100644 --- a/Demos/Device/MIDI/MIDI.c +++ b/Demos/Device/MIDI/MIDI.c @@ -58,7 +58,7 @@ int main(void) /* Hardware Initialization */ Joystick_Init(); LEDs_Init(); - HWB_Init(); + Buttons_Init(); /* Indicate USB not ready */ UpdateStatus(Status_USBNotReady); @@ -134,8 +134,8 @@ TASK(USB_MIDI_Task) uint8_t JoystickStatus = Joystick_GetStatus(); uint8_t JoystickChanges = (JoystickStatus ^ PrevJoystickStatus); - /* Get HWB status - if set use channel 10 (percussion), otherwise use channel 1 */ - uint8_t Channel = ((HWB_GetStatus()) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1)); + /* Get board button status - if pressed use channel 10 (percussion), otherwise use channel 1 */ + uint8_t Channel = ((Buttons_GetStatus() & BUTTONS_BUTTON1) ? MIDI_CHANNEL(10) : MIDI_CHANNEL(1)); if (JoystickChanges & JOY_LEFT) SendMIDINoteChange(0x3C, (JoystickStatus & JOY_LEFT), 0, Channel); diff --git a/Demos/Device/MIDI/MIDI.h b/Demos/Device/MIDI/MIDI.h index 4e81c8c2a..4d801e82f 100644 --- a/Demos/Device/MIDI/MIDI.h +++ b/Demos/Device/MIDI/MIDI.h @@ -48,7 +48,7 @@ #include // USB Functionality #include // Joystick driver #include // LEDs driver - #include // Hardware Button driver + #include // Board Buttons driver #include // Simple scheduler for task management /* Macros: */ diff --git a/Demos/Device/Mouse/Mouse.c b/Demos/Device/Mouse/Mouse.c index 669b576a6..7fff291f4 100644 --- a/Demos/Device/Mouse/Mouse.c +++ b/Demos/Device/Mouse/Mouse.c @@ -81,7 +81,7 @@ int main(void) /* Hardware Initialization */ Joystick_Init(); LEDs_Init(); - HWB_Init(); + Buttons_Init(); /* Millisecond timer initialization, with output compare interrupt enabled for the idle timing */ OCR0A = 0x7D; @@ -305,7 +305,7 @@ void CreateMouseReport(USB_MouseReport_Data_t* ReportData) if (JoyStatus_LCL & JOY_PRESS) ReportData->Button = (1 << 0); - if (HWB_GetStatus()) + if (Buttons_GetStatus() & BUTTONS_BUTTON1) ReportData->Button |= (1 << 1); } diff --git a/Demos/Device/Mouse/Mouse.h b/Demos/Device/Mouse/Mouse.h index 714f8d6e8..4eaf457ca 100644 --- a/Demos/Device/Mouse/Mouse.h +++ b/Demos/Device/Mouse/Mouse.h @@ -50,7 +50,7 @@ #include // USB Functionality #include // Joystick driver #include // LEDs driver - #include // Hardware Button driver + #include // Board Buttons driver #include // Simple scheduler for task management /* Task Definitions: */ diff --git a/Demos/Host/MassStorageHost/MassStorageHost.c b/Demos/Host/MassStorageHost/MassStorageHost.c index 15006d336..d06e3a63a 100644 --- a/Demos/Host/MassStorageHost/MassStorageHost.c +++ b/Demos/Host/MassStorageHost/MassStorageHost.c @@ -63,7 +63,7 @@ int main(void) /* Hardware Initialization */ SerialStream_Init(9600, false); LEDs_Init(); - HWB_Init(); + Buttons_Init(); /* Indicate USB not ready */ UpdateStatus(Status_USBNotReady); @@ -319,10 +319,10 @@ TASK(USB_MassStore_Host) puts_P(PSTR("\r\n")); } - puts_P(PSTR("\r\n\r\nPress HWB to read entire ASCII contents of disk...\r\n\r\n")); + puts_P(PSTR("\r\n\r\nPress board button to read entire ASCII contents of disk...\r\n\r\n")); - /* Wait for HWB to be pressed */ - while (!(HWB_GetStatus())) + /* Wait for the board button to be pressed */ + while (!(Buttons_GetStatus() & BUTTONS_BUTTON1)) { /* Abort if device removed */ if (!(USB_IsConnected)) diff --git a/Demos/Host/MassStorageHost/MassStorageHost.h b/Demos/Host/MassStorageHost/MassStorageHost.h index d4b9947bb..216065970 100644 --- a/Demos/Host/MassStorageHost/MassStorageHost.h +++ b/Demos/Host/MassStorageHost/MassStorageHost.h @@ -52,7 +52,7 @@ #include // USB Functionality #include // Serial stream driver #include // LEDs driver - #include // Hardware Button driver + #include // Board Buttons driver #include // Simple scheduler for task management /* Enums: */ diff --git a/Demos/OTG/TestApp/TestApp.c b/Demos/OTG/TestApp/TestApp.c index 8c8a23ffc..4dc9b44e3 100644 --- a/Demos/OTG/TestApp/TestApp.c +++ b/Demos/OTG/TestApp/TestApp.c @@ -40,7 +40,7 @@ TASK_LIST { { .Task = TestApp_CheckJoystick, .TaskStatus = TASK_RUN }, - { .Task = TestApp_CheckHWB , .TaskStatus = TASK_RUN }, + { .Task = TestApp_CheckButton , .TaskStatus = TASK_RUN }, { .Task = TestApp_CheckTemp , .TaskStatus = TASK_RUN }, { .Task = USB_USBTask , .TaskStatus = TASK_RUN }, }; @@ -63,7 +63,7 @@ int main(void) Temperature_Init(); Joystick_Init(); LEDs_Init(); - HWB_Init(); + Buttons_Init(); /* Millisecond timer initialization, with output compare interrupt enabled */ OCR0A = 0x7D; @@ -137,17 +137,17 @@ TASK(TestApp_CheckTemp) } } -/** Task responsible for checking the HWB button position, and start-stopping other tasks and the USB +/** 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_CheckHWB) +TASK(TestApp_CheckButton) { static SchedulerDelayCounter_t DelayCounter = 0; static bool IsPressed; static bool BlockingJoystickTask; - /* Check if HWB pressed (start USB) */ - if (HWB_GetStatus() == true) + /* Check if board button pressed (start USB) */ + 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))) @@ -185,7 +185,7 @@ TASK(TestApp_CheckHWB) } else { - /* HWB not pressed - reset debounce interval counter and press handled flag */ + /* Board button not pressed - reset debounce interval counter and press handled flag */ Scheduler_ResetDelay(&DelayCounter); IsPressed = false; } diff --git a/Demos/OTG/TestApp/TestApp.h b/Demos/OTG/TestApp/TestApp.h index d5ce8dd3a..de4d52612 100644 --- a/Demos/OTG/TestApp/TestApp.h +++ b/Demos/OTG/TestApp/TestApp.h @@ -51,12 +51,12 @@ #include // USART Stream driver #include // Joystick driver #include // LED driver - #include // Hardware Button driver + #include // Board Buttons driver #include // Temperature sensor driver /* Task Definitions: */ TASK(TestApp_CheckJoystick); - TASK(TestApp_CheckHWB); + TASK(TestApp_CheckButton); TASK(TestApp_CheckTemp); #endif -- cgit v1.2.3