Project

General

Profile

Revision 1166

Added # to the beginning of every USB output line, as it should not be interpreted by the server.

View differences:

main.c
21 21
		communication_ok=test_comm ();
22 22

  
23 23
	if (!communication_ok)
24
		usb_puts ("Communications required. Stop." NL);
24
		usb_puts ("# Communications required. Stop." NL);
25 25

  
26 26
	return communication_ok;
27 27
}
......
32 32
	// succeeded before (that's what test_all means).
33 33
	if (!test_comm ())
34 34
	{
35
		usb_puts ("Communications require. Stop." NL);
35
		usb_puts ("# Communications required. Stop." NL);
36 36
		return;
37 37
	}
38 38
	
......
50 50
		orbs_set (0,255,0, 0,255,0);
51 51

  
52 52
		usb_puts (NL);
53
		usb_puts ("Diagnostic station interactive mode" NL);
54
		usb_puts ("Test (s)elf, (a)ll, (c)omm, (b)om, (r)angefinders, (m)otors, (e)ncoders" NL);
53
		usb_puts ("# Diagnostic station interactive mode" NL);
54
		usb_puts ("# Test (s)elf, (a)ll, (c)omm, (b)om, (r)angefinders, (m)otors, (e)ncoders" NL);
55 55

  
56 56
		char choice = usb_getc ();
57 57
		switch (choice) {
......
63 63
			case 'e': case 'E': if (require_comm ()) test_encoders ();      break;
64 64
			case 's': case 'S': self_test ();                               break;
65 65
			default: break; // ignore it
66
//				usb_puts("Received invalid input ");
67
//				usb_putc(choice);
68
//				usb_puts(NL);
69 66
		}
70 67
	}
71 68
}
......
88 85
    usb_init ();
89 86

  
90 87
	usb_puts(NL NL NL);
91
	usb_puts("Diagnostic station version " version_string " starting" NL);
88
	usb_puts("# Diagnostic station version " version_string " starting" NL);
92 89

  
93 90
    orb_init_pwm ();
94 91
	hardware_init ();
95 92

  
96
	orb1_set (255, 0, 0); usb_puts("Initializing wireless" NL);
93
	orb1_set (255, 0, 0); usb_puts("# Initializing wireless" NL);
97 94
	xbee_init ();
98 95
	wl_init();
99
	orb2_set (255, 0, 0); usb_puts("Done" NL);
96
	orb2_set (255, 0, 0); usb_puts("# Done" NL);
100 97

  
101 98
	if (button1_read ())
102 99
			test_all ();

Also available in: Unified diff