Browse Source

Fix usage of debug flag

tags/v1.9
tmk 11 years ago
parent
commit
16a583d7fd
7 changed files with 4 additions and 46 deletions
  1. 0
    1
      common/debug.h
  2. 1
    1
      common/keyboard.c
  3. 1
    1
      common/print.c
  4. 0
    3
      protocol/iwrap/main.c
  5. 2
    9
      protocol/lufa/lufa.c
  6. 0
    27
      protocol/pjrc/main.c
  7. 0
    4
      protocol/vusb/main.c

+ 0
- 1
common/debug.h View File

@@ -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_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_bin(data) debug_bin8(data)
#define debug_bin_reverse(data) debug_bin8(data)

+ 1
- 1
common/keyboard.c View File

@@ -544,7 +544,7 @@ static inline void process_key(keyevent_t event)

void keyboard_init(void)
{
debug_keyboard = true;
// TODO: to enable debug print magic key bind on boot time

// TODO: configuration of sendchar impl
print_sendchar_func = sendchar;

+ 1
- 1
common/print.c View File

@@ -31,7 +31,7 @@


int8_t (*print_sendchar_func)(uint8_t) = 0;
bool print_enable = false;
bool print_enable = true;


/* print string stored in data memory(SRAM)

+ 0
- 3
protocol/iwrap/main.c View File

@@ -131,9 +131,6 @@ int main(void)
//pullup_pins();
//set_prr();

print_enable = true;
debug_enable = false;

#ifdef HOST_VUSB
disable_vusb();
#endif

+ 2
- 9
protocol/lufa/lufa.c View File

@@ -461,19 +461,12 @@ int main(void) __attribute__ ((weak));
int main(void)
{
SetupHardware();
keyboard_init();
host_set_driver(&lufa_driver);
sei();

print_enable = true;
debug_enable = true;
debug_matrix = true;
debug_keyboard = true;
debug_mouse = true;

// TODO: can't print here
debug("LUFA init\n");

keyboard_init();
host_set_driver(&lufa_driver);
while (1) {
keyboard_task();


+ 0
- 27
protocol/pjrc/main.c View File

@@ -57,33 +57,6 @@ int main(void)
while (!usb_configured()) /* wait */ ;

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());
while (1) {
keyboard_task();

+ 0
- 4
protocol/vusb/main.c View File

@@ -53,10 +53,6 @@ int main(void)
uart_init(UART_BAUD_RATE);
#endif

debug_enable = true;
print_enable = true;

debug("keyboard_init()\n");
keyboard_init();
host_set_driver(vusb_driver());


Loading…
Cancel
Save