aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/protocol/bluefruit/main.c
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-02-14 20:18:54 -0800
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-02-14 20:18:54 -0800
commitcc5c6b449a4a36fc56fa5896b2b8f120e4bb0b31 (patch)
tree395f57bdc4ed5384424bbc7c8d483cbee6253f63 /tmk_core/protocol/bluefruit/main.c
parent40e67a3074293bc8e96574e7d603a943d3ca8d38 (diff)
downloadqmk_firmware-cc5c6b449a4a36fc56fa5896b2b8f120e4bb0b31.tar.gz
qmk_firmware-cc5c6b449a4a36fc56fa5896b2b8f120e4bb0b31.zip
Add kb and user level keyboard initialization functions (#3113)
* Add suspend functions * Disable RGB code if it's disabled * Add keyboard_init functions * Change where references so it will compile * Wrong command chained in wake up kb function * Fix non-feature file changes * Add documentation * Re-add matrix init docs * add rgblight code to example * Remove suspend code * Clean up docs * Fix docs * Fix suspend code * more doc fixes * change function to startup_* rather than keyboard_init_ * fix spelling error * fix up docs to finish removing keyboard_init * Use Pre and Post init functions * Update Documenation * Remove changes to my keymap and userspace code * Cleanup * Revert changes to extra files * Forgot a semicolon * Make sure all protocols call keyboard_setup * Cleanup functions * Unset startup_user * Remove changes from division keyboard * Readd startup_user function * Remove all to startup_user * Update docs/custom_quantum_functions.md Co-Authored-By: drashna <drashna@live.com> * Update docs/custom_quantum_functions.md Co-Authored-By: drashna <drashna@live.com> * Add suggestion line * Rebase fixes * Update documentation to be more useful/accurate * Cleanup of documentation * Fix spacing inconsistency * Revert unexpected change to keymap
Diffstat (limited to 'tmk_core/protocol/bluefruit/main.c')
-rw-r--r--tmk_core/protocol/bluefruit/main.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/tmk_core/protocol/bluefruit/main.c b/tmk_core/protocol/bluefruit/main.c
index 0dbb637e2..8a6386b4e 100644
--- a/tmk_core/protocol/bluefruit/main.c
+++ b/tmk_core/protocol/bluefruit/main.c
@@ -42,13 +42,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
42 42
43 43
44int main(void) 44int main(void)
45{ 45{
46 46
47 CPU_PRESCALE(0); 47 CPU_PRESCALE(0);
48 48
49 // DDRD = _BV(PD5); 49 // DDRD = _BV(PD5);
50 // DDRB = _BV(PB0); 50 // DDRB = _BV(PB0);
51 51
52 // PORTD = _BV(PD5); 52 // PORTD = _BV(PD5);
53 // PORTB = _BV(PB0); 53 // PORTB = _BV(PB0);
54 54
@@ -59,22 +59,23 @@ int main(void)
59 // while (!usb_configured()) /* wait */ 59 // while (!usb_configured()) /* wait */
60 60
61 61
62 keyboard_setup();
62 63
63 dprintf("Initializing keyboard...\n"); 64 dprintf("Initializing keyboard...\n");
64 keyboard_init(); 65 keyboard_init();
65 66
66 // This implementation is pretty simplistic... if the USB connection 67 // This implementation is pretty simplistic... if the USB connection
67 // is not configured, choose the Bluefruit, otherwise use USB 68 // is not configured, choose the Bluefruit, otherwise use USB
68 // Definitely would prefer to have this driven by an input pin and make 69 // Definitely would prefer to have this driven by an input pin and make
69 // it switch dynamically - BCG 70 // it switch dynamically - BCG
70 // if (!usb_configured()) { 71 // if (!usb_configured()) {
71 72
72 // // Send power to Bluefruit... Adafruit says it takes 27 mA, I think 73 // // Send power to Bluefruit... Adafruit says it takes 27 mA, I think
73 // // the pins should provide 40 mA, but just in case I switch the 74 // // the pins should provide 40 mA, but just in case I switch the
74 // // Bluefruit using a transistor - BCG 75 // // Bluefruit using a transistor - BCG
75 // DDRB = _BV(PB6); 76 // DDRB = _BV(PB6);
76 // PORTB |= _BV(PB6); 77 // PORTB |= _BV(PB6);
77 78
78 dprintf("Setting host driver to bluefruit...\n"); 79 dprintf("Setting host driver to bluefruit...\n");
79 host_set_driver(bluefruit_driver()); 80 host_set_driver(bluefruit_driver());
80 81
@@ -131,7 +132,7 @@ int main(void)
131// usb_remote_wakeup(); 132// usb_remote_wakeup();
132// } 133// }
133// } 134// }
134// keyboard_task(); 135// keyboard_task();
135// } 136// }
136// } 137// }
137 138