forked from akuker/adbuino
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The LED blinking for initialization and USB enumeration now no longer blocks and the USB devices should enumerate sooner. Also placed as much of the code as possible into SRAM using a linker script adopted from ZuluSCSI.
- Loading branch information
Showing
8 changed files
with
379 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| //--------------------------------------------------------------------------- | ||
| // | ||
| // QuokkADB ADB keyboard and mouse adapter | ||
| // | ||
| // Copyright (C) 2023 Rabbit Hole Computing LLC | ||
| // | ||
| // This file is part of QuokkADB. | ||
| // | ||
| // This file is free software: you can redistribute it and/or modify it under | ||
| // the terms of the GNU General Public License as published by the Free | ||
| // Software Foundation, either version 3 of the License, or (at your option) | ||
| // any later version. | ||
| // | ||
| // This file is distributed in the hope that it will be useful, but WITHOUT ANY | ||
| // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | ||
| // details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License along | ||
| // with this file. If not, see <https://www.gnu.org/licenses/>. | ||
| // | ||
| // Portions of this code were originally released under a Modified BSD | ||
| // License. See LICENSE in the root of this repository for more info. | ||
| // | ||
| //---------------------------------------------------------------------------- | ||
| #pragma once | ||
|
|
||
| #include <scqueue.h> | ||
| #define BLINK_QUEUE_LENGTH 5 | ||
|
|
||
| struct blink_event_t | ||
| { | ||
| uint8_t times; | ||
| uint32_t delay_ms; | ||
| }; | ||
|
|
||
| class BlinkLed | ||
| { | ||
| public: | ||
| bool blink(uint8_t times, uint32_t delay_ms = 75); | ||
| void led_on(bool force = false); | ||
| void led_off(bool force = false); | ||
| void poll(); | ||
| protected: | ||
| simple_circular_queue::SCQueue<blink_event_t*, BLINK_QUEUE_LENGTH> blink_queue; | ||
| bool blinking = false; | ||
| }; | ||
|
|
||
| extern BlinkLed blink_led; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| //--------------------------------------------------------------------------- | ||
| // | ||
| // QuokkADB ADB keyboard and mouse adapter | ||
| // | ||
| // Copyright (C) 2023 Rabbit Hole Computing LLC | ||
| // | ||
| // This file is part of QuokkADB. | ||
| // | ||
| // This file is free software: you can redistribute it and/or modify it under | ||
| // the terms of the GNU General Public License as published by the Free | ||
| // Software Foundation, either version 3 of the License, or (at your option) | ||
| // any later version. | ||
| // | ||
| // This file is distributed in the hope that it will be useful, but WITHOUT ANY | ||
| // WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | ||
| // details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License along | ||
| // with this file. If not, see <https://www.gnu.org/licenses/>. | ||
| // | ||
| // Portions of this code were originally released under a Modified BSD | ||
| // License. See LICENSE in the root of this repository for more info. | ||
| // | ||
| //---------------------------------------------------------------------------- | ||
| #include "blink.h" | ||
| #include "quokkadb_gpio.h" | ||
| #include "adb_platform.h" | ||
|
|
||
| BlinkLed blink_led; | ||
|
|
||
| bool BlinkLed::blink(uint8_t times, uint32_t delay_ms) | ||
| { | ||
| blink_event_t* event = new blink_event_t; | ||
| event->times = times; | ||
| event->delay_ms = delay_ms; | ||
| return blink_queue.enqueue(event); | ||
| } | ||
|
|
||
| void BlinkLed::led_on(bool force) | ||
| { | ||
| if (force || !blinking) | ||
| { | ||
| LED_ON(); | ||
| } | ||
| } | ||
|
|
||
| void BlinkLed::led_off(bool force) | ||
| { | ||
| if (force || !blinking) | ||
| { | ||
| LED_OFF(); | ||
| } | ||
| } | ||
|
|
||
| void BlinkLed::poll() | ||
| { | ||
| static blink_event_t *current_event = nullptr; | ||
| static bool on_phase = true; | ||
| static uint8_t blinked = 0; | ||
| static bool last_delay = false; | ||
| static uint32_t start_delay; | ||
|
|
||
| if (!blinking && !blink_queue.isEmpty()) | ||
| { | ||
| current_event = blink_queue.dequeue(); | ||
| start_delay = millis(); | ||
| LED_ON(); | ||
| on_phase = true; | ||
| blinking = true; | ||
| blinked = 0; | ||
| last_delay = false; | ||
| } | ||
|
|
||
| if (blinking) | ||
| { | ||
| if ((uint32_t)(millis() - start_delay) > current_event->delay_ms) | ||
| { | ||
| if (last_delay) | ||
| { | ||
| if (on_phase) | ||
| { | ||
| // end of blink routine | ||
| last_delay = false; | ||
| delete current_event; | ||
| blinking = false; | ||
| } | ||
| else | ||
| { | ||
| // one more delay so there is an extra delay before starting a new blink sequence | ||
| start_delay = millis(); | ||
| on_phase = true; | ||
| } | ||
|
|
||
| } | ||
| else if (on_phase) | ||
| { | ||
| on_phase = false; | ||
| LED_OFF(); | ||
| start_delay = millis(); | ||
| if (blinked + 1 >= current_event->times) | ||
| { | ||
| last_delay = true; | ||
| } | ||
| } | ||
| else | ||
| { | ||
| blinked++; | ||
| on_phase = true; | ||
| LED_ON(); | ||
| start_delay = millis(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.