Fix usage of debug flag

pull/12/head
tmk 12 years ago
parent 9389585d3d
commit 16a583d7fd

@ -46,7 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define debug_bin_reverse16(data) do { if (debug_enable) print_bin_reverse16(data); } while (0) #define debug_bin_reverse16(data) do { if (debug_enable) print_bin_reverse16(data); } while (0)
#define debug_bin_reverse32(data) do { if (debug_enable) print_bin_reverse32(data); } while (0) #define debug_bin_reverse32(data) do { if (debug_enable) print_bin_reverse32(data); } while (0)
#define debug_dec(data) debug_dec(data)
#define debug_hex(data) debug_hex8(data) #define debug_hex(data) debug_hex8(data)
#define debug_bin(data) debug_bin8(data) #define debug_bin(data) debug_bin8(data)
#define debug_bin_reverse(data) debug_bin8(data) #define debug_bin_reverse(data) debug_bin8(data)

@ -544,7 +544,7 @@ static inline void process_key(keyevent_t event)
void keyboard_init(void) void keyboard_init(void)
{ {
debug_keyboard = true; // TODO: to enable debug print magic key bind on boot time
// TODO: configuration of sendchar impl // TODO: configuration of sendchar impl
print_sendchar_func = sendchar; print_sendchar_func = sendchar;

@ -31,7 +31,7 @@
int8_t (*print_sendchar_func)(uint8_t) = 0; int8_t (*print_sendchar_func)(uint8_t) = 0;
bool print_enable = false; bool print_enable = true;
/* print string stored in data memory(SRAM) /* print string stored in data memory(SRAM)

@ -131,9 +131,6 @@ int main(void)
//pullup_pins(); //pullup_pins();
//set_prr(); //set_prr();
print_enable = true;
debug_enable = false;
#ifdef HOST_VUSB #ifdef HOST_VUSB
disable_vusb(); disable_vusb();
#endif #endif

@ -461,19 +461,12 @@ int main(void) __attribute__ ((weak));
int main(void) int main(void)
{ {
SetupHardware(); SetupHardware();
keyboard_init();
host_set_driver(&lufa_driver);
sei(); sei();
print_enable = true;
debug_enable = true;
debug_matrix = true;
debug_keyboard = true;
debug_mouse = true;
// TODO: can't print here // TODO: can't print here
debug("LUFA init\n"); debug("LUFA init\n");
keyboard_init();
host_set_driver(&lufa_driver);
while (1) { while (1) {
keyboard_task(); keyboard_task();

@ -57,33 +57,6 @@ int main(void)
while (!usb_configured()) /* wait */ ; while (!usb_configured()) /* wait */ ;
keyboard_init(); keyboard_init();
matrix_scan();
if (matrix_key_count() >= 3) {
#ifdef DEBUG_LED
for (int i = 0; i < 6; i++) {
DEBUG_LED_CONFIG;
DEBUG_LED_ON;
_delay_ms(500);
DEBUG_LED_OFF;
_delay_ms(500);
}
#else
_delay_ms(5000);
#endif
print_enable = true;
debug_enable = true;
debug_matrix = true;
debug_keyboard = true;
debug_mouse = true;
print("debug enabled.\n");
}
if (matrix_key_count() >= 4) {
print("jump to bootloader...\n");
_delay_ms(1000);
bootloader_jump(); // not return
}
host_set_driver(pjrc_driver()); host_set_driver(pjrc_driver());
while (1) { while (1) {
keyboard_task(); keyboard_task();

@ -53,10 +53,6 @@ int main(void)
uart_init(UART_BAUD_RATE); uart_init(UART_BAUD_RATE);
#endif #endif
debug_enable = true;
print_enable = true;
debug("keyboard_init()\n");
keyboard_init(); keyboard_init();
host_set_driver(vusb_driver()); host_set_driver(vusb_driver());

Loading…
Cancel
Save