annotate testavr.c @ 71:553c061fda7c default tip

Keep the newer GCC happy.
author darius@Inchoate
date Mon, 19 Jan 2009 22:54:19 +1030
parents 1ef17cd8af7a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
1 /*
9
7ed10c59ba06 Supply clock speed via the command line so 1wire-delay.h can use it.
darius
parents: 7
diff changeset
2 * Test various AVR bits and pieces
7ed10c59ba06 Supply clock speed via the command line so 1wire-delay.h can use it.
darius
parents: 7
diff changeset
3 *
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
4 * Copyright (c) 2008
0
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
5 * Daniel O'Connor <darius@dons.net.au>. All rights reserved.
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
6 *
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
7 * Redistribution and use in source and binary forms, with or without
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
8 * modification, are permitted provided that the following conditions
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
9 * are met:
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
10 * 1. Redistributions of source code must retain the above copyright
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
11 * notice, this list of conditions and the following disclaimer.
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
15 *
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
26 * SUCH DAMAGE.
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
27 */
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
28
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
29 #include <avr/io.h>
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
30 #include <avr/interrupt.h>
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
31 #include <avr/pgmspace.h>
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
32 #include <stdio.h>
0
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
33 #include <string.h>
4
81e2f85e02ce Implement a command driven 1 wire bus tool.
darius
parents: 0
diff changeset
34 #include <ctype.h>
13
2c03ec600dbc Reduce object code size as much as possible.
darius
parents: 11
diff changeset
35 #include <stdlib.h>
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
36 #include <util/delay.h>
47
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
37 #include <avr/wdt.h>
0
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
38
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
39 #include "cons.h"
0
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
40 #include "1wire.h"
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
41 #ifdef WITHUSB
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
42 #include "usb.h"
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
43 #endif
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
44 #include "tempctrl.h"
60
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
45 #include "ds1307.h"
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
46
47
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
47 /*
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
48 * Mirror of the MCUCSR register, taken early during startup.
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
49 */
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
50 uint8_t mcucsr __attribute__((section(".noinit")));
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
51
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
52 void process_cmd(void);
0
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
53
47
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
54 /*
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
55 * Read out and reset MCUCSR early during startup.
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
56 */
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
57 void handle_mcucsr(void)
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
58 __attribute__((section(".init3")))
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
59 __attribute__((naked));
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
60 void handle_mcucsr(void) {
53
98b5a43fc748 Disable WDT in reset just in case we take too long (eg after reset when the
darius@Inchoate
parents: 52
diff changeset
61 wdt_disable();
47
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
62 mcucsr = MCUCSR;
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
63 MCUCSR = 0;
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
64 }
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
65
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
66 int
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
67 main(void) {
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
68 /* Disable interrupts while we frob stuff */
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
69 cli();
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
70
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
71 #if 0
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
72 /* Disable JTAG (yes twice) */
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
73 MCUCSR |= _BV(JTD);
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
74 MCUCSR |= _BV(JTD);
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
75 #endif
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
76
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
77 #ifdef WITHUSB
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
78 /* USB data bus (7:0) */
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
79 DDRA = 0x00;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
80 PORTA = 0x00;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
81
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
82 /* USB control (4:0) */
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
83 DDRB = 0x0d;
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
84 PORTB = 0x00;
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
85 #else
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
86 DDRA = 0xff;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
87 PORTA = 0x00;
54
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
88
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
89 DDRB = 0x00;
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
90 PORTB = 0x00;
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
91
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
92 #endif
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
93 /* GPIO (0:7) */
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
94 DDRC = 0xff;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
95 PORTC = 0x00;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
96
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
97 /* USART (0:1), IDBus (2:5), 485 (6:6), GPIO (7:7) */
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
98 DDRD = 0xf7;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
99 PORTD = 0xf7;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
100
54
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
101 #ifndef WITHUSB
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
102 /* Beep
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
103 *
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
104 * Fpwm = Fclk / (N * 510)
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
105 * = 16e6 / (8 * 510)
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
106 * = 3921Hz
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
107 *
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
108 * Behind ifndef because PB3 is A0 on PDI chip
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
109 *
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
110 * Phase correct PWM, non-inverted output, divide by 8 */
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
111 TCCR0 = _BV(WGM00) | _BV(WGM11) | _BV(COM00) | _BV(COM01) | _BV(CS01);
56
09f8d879afb9 Make it louder.
darius@Inchoate
parents: 54
diff changeset
112 OCR0 = 128;
54
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
113 #endif
58f1ec46bff6 Add a beeper when the data is stale (only when USB is disabled as they share
darius@Inchoate
parents: 53
diff changeset
114
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
115 /* Set up the one wire stuff */
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
116 OWInit();
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
117
60
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
118 /* Setup IIC */
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
119 ds1307_init();
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
120
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
121 /* Init UART */
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
122 cons_init();
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
123
60
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
124 /* Init temperature control stuff */
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
125 tempctrl_init();
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
126
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
127 printf_P(PSTR("\r\n\r\n===============\r\n"
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
128 "Inited!\r\n\r\n"));
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
129
47
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
130 if ((mcucsr & _BV(PORF)) == _BV(PORF))
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
131 printf_P(PSTR("Power on reset\r\n"));
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
132
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
133 if ((mcucsr & _BV(EXTRF)) == _BV(EXTRF))
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
134 printf_P(PSTR("External reset\r\n"));
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
135
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
136 if ((mcucsr & _BV(BORF)) == _BV(BORF))
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
137 printf_P(PSTR("Brown-out reset\r\n"));
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
138
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
139 if ((mcucsr & _BV(WDRF)) == _BV(WDRF))
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
140 printf_P(PSTR("Watchdog reset\r\n"));
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
141
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
142 if ((mcucsr & _BV(JTRF)) == _BV(JTRF))
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
143 printf_P(PSTR("JTAG reset\r\n"));
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
144
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
145 /* Ready to go! */
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
146 sei();
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
147
47
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
148 /*
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
149 * Enable the watchdog with the largest prescaler. Will cause a
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
150 * watchdog reset after approximately 2 s @ Vcc = 5 V
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
151 *
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
152 * Gets reset in the loop below and in the tempctrl.c timer IRQ
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
153 */
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
154 wdt_enable(WDTO_2S);
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
155
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
156 #ifdef WITHUSB
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
157 printf_P(PSTR("Calling usb_init\r\n"));
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
158 usb_init();
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
159 printf_P(PSTR("done\r\n"));
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
160 _delay_us(1000);
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
161 #endif
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
162 printf_P(PSTR("> "));
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
163 cmd.state = 0;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
164
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
165 /* Wait for user input or an "interrupt" */
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
166 while (1) {
47
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
167 wdt_reset();
13a68734348b Add watchdog timer.
darius@Inchoate
parents: 41
diff changeset
168
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
169 tempctrl_update();
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
170
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
171 if (cmd.state == 255) {
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
172 process_cmd();
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
173 printf_P(PSTR("> "));
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
174 /* Allow new characters to be processed */
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
175 cmd.state = 0;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
176 }
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
177
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
178 #ifdef WITHUSB
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
179 if (!(PDICTL & _BV(PDIINT)))
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
180 usb_intr();
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
181 #endif
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
182 }
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
183 }
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
184
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
185 void
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
186 process_cmd(void) {
52
3217e93b28a3 Missed variable declaration changes from previous commit.
darius@Inchoate
parents: 51
diff changeset
187 uint8_t ROM[8], crc, buf[9], temp;
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
188 int8_t i, arg;
52
3217e93b28a3 Missed variable declaration changes from previous commit.
darius@Inchoate
parents: 51
diff changeset
189 int16_t t;
0
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
190
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
191 /* User just pressed enter */
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
192 if (cmd.len == 0)
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
193 return;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
194
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
195 if (!strcasecmp_P((char *)cmd.buf, PSTR("?")) ||
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
196 !strcasecmp_P((char *)cmd.buf, PSTR("help"))) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
197 printf_P(PSTR("rs Reset and check for presence\r\n"
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
198 "sr Search the bus for ROMs\r\n"
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
199 "re Read a bit\r\n"
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
200 "rb Read a byte\r\n"
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
201 "wr bit Write a bit\r\n"
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
202 "wb byte Write a byte (hex)\r\n"
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
203 "wc cmd [ROMID] Write command\r\n"
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
204 "te ROMID Read the temperature from a DS1820\r\n"
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
205 "in port Read from a port\r\n"
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
206 "ou port val Write to a port (val in hex)\r\n"
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
207 "dd port [val] Read/write DDR for a port (val in hex)\r\n"
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
208 "rt ROMID Read DS2502 status page\r\n"
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
209 "we ROMID adr val Write data into a DS2502 PROM (adr & val in hex)\r\n"
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
210 "rr ROMID Read DS2502 PROM\r\n"
65
1ef17cd8af7a Tab to space conversion in usage text.
darius@Inchoate
parents: 63
diff changeset
211 "zz Reset MCU\r\n"
60
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
212 "gc Get time of day\r\n"
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
213 "sc time Set time of day (time is YYYY/MM/DD HH:MM:SS)\r\n"
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
214 #ifdef WITHUSB
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
215 "us Generate USB data\r\n"
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
216 #endif
63
4d914a1fd487 Fix printf typo from last commit.
darius@Inchoate
parents: 60
diff changeset
217 "tc ... Temperature control related (tc help for more)\r\n"));
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
218
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
219 return;
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
220 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("zz"), 2)) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
221 cli();
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
222 wdt_enable(WDTO_15MS);
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
223 for (;;)
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
224 ;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
225 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("rs"), 2)) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
226 printf_P(PSTR("Resetting... "));
4
81e2f85e02ce Implement a command driven 1 wire bus tool.
darius
parents: 0
diff changeset
227
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
228 if (OWTouchReset() == 1)
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
229 printf_P(PSTR("No presence pulse found\r\n"));
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
230 else
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
231 printf_P(PSTR("Presence pulse found\r\n"));
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
232 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("re"), 2)) {
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
233 if (OWReadBit())
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
234 printf_P(PSTR("Read a 1\r\n"));
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
235 else
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
236 printf_P(PSTR("Read a 0\r\n"));
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
237 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("rb"), 2)) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
238 printf_P(PSTR("Read a 0x%02x\r\n"), OWReadByte());
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
239 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("wr"), 2)) {
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
240 arg = strtol((char *)cmd.buf + 3, (char **)NULL, 10);
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
241 OWWriteBit(arg);
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
242 printf_P(PSTR("Wrote a %c\r\n"), arg ? '1' : '0');
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
243 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("wb"), 2)) {
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
244 arg = (int)strtol((char *)cmd.buf + 3, (char **)NULL, 16);
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
245 OWWriteByte(arg);
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
246 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("rt"), 2)) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
247 if (sscanf_P((char *)cmd.buf, PSTR("rt %hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx"),
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
248 &ROM[0], &ROM[1], &ROM[2], &ROM[3],
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
249 &ROM[4], &ROM[5], &ROM[6], &ROM[7]) != 8) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
250 printf_P(PSTR("Unable to parse ROM ID\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
251 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
252 }
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
253
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
254 if (ROM[0] != OW_FAMILY_ROM) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
255 printf_P(PSTR("ROM specified isn't a DS2502\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
256 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
257 }
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
258
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
259 if (OWTouchReset() != 0) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
260 printf_P(PSTR("No presence\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
261 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
262 }
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
263
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
264 crc = 0;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
265
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
266 OWCRC(OW_READ_STATUS, &crc);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
267 OWSendCmd(ROM, OW_READ_STATUS);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
268
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
269 OWWriteByte(0x00);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
270 OWCRC(0x00, &crc);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
271
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
272 OWWriteByte(0x00);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
273 OWCRC(0x00, &crc);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
274
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
275 if (crc != OWReadByte()) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
276 printf_P(PSTR("CRC mismatch on command & address\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
277 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
278 }
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
279
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
280 crc = 0;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
281 for (i = 0; i < 8; i++) {
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
282 temp = OWReadByte();
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
283 printf_P(PSTR("%02x "), temp);
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
284 OWCRC(temp, &crc);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
285 }
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
286 printf_P(PSTR("\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
287 if (crc != OWReadByte()) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
288 printf_P(PSTR("CRC mismatch on data\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
289 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
290 }
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
291 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("we"), 2)) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
292 uint8_t adr, data;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
293
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
294 if (sscanf_P((char *)cmd.buf, PSTR("we %hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx %hhx %hhx"),
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
295 &ROM[0], &ROM[1], &ROM[2], &ROM[3],
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
296 &ROM[4], &ROM[5], &ROM[6], &ROM[7],
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
297 &adr, &data) != 10) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
298 printf_P(PSTR("Unable to parse ROM ID\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
299 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
300 }
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
301
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
302 if (ROM[0] != OW_FAMILY_ROM) {
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
303 printf_P(PSTR("ID specified isn't a ROM\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
304 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
305 }
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
306
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
307 if (OWTouchReset() != 0) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
308 printf_P(PSTR("No presence\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
309 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
310 }
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
311
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
312 printf_P(PSTR("OWProgROM returned %S\r\n"), OWProgROM_Status[OWProgROM(ROM, buf[0], 2, &buf[1], 0, 0)]);
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
313 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("rr"), 2)) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
314 if (sscanf_P((char *)cmd.buf, PSTR("rr %hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx"),
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
315 &ROM[0], &ROM[1], &ROM[2], &ROM[3],
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
316 &ROM[4], &ROM[5], &ROM[6], &ROM[7]) != 8) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
317 printf_P(PSTR("Unable to parse ROM ID\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
318 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
319 }
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
320
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
321 if (ROM[0] != OW_FAMILY_ROM) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
322 printf_P(PSTR("ROM specified isn't a ROM\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
323 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
324 }
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
325
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
326 crc = 0;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
327 OWSendCmd(ROM, OW_READ_MEMORY);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
328 OWCRC(OW_READ_MEMORY, &crc);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
329
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
330 OWWriteByte(0x00);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
331 OWCRC(0x00, &crc);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
332
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
333 OWWriteByte(0x00);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
334 OWCRC(0x00, &crc);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
335
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
336 if (crc != OWReadByte()) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
337 printf_P(PSTR("CRC mismatch on command & address\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
338 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
339 }
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
340
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
341 crc = 0;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
342 for (buf[0] = 0; buf[0] < 128; buf[0]++) {
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
343 buf[1] = OWReadByte();
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
344 if (buf[0] > 0) {
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
345 if (buf[0] % 16 != 0)
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
346 printf_P(PSTR(" "));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
347 else
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
348 printf_P(PSTR("\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
349 }
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
350
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
351 printf_P(PSTR("%02x"), buf[1]);
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
352 OWCRC(buf[1], &crc);
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
353 }
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
354 printf_P(PSTR("\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
355 if (crc != OWReadByte()) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
356 printf_P(PSTR("CRC mismatch on data\r\n"));
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
357 return;
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
358 }
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
359
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
360 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("wc"), 2)) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
361 uint8_t c;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
362
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
363 i = sscanf_P((char *)cmd.buf, PSTR("wc %hhx %hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx"),
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
364 &ROM[0], &ROM[1], &ROM[2], &ROM[3],
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
365 &ROM[4], &ROM[5], &ROM[6], &ROM[7],
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
366 &c);
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
367
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
368 if (i != 1 && i != 9) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
369 printf_P(PSTR("Incorrect usage\r\n"));
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
370 return;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
371 }
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
372
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
373 if (i == 1) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
374 OWSendCmd(i == 1 ? NULL : ROM, c);
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
375 return;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
376 }
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
377 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("te"), 2)) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
378 if (sscanf_P((char *)cmd.buf, PSTR("te %hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx:%hhx"),
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
379 &ROM[0], &ROM[1], &ROM[2], &ROM[3],
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
380 &ROM[4], &ROM[5], &ROM[6], &ROM[7]) != 8) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
381 printf_P(PSTR("Unable to parse ROM ID\r\n"));
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
382 return;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
383 }
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
384
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
385 t = OWGetTemp(ROM);
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
386 switch (t) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
387 case OW_TEMP_WRONG_FAM:
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
388 printf_P(PSTR("ROM specified isn't a temperature sensor\r\n"));
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
389 break;
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
390
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
391 case OW_TEMP_CRC_ERR:
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
392 printf_P(PSTR("CRC mismatch\r\n"));
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
393 break;
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
394
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
395 case OW_TEMP_NO_ROM:
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
396 printf_P(PSTR("No ROM found\r\n"));
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
397 break;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
398
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
399 default:
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
400 printf_P(PSTR("%d.%02d\r\n"), GETWHOLE(t), GETFRAC(t));
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
401 break;
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
402 }
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
403 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("sr"), 2)) {
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
404 memset(ROM, 0, 8);
10
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
405
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
406 i = OWFirst(ROM, 1, 0);
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
407 do {
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
408 switch (i) {
10
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
409 case OW_BADWIRE:
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
410 printf_P(PSTR("Presence pulse, but no module found, bad module/cabling?\r\n"));
10
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
411 break;
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
412
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
413 case OW_NOPRESENCE:
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
414 printf_P(PSTR("No presence pulse found\r\n"));
10
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
415 break;
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
416
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
417 case OW_BADCRC:
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
418 printf_P(PSTR("Bad CRC\r\n"));
10
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
419 break;
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
420
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
421 case OW_NOMODULES:
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
422 case OW_FOUND:
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
423 break;
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
424
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
425 default:
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
426 printf_P(PSTR("Unknown error from 1 wire library\r\n"));
10
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
427 break;
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
428 }
10
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
429
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
430 if (i != OW_FOUND)
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
431 break;
13
2c03ec600dbc Reduce object code size as much as possible.
darius
parents: 11
diff changeset
432
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
433 for (i = 0; i < 8; i++)
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
434 printf_P(PSTR("%02x%S"), ROM[i], i == 7 ? PSTR("\r\n") : PSTR(":"));
10
eb1faf51968e - Add some useful return values to search functions.
darius
parents: 9
diff changeset
435
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
436 i = OWNext(ROM, 1, 0);
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
437 } while (1);
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
438 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("in"), 2)) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
439 uint8_t inp;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
440
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
441 switch (tolower(cmd.buf[3])) {
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
442 case 'a':
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
443 inp = PINA;
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
444 break;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
445
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
446 case 'b':
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
447 inp = PINB;
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
448 break;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
449
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
450 case 'c':
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
451 inp = PINC;
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
452 break;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
453
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
454 case 'd':
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
455 inp = PIND;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
456 break;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
457
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
458 default:
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
459 printf_P(PSTR("Unknown port\r\n"));
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
460 return;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
461 }
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
462 printf_P(PSTR("0x%02x\r\n"), inp);
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
463 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("ou"), 2)) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
464 char port;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
465 int val;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
466
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
467 if (sscanf_P((char *)cmd.buf, PSTR("ou %c %x"), &port, &val) != 2) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
468 printf_P(PSTR("Unable to parse ou arguments\r\n"));
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
469 return;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
470 }
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
471
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
472 switch (port) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
473 case 'a':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
474 PORTA = val & 0xff;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
475 break;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
476
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
477 case 'b':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
478 PORTB = val & 0xff;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
479 break;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
480
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
481 case 'c':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
482 PORTC = val & 0xff;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
483 break;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
484
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
485 case 'd':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
486 PORTD = val & 0xff;
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
487 break;
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
488
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
489 default:
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
490 printf_P(PSTR("Unknown port\r\n"));
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
491 return;
0
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
492 }
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
493 printf_P(PSTR("PORT%c <= 0x%02x\r\n"), toupper(port), val);
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
494 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("dd"), 2)) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
495 char port;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
496 uint8_t val;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
497 int num;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
498
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
499 num = sscanf_P((char *)cmd.buf, PSTR("dd %c %x"), &port, &val);
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
500
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
501 if (num != 2 && num != 3) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
502 printf_P(PSTR("Unable to parse dd arguments\r\n"));
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
503 return;
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
504 }
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
505
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
506 if (num == 2) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
507 switch (port) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
508 case 'a':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
509 val = DDRA;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
510 break;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
511
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
512 case 'b':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
513 val = DDRB;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
514 break;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
515
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
516 case 'c':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
517 val = DDRC;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
518 break;
63
4d914a1fd487 Fix printf typo from last commit.
darius@Inchoate
parents: 60
diff changeset
519
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
520 case 'd':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
521 val = DDRD;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
522 break;
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
523
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
524 default:
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
525 printf_P(PSTR("Unknown port\r\n"));
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
526 return;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
527 }
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
528 printf_P(PSTR("DDR%c => 0x%02x\r\n"), toupper(port), val);
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
529 } else {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
530 switch (port) {
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
531 case 'a':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
532 DDRA = val & 0xff;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
533 break;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
534
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
535 case 'b':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
536 DDRB = val & 0xff;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
537 break;
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
538
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
539 case 'c':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
540 DDRC = val & 0xff;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
541 break;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
542
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
543 case 'd':
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
544 DDRD = val & 0xff;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
545 break;
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
546
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
547 default:
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
548 printf_P(PSTR("Unknown port\r\n"));
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
549 return;
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
550 }
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
551 printf_P(PSTR("DDR%c <= 0x%02x\r\n"), toupper(port), val);
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
552 }
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
553 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("tc"), 2)) {
41
5898fba6593c Add temperature control.
darius@inchoate.localdomain
parents: 38
diff changeset
554 tempctrl_cmd((char *)cmd.buf);
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
555 #ifdef WITHUSB
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
556 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("us"), 2)) {
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
557 usb_gendata();
37
25fa387ef7e9 - Conditionalise USB support.
darius
parents: 30
diff changeset
558 #endif
60
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
559 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("gc"), 2)) {
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
560 ds1307_printtime(PSTR(""), PSTR("\r\n"));
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
561 } else if (!strncasecmp_P((char *)cmd.buf, PSTR("sc"), 2)) {
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
562 if (cmd.len < 17) {
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
563 printf_P(PSTR("Command not long enough\r\n"));
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
564 } else {
63
4d914a1fd487 Fix printf typo from last commit.
darius@Inchoate
parents: 60
diff changeset
565 if (ds1307_settod((char *)cmd.buf + 3) != 1)
60
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
566 printf_P(PSTR("Unable to set time of day\r\n"));
50fca9562310 Add support for reading/writing to a DS1307 over TWI/IIC.
darius@Inchoate
parents: 56
diff changeset
567 }
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
568 } else {
51
cb184206344d Rejig command parsing and assume the compiler isn't dumb (eg it can reuse
darius@Inchoate
parents: 47
diff changeset
569 printf_P(PSTR("Unknown command, help for a list\r\n"));
0
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
570 }
24
2b0ed085b95b - Change to 38400 baud.
darius
parents: 18
diff changeset
571 }
0
ffeab3c04e83 Initial revision
darius
parents:
diff changeset
572