summaryrefslogtreecommitdiffstats
path: root/protocol/bluefruit
diff options
context:
space:
mode:
Diffstat (limited to 'protocol/bluefruit')
-rw-r--r--protocol/bluefruit/bluefruit.c15
-rw-r--r--protocol/bluefruit/bluefruit.h5
-rw-r--r--protocol/bluefruit/main.c100
3 files changed, 71 insertions, 49 deletions
diff --git a/protocol/bluefruit/bluefruit.c b/protocol/bluefruit/bluefruit.c
index cf26b83dff..47c63555cd 100644
--- a/protocol/bluefruit/bluefruit.c
+++ b/protocol/bluefruit/bluefruit.c
@@ -2,20 +2,16 @@
Bluefruit Protocol for TMK firmware
Author: Benjamin Gould, 2013
Based on code Copyright 2011 Jun Wako <wakojun@gmail.com>
-
This program 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 2 of the License, or
(at your option) any later version.
-
This program 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 program. If not, see <http://www.gnu.org/licenses/>.
-
*/
#include <stdint.h>
@@ -76,6 +72,13 @@ static void send_mouse(report_mouse_t *report);
static void send_system(uint16_t data);
static void send_consumer(uint16_t data);
+
+void sendString(char string[], int length) {
+ for(int i = 0; i < length; i++) {
+ serial_send(string[i]);
+ }
+}
+
static host_driver_t driver = {
keyboard_leds,
send_keyboard,
@@ -100,6 +103,7 @@ static void send_keyboard(report_keyboard_t *report)
#endif
bluefruit_serial_send(0xFD);
for (uint8_t i = 0; i < KEYBOARD_REPORT_SIZE; i++) {
+
bluefruit_serial_send(report->raw[i]);
}
#ifdef BLUEFRUIT_TRACE_SERIAL
@@ -198,5 +202,4 @@ static void send_consumer(uint16_t data)
#ifdef BLUEFRUIT_TRACE_SERIAL
bluefruit_trace_footer();
#endif
-}
-
+} \ No newline at end of file
diff --git a/protocol/bluefruit/bluefruit.h b/protocol/bluefruit/bluefruit.h
index 4f9b58836d..ceacc4a367 100644
--- a/protocol/bluefruit/bluefruit.h
+++ b/protocol/bluefruit/bluefruit.h
@@ -2,17 +2,14 @@
Bluefruit Protocol for TMK firmware
Author: Benjamin Gould, 2013
Based on code Copyright 2011 Jun Wako <wakojun@gmail.com>
-
This program 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 2 of the License, or
(at your option) any later version.
-
This program 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 program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -25,4 +22,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
host_driver_t *bluefruit_driver(void);
-#endif
+#endif \ No newline at end of file
diff --git a/protocol/bluefruit/main.c b/protocol/bluefruit/main.c
index 871062ab11..0dbb637e2c 100644
--- a/protocol/bluefruit/main.c
+++ b/protocol/bluefruit/main.c
@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <avr/wdt.h>
#include <avr/sleep.h>
#include <util/delay.h>
-#include "serial.h"
+#include "../serial.h"
#include "keyboard.h"
#include "usb.h"
#include "host.h"
@@ -40,23 +40,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BLUEFRUIT_HOST_DRIVER 1
#define PJRC_HOST_DRIVER 2
+
int main(void)
{
CPU_PRESCALE(0);
- DDRD = _BV(PD5);
- DDRB = _BV(PB0);
+ // DDRD = _BV(PD5);
+ // DDRB = _BV(PB0);
- PORTD = _BV(PD5);
- PORTB = _BV(PB0);
+ // PORTD = _BV(PD5);
+ // PORTB = _BV(PB0);
print_set_sendchar(sendchar);
- usb_init();
- _delay_ms(2000);
+ // usb_init();
+ // _delay_ms(2000);
// while (!usb_configured()) /* wait */
+
+
dprintf("Initializing keyboard...\n");
keyboard_init();
@@ -64,53 +67,72 @@ int main(void)
// is not configured, choose the Bluefruit, otherwise use USB
// Definitely would prefer to have this driven by an input pin and make
// it switch dynamically - BCG
- if (!usb_configured()) {
+ // if (!usb_configured()) {
- // Send power to Bluefruit... Adafruit says it takes 27 mA, I think
- // the pins should provide 40 mA, but just in case I switch the
- // Bluefruit using a transistor - BCG
- DDRB = _BV(PB6);
- PORTB |= _BV(PB6);
+ // // Send power to Bluefruit... Adafruit says it takes 27 mA, I think
+ // // the pins should provide 40 mA, but just in case I switch the
+ // // Bluefruit using a transistor - BCG
+ // DDRB = _BV(PB6);
+ // PORTB |= _BV(PB6);
dprintf("Setting host driver to bluefruit...\n");
host_set_driver(bluefruit_driver());
dprintf("Initializing serial...\n");
serial_init();
-
- // wait an extra second for the PC's operating system
- // to load drivers and do whatever it does to actually
- // be ready for input
- _delay_ms(1000);
- PORTD = ~_BV(PD5);
- dprintf("Starting main loop");
- while (1) {
- keyboard_task();
- }
- } else {
+ // char swpa[] = "+++\r\n";
+ // for (int i = 0; i < 5; i++) {
+ // serial_send(swpa[i]);
+ // }
+
+ // char ble_enable[] = "AT+BLEKEYBOARDEN=1\r\n";
+ // for (int i = 0; i < 20; i++) {
+ // serial_send(ble_enable[i]);
+ // }
+
+ // char reset[] = "ATZ\r\n";
+ // for (int i = 0; i < 5; i++) {
+ // serial_send(reset[i]);
+ // }
+
+ // for (int i = 0; i < 5; i++) {
+ // serial_send(swpa[i]);
+ // }
- // I'm not smart enough to get this done with LUFA - BCG
- dprintf("Setting host driver to PJRC...\n");
- host_set_driver(pjrc_driver());
-#ifdef SLEEP_LED_ENABLE
- sleep_led_init();
-#endif
// wait an extra second for the PC's operating system
// to load drivers and do whatever it does to actually
// be ready for input
_delay_ms(1000);
- PORTB = ~_BV(PB0);
+ // PORTD = ~_BV(PD5);
dprintf("Starting main loop");
while (1) {
- while (suspend) {
- suspend_power_down();
- if (remote_wakeup && suspend_wakeup_condition()) {
- usb_remote_wakeup();
- }
- }
- keyboard_task();
+ keyboard_task();
}
- }
+
+// } else {
+
+// // I'm not smart enough to get this done with LUFA - BCG
+// dprintf("Setting host driver to PJRC...\n");
+// host_set_driver(pjrc_driver());
+// #ifdef SLEEP_LED_ENABLE
+// sleep_led_init();
+// #endif
+// // wait an extra second for the PC's operating system
+// // to load drivers and do whatever it does to actually
+// // be ready for input
+// _delay_ms(1000);
+// PORTB = ~_BV(PB0);
+// dprintf("Starting main loop");
+// while (1) {
+// while (suspend) {
+// suspend_power_down();
+// if (remote_wakeup && suspend_wakeup_condition()) {
+// usb_remote_wakeup();
+// }
+// }
+// keyboard_task();
+// }
+// }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 18:40:50 +0000