annotate main.c @ 45:a0f2fcc6d9dd

add buildid
author Matt Johnston <matt@ucc.asn.au>
date Sat, 29 Jun 2013 23:46:39 +0800
parents 69cbf9ce72b5
children b1c27f1d6289
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1 #include <stdio.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
2 #include <string.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
3 #include <stddef.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
4 #include <stdbool.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
5 #include <stdlib.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
6 #include <avr/io.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
7 #include <avr/interrupt.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
8 #include <avr/sleep.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
9 #include <util/delay.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
10 #include <avr/pgmspace.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
11 #include <avr/eeprom.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
12 #include <avr/wdt.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
13 #include <util/atomic.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
14 #include <util/crc16.h>
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
15
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
16 #include "buildid.h"
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
17
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
18 #include "hmac-sha1.h"
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
19 #include "aes.h"
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
20
43
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
21 #include "fat.h"
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
22 #include "fat_config.h"
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
23 #include "partition.h"
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
24 #include "sd_raw.h"
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
25 #include "sd_raw_config.h"
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
26
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
27 //#include "simple_ds18b20.h"
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
28 //#include "onewire.h"
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
29
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
30 // not set via bootloader
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
31 //LOCKBITS = (LB_MODE_3 & BLB0_MODE_4 & BLB1_MODE_4);
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
32
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
33 #define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
34 #define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
35
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
36 // TICK should be 8 or less (8 untested). all timers need
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
37 // to be a multiple.
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
38
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
39 #define TICK 1
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
40 #define SLEEP_COMPARE (F_CPU/256) // == 19200 for 4915200mhz
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
41 #define NKEYS 10
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
42 #define HMACLEN 20
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
43 #define AESLEN 16
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
44 #define KEYLEN HMACLEN
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
45 // 64 bits is enough for a realtime challenge
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
46 #define CHALLEN 8
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
47
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
48 #define BAUD 115200
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
49 #define UBRR ((F_CPU)/(16*(BAUD))-1)
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
50
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
51 #define PORT_PI_BOOT PORTD
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
52 #define DDR_PI_BOOT DDRD
4
fd28c7358ce8 more additions, set ports
Matt Johnston <matt@ucc.asn.au>
parents: 2
diff changeset
53 #define PIN_PI_BOOT PD5
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
54
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
55 #define PORT_PI_RESET PORTD
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
56 #define DDR_PI_RESET DDRD
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
57 #define PIN_PI_RESET PD6
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
58
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
59 #define PORT_PI_WARNING PORTD
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
60 #define DDR_PI_WARNING DDRD
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
61 #define PIN_PI_WARNING PD7
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
62
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
63 // #define HAVE_UART_ECHO
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
64
7
76f3ed943180 a few fixes
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
65 // stores a value of clock_epoch combined with the remainder of TCNT1,
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
66 // for 1/32 second accuracy
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
67 struct epoch_ticks
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
68 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
69 uint32_t ticks;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
70 // remainder
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
71 uint16_t rem;
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
72 };
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
73
16
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
74 #define WATCHDOG_LONG_MIN (60L*40) // 40 mins
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
75 #define WATCHDOG_LONG_MAX (60L*60*72) // 72 hours
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
76 #define WATCHDOG_LONG_DEFAULT (60L*60*6) // 6 hours
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
77
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
78 #define WATCHDOG_SHORT_MIN (60L*15) // 15 mins
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
79
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
80 #define NEWBOOT_DEFAULT (60*10) // 10 minutes
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
81 #define NEWBOOT_MIN (60*2) // 2 minutes
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
82 #define NEWBOOT_MAX (60*30) // 30 mins
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
83
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
84 #define WARNING_TIME 10
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
85
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
86 // eeprom-settable parameters, default values defined here.
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
87 // all timeouts should be a multiple of TICK
16
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
88 static uint32_t watchdog_long_limit = WATCHDOG_LONG_DEFAULT;
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
89 static uint32_t watchdog_short_limit = 0;
16
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
90 static uint32_t newboot_limit = NEWBOOT_DEFAULT;
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
91
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
92 // avr proves itself
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
93 static uint8_t avr_keys[NKEYS][KEYLEN] = {{0}};
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
94
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
95 // ---- Atomic guards required accessing these variables
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
96 // clock_epoch in seconds
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
97 static uint32_t clock_epoch;
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
98 // watchdog counts up
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
99 static uint32_t watchdog_long_count;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
100 static uint32_t watchdog_short_count;
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
101 // newboot counts down
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
102 static uint32_t newboot_count;
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
103 // oneshot counts down
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
104 static uint32_t oneshot_count;
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
105 // countdown after the warning.
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
106 static uint8_t reboot_count;
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
107 // set by adc completion interrupt
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
108 static uint8_t adc_done;
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
109
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
110 // ---- End atomic guards required
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
111
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
112 // boolean flags
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
113 static uint8_t watchdog_long_hit;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
114 static uint8_t watchdog_short_hit;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
115 static uint8_t newboot_hit;
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
116 static uint8_t oneshot_hit;
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
117 static uint8_t reboot_hit;
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
118
22
a55d7c2440fd basically done
Matt Johnston <matt@ucc.asn.au>
parents: 21
diff changeset
119 // informational for status messages
a55d7c2440fd basically done
Matt Johnston <matt@ucc.asn.au>
parents: 21
diff changeset
120 static uint8_t boot_normal_status;
a55d7c2440fd basically done
Matt Johnston <matt@ucc.asn.au>
parents: 21
diff changeset
121
15
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
122 // flips between 0 and 1 each watchdog_long_hit, so eventually a
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
123 // working firmware should boot. set back to 0 for each 'alive'
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
124 // command
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
125 static uint8_t long_reboot_mode = 0;
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
126
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
127 static uint8_t boot_id_set = 0;
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
128 static uint8_t boot_id[HMACLEN];
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
129
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
130 static uint8_t readpos;
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
131 static char readbuf[150];
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
132 static uint8_t have_cmd;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
133
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
134 int uart_putchar(char c, FILE *stream);
22
a55d7c2440fd basically done
Matt Johnston <matt@ucc.asn.au>
parents: 21
diff changeset
135 static void long_delay(uint16_t ms);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
136 static void blink();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
137 static uint16_t adc_vcc();
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
138 static uint16_t adc_5v(uint16_t vcc);
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
139 static uint16_t adc_temp();
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
140 static void set_pi_boot_normal(uint8_t normal);
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
141 static void adc_random(uint8_t admux,
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
142 uint8_t *out, uint16_t num, uint32_t *tries);
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
143
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
144 static FILE mystdout = FDEV_SETUP_STREAM(uart_putchar, NULL,
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
145 _FDEV_SETUP_WRITE);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
146
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
147 // thanks to http://projectgus.com/2010/07/eeprom-access-with-arduino/
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
148 #define eeprom_read_to(dst_p, eeprom_field, dst_size) eeprom_read_block((dst_p), (void *)offsetof(struct __eeprom_data, eeprom_field), (dst_size))
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
149 #define eeprom_read(dst, eeprom_field) eeprom_read_to((&dst), eeprom_field, sizeof(dst))
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
150 #define eeprom_write_from(src_p, eeprom_field, src_size) eeprom_write_block((src_p), (void *)offsetof(struct __eeprom_data, eeprom_field), (src_size))
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
151 #define eeprom_write(src, eeprom_field) { eeprom_write_from(&src, eeprom_field, sizeof(src)); }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
152
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
153 #define EXPECT_MAGIC 0xdf83
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
154
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
155 struct __attribute__ ((__packed__)) __eeprom_data {
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
156 uint32_t watchdog_long_limit;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
157 uint32_t watchdog_short_limit;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
158 uint32_t newboot_limit;
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
159
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
160 uint8_t avr_keys[NKEYS][KEYLEN];
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
161
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
162 uint16_t magic;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
163 };
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
164
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
165 // Very first setup
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
166 static void
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
167 setup_chip()
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
168 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
169 cli();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
170
15
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
171 // set to 8 seconds, in case sha1 is slow etc.
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
172 wdt_enable(WDTO_8S);
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
173
15
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
174 // Set scaler to /1, -> clock to 8mhz
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
175 CLKPR = _BV(CLKPCE);
15
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
176 CLKPR = 0;
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
177
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
178 // enable pullups
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
179 // XXX matt pihelp
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
180 //PORTB = 0xff; // XXX change when using SPI
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
181 //PORTD = 0xff;
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
182 //PORTC = 0xff;
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
183
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
184 DDR_PI_WARNING |= _BV(PIN_PI_WARNING);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
185
41
d07aa7644c66 bit more fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 38
diff changeset
186 DDR_PI_RESET &= ~_BV(PIN_PI_RESET);
d07aa7644c66 bit more fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 38
diff changeset
187
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
188 #if 0
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
189 // set pullup
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
190 PORTD |= _BV(PD2);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
191 // INT0 setup
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
192 EICRA = (1<<ISC01); // falling edge - data sheet says it won't work?
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
193 EIMSK = _BV(INT0);
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
194 #endif
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
195
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
196 // comparator disable
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
197 ACSR = _BV(ACD);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
198
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
199 // disable adc pin input buffers
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
200 DIDR0 = 0x3F; // acd0-adc5
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
201 DIDR1 = (1<<AIN1D)|(1<<AIN0D); // ain0/ain1
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
202
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
203 sei();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
204 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
205
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
206 static void
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
207 get_epoch_ticks(struct epoch_ticks *t)
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
208 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
209 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
210 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
211 t->ticks = clock_epoch;
7
76f3ed943180 a few fixes
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
212 t->rem = TCNT1;
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
213 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
214 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
215
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
216 static void
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
217 setup_tick_counter()
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
218 {
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
219 // set up counter1
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
220
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
221 // set up counter2.
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
222 // COM21 COM20 Set OC2 on Compare Match (p116)
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
223 // WGM21 Clear counter on compare
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
224 //TCCR2A = _BV(COM2A1) | _BV(COM2A0) | _BV(WGM21);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
225 // toggle on match
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
226 TCCR1A = _BV(COM1A0);
8
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
227 #ifdef SIM_DEBUG
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
228 // systemclock/8
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
229 TCCR1B = _BV(CS11);
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
230 #else
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
231 // systemclock/256
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
232 TCCR1B = _BV(CS12);
8
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
233 #endif
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
234 TCNT1 = 0;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
235 OCR1A = SLEEP_COMPARE;
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
236 // interrupt
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
237 TIMSK1 = _BV(OCIE1A);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
238 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
239
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
240 static void
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
241 uart_on()
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
242 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
243 // Power reduction register
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
244 PRR &= ~_BV(PRUSART0);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
245
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
246 // All of this needs to be done each time after turning off the PRR
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
247 // baud rate
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
248 UBRR0H = (unsigned char)(UBRR >> 8);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
249 UBRR0L = (unsigned char)UBRR;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
250 UCSR0B = _BV(RXCIE0) | _BV(RXEN0) | _BV(TXEN0);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
251 //8N1
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
252 UCSR0C = _BV(UCSZ01) | _BV(UCSZ00);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
253 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
254
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
255 #ifdef SIM_DEBUG
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
256 static char sim_out[140];
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
257 static uint8_t sim_idx = 0;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
258 static uint8_t last_sim_idx = 0;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
259 #endif
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
260
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
261 int
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
262 uart_putchar(char c, FILE *stream)
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
263 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
264 // XXX could perhaps sleep in the loop for power.
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
265 if (c == '\n')
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
266 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
267 loop_until_bit_is_set(UCSR0A, UDRE0);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
268 UDR0 = '\r';
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
269 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
270 loop_until_bit_is_set(UCSR0A, UDRE0);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
271 UDR0 = c;
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
272 #ifdef SIM_DEBUG
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
273 sim_out[sim_idx] = c;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
274 sim_idx++;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
275 sim_idx %= sizeof(sim_out);
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
276 #endif
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
277 if (c == '\r')
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
278 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
279 loop_until_bit_is_set(UCSR0A, UDRE0);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
280 UDR0 = '\n';
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
281 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
282 return (unsigned char)c;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
283 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
284
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
285 #if 0
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
286
43
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
287 uint8_t find_file_in_dir(struct fat_fs_struct* fs, struct fat_dir_struct* dd, const char* name, struct fat_dir_entry_struct* dir_entry)
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
288 {
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
289 while(fat_read_dir(dd, dir_entry))
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
290 {
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
291 if(strcmp(dir_entry->long_name, name) == 0)
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
292 {
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
293 fat_reset_dir(dd);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
294 return 1;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
295 }
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
296 }
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
297
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
298 return 0;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
299 }
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
300
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
301 struct fat_file_struct*
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
302 open_file_in_dir(struct fat_fs_struct* fs, struct fat_dir_struct* dd, const char* name)
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
303 {
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
304 struct fat_dir_entry_struct file_entry;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
305 if(!find_file_in_dir(fs, dd, name, &file_entry))
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
306 return 0;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
307
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
308 return fat_open_file(fs, &file_entry);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
309 }
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
310
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
311 static uint32_t sd_serial = 0;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
312 static char conf_start[30];
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
313
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
314 static void
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
315 hmac_file(const char* fn)
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
316 {
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
317 uint8_t res;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
318
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
319 struct sd_raw_info disk_info;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
320 sd_raw_get_info(&disk_info);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
321 sd_serial = disk_info.serial;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
322 printf_P(PSTR("serial %lx\n"), sd_serial);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
323
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
324 struct partition_struct* partition = partition_open(sd_raw_read, sd_raw_read_interval, sd_raw_write, sd_raw_write_interval, 1);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
325
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
326 if (!partition)
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
327 {
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
328 sprintf(conf_start, "part");
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
329 return;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
330 }
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
331
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
332 struct fat_fs_struct* fs = fat_open(partition);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
333 if (!fs)
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
334 {
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
335 sprintf(conf_start, "bad fs");
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
336 return;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
337 }
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
338 struct fat_dir_entry_struct directory;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
339 res = fat_get_dir_entry_of_path(fs, "/", &directory);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
340 if (!res)
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
341 {
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
342 sprintf(conf_start, "bad direc");
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
343 return;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
344 }
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
345
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
346 struct fat_dir_struct* dd = fat_open_dir(fs, &directory);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
347 if (!dd)
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
348 {
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
349 sprintf(conf_start, "bad dd");
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
350 return;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
351 }
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
352 struct fat_file_struct* fd = open_file_in_dir(fs, dd, fn);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
353 if (!fd)
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
354 {
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
355 sprintf(conf_start, "bad fd");
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
356 return;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
357 }
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
358
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
359 fat_read_file(fd, (uint8_t*)conf_start, sizeof(conf_start)-1);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
360 conf_start[sizeof(conf_start)-1] = '\0';
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
361
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
362 fat_close_file(fd);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
363 fd = NULL;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
364 fat_close_dir(dd);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
365 dd = NULL;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
366 fat_close(fs);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
367 fs = NULL;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
368 partition_close(partition);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
369 partition = NULL;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
370
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
371 #if 0
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
372 char c = 0;
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
373 char buf[512];
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
374 for (int i = 0; i < 10; i++)
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
375 {
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
376 fat_read_file(fd, buf, sizeof(buf));
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
377 c ^= buf[0];
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
378 }
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
379 printf("total %d\n", c);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
380 #endif
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
381 }
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
382
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
383
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
384 static void
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
385 cmd_testsd(const char *param)
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
386 {
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
387 boot_id_set = 0;
43
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
388 PORT_PI_RESET &= ~_BV(PIN_PI_RESET);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
389 DDR_PI_RESET |= _BV(PIN_PI_RESET);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
390 long_delay(200);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
391
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
392 printf_P(PSTR("about to raw init\n"));
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
393
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
394 sd_raw_init();
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
395 printf_P(PSTR("done raw init\n"));
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
396 hmac_file(param);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
397 printf_P(PSTR("conf_start '%s'\n"), conf_start);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
398 sd_raw_deinit();
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
399
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
400 long_delay(200);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
401
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
402 DDR_PI_RESET &= ~_BV(PIN_PI_RESET);
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
403 }
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
404 #endif
43
69cbf9ce72b5 bring back testsd
Matt Johnston <matt@ucc.asn.au>
parents: 42
diff changeset
405
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
406 static void cmd_reset() __attribute__ ((noreturn));
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
407 static void
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
408 cmd_reset()
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
409 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
410 printf_P(PSTR("reset\n"));
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
411 long_delay(100);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
412 cli(); // disable interrupts
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
413 wdt_enable(WDTO_15MS); // enable watchdog
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
414 while(1); // wait for watchdog to reset processor
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
415 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
416
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
417 static void
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
418 cmd_newboot()
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
419 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
420 set_pi_boot_normal(1);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
421 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
422 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
423 newboot_count = newboot_limit;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
424 }
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
425 printf_P(PSTR("newboot for %d secs\n"), newboot_limit);
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
426 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
427
15
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
428 static void
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
429 cmd_oldboot()
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
430 {
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
431 set_pi_boot_normal(0);
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
432 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
433 {
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
434 newboot_count = 0;
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
435 }
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
436 printf_P(PSTR("back to old boot\n"));
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
437 }
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
438
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
439
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
440 static void
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
441 cmd_status()
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
442 {
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
443 uint32_t cur_watchdog_long, cur_watchdog_short, cur_newboot, cur_oneshot;
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
444 struct epoch_ticks t;
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
445
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
446 get_epoch_ticks(&t);
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
447
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
448 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
449 {
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
450 cur_watchdog_long = watchdog_long_count;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
451 cur_watchdog_short = watchdog_short_count;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
452 cur_newboot = newboot_count;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
453 cur_oneshot = oneshot_count;
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
454 }
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
455
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
456 printf_P(PSTR("limit (current)\n"
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
457 "watchdog_long %lu (%lu) watchdog newboot mode %d\n"
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
458 "watchdog_short %lu (%lu)\n"
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
459 "newboot %lu (%lu)\n"
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
460 "oneshot (%lu)\n"
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
461 "uptime %lu rem %u\n"
22
a55d7c2440fd basically done
Matt Johnston <matt@ucc.asn.au>
parents: 21
diff changeset
462 "boot normal %hhu\n"
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
463 ),
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
464 watchdog_long_limit, cur_watchdog_long, long_reboot_mode,
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
465 watchdog_short_limit, cur_watchdog_short,
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
466 newboot_limit, cur_newboot,
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
467 cur_oneshot,
22
a55d7c2440fd basically done
Matt Johnston <matt@ucc.asn.au>
parents: 21
diff changeset
468 t.ticks, t.rem,
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
469 boot_normal_status);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
470 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
471
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
472 static void
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
473 cmd_set_params(const char *params)
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
474 {
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
475 uint32_t new_watchdog_long_limit;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
476 uint32_t new_watchdog_short_limit;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
477 uint32_t new_newboot_limit;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
478
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
479 int ret = sscanf_P(params, PSTR("%lu %lu %lu"),
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
480 &new_watchdog_long_limit,
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
481 &new_watchdog_short_limit,
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
482 &new_newboot_limit);
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
483
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
484 if (ret != 3)
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
485 {
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
486 printf_P(PSTR("Bad values\n"));
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
487 }
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
488 else
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
489 {
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
490 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
491 {
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
492 eeprom_write(new_watchdog_long_limit, watchdog_long_limit);
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
493 eeprom_write(new_watchdog_short_limit, watchdog_short_limit);
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
494 eeprom_write(new_newboot_limit, newboot_limit);
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
495 uint16_t magic = EXPECT_MAGIC;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
496 eeprom_write(magic, magic);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
497 }
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
498 printf_P(PSTR("set_params for next boot\n"));
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
499 printf_P(PSTR("watchdog_long %lu watchdog_short %lu newboot %lu\n"),
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
500 new_watchdog_long_limit,
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
501 new_watchdog_short_limit,
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
502 new_newboot_limit);
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
503 }
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
504 }
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
505
35
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
506 // returns 1 if they are equal, timing independent
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
507 static uint8_t
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
508 safe_mem_eq(const uint8_t *a, const uint8_t *b, int len)
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
509 {
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
510 uint8_t result = 0;
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
511 for (int i = 0; i < len; i++)
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
512 {
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
513 result |= a[i] ^ b[i];
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
514 }
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
515 return result == 0;
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
516 }
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
517
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
518 // returns 1 if they are equal
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
519 static uint8_t
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
520 safe_str_eq(const char *a, const char *b)
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
521 {
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
522 int la = strlen(a);
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
523 if (la != strlen(b))
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
524 {
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
525 return 0;
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
526 }
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
527 return safe_mem_eq((const uint8_t*)a, (const uint8_t*)b, la);
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
528 }
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
529
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
530 uint8_t from_hex(char c)
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
531 {
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
532 if (c >= '0' && c <= '9') {
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
533 return c-'0';
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
534 }
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
535 if (c >= 'a' && c <= 'f') {
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
536 return c-'a' + 0xa;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
537 }
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
538 if (c >= 'A' && c <= 'F') {
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
539 return c-'A' + 0xa;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
540 }
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
541 return 0;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
542 }
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
543
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
544 static void
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
545 printhex_nibble(const unsigned char b, FILE *stream)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
546 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
547 unsigned char c = b & 0x0f;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
548 if ( c > 9 ) {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
549 c += 'A'-10;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
550 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
551 else {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
552 c += '0';
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
553 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
554 fputc(c, stream);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
555 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
556
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
557 void
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
558 printhex_byte(const unsigned char b, FILE *stream)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
559 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
560 printhex_nibble( b >> 4, stream);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
561 printhex_nibble( b, stream);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
562 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
563
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
564 void
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
565 printhex(uint8_t *id, uint8_t n, FILE *stream)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
566 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
567 for (uint8_t i = 0; i < n; i++)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
568 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
569 printhex_byte(id[i], stream);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
570 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
571 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
572
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
573 static int8_t
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
574 parse_key(const char *params, uint8_t *key_index, uint8_t *bytes,
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
575 uint8_t bytes_len)
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
576 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
577 // "N HEXKEY"
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
578 if (strlen(params) != bytes_len*2 + 2) {
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
579 printf_P(PSTR("Wrong length key. wanted %d, got %d, '%s'\n"),
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
580 bytes_len*2+2, strlen(params), params);
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
581 return -1;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
582 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
583
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
584 if (params[1] != ' ')
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
585 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
586 printf_P(PSTR("Missing space\n"));
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
587 return -1;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
588 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
589
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
590 *key_index = from_hex(params[0]);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
591 if (*key_index >= NKEYS)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
592 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
593 printf_P(PSTR("Bad key index %d, max %d\n"), *key_index, NKEYS);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
594 return -1;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
595 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
596
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
597 for (int i = 0, p = 0; i < bytes_len; i++, p += 2)
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
598 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
599 bytes[i] = (from_hex(params[p+2]) << 4) | from_hex(params[p+3]);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
600 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
601 return 0;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
602 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
603
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
604 static void
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
605 cmd_set_avr_key(const char *params)
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
606 {
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
607 uint8_t new_key[KEYLEN];
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
608 uint8_t key_index;
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
609 if (parse_key(params, &key_index, new_key, sizeof(new_key)) != 0)
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
610 {
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
611 return;
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
612 }
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
613 memcpy(avr_keys[key_index], new_key, sizeof(new_key));
8
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
614 #ifndef SIM_DEBUG
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
615 eeprom_write(avr_keys, avr_keys);
8
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
616 #endif
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
617 printf_P(PSTR("Set key %d: "), key_index);
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
618 printhex(new_key, sizeof(new_key), stdout);
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
619 putchar('\n');
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
620 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
621
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
622 static void
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
623 cmd_hmac(const char *params)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
624 {
42
082c8294c86b get rid of hmac message padding and aes hmac
Matt Johnston <matt@ucc.asn.au>
parents: 41
diff changeset
625 uint8_t indata[HMACLEN];
7
76f3ed943180 a few fixes
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
626 uint8_t outdata[HMACLEN];
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
627 uint8_t key_index;
42
082c8294c86b get rid of hmac message padding and aes hmac
Matt Johnston <matt@ucc.asn.au>
parents: 41
diff changeset
628 if (parse_key(params, &key_index, indata, HMACLEN) != 0)
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
629 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
630 printf_P(PSTR("FAIL: Bad input\n"));
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
631 return;
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
632 }
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
633
8
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
634 #ifndef SIM_DEBUG
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
635 long_delay(200);
8
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
636 #endif
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
637
11
e83b35e864d7 hmac and decrypt keys differ now
Matt Johnston <matt@ucc.asn.au>
parents: 8
diff changeset
638 hmac_sha1(outdata, avr_keys[key_index], KEYLEN*8, indata, sizeof(indata)*8);
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
639 printf_P(PSTR("HMAC: "));
7
76f3ed943180 a few fixes
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
640 printhex(outdata, HMACLEN, stdout);
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
641 putchar('\n');
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
642 }
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
643
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
644 static void
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
645 cmd_decrypt(const char *params)
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
646 {
42
082c8294c86b get rid of hmac message padding and aes hmac
Matt Johnston <matt@ucc.asn.au>
parents: 41
diff changeset
647 uint8_t indata[AESLEN];
082c8294c86b get rid of hmac message padding and aes hmac
Matt Johnston <matt@ucc.asn.au>
parents: 41
diff changeset
648 uint8_t output[AESLEN];
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
649 uint8_t key_index;
11
e83b35e864d7 hmac and decrypt keys differ now
Matt Johnston <matt@ucc.asn.au>
parents: 8
diff changeset
650 if (parse_key(params, &key_index, indata, sizeof(indata)) != 0)
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
651 {
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
652 printf_P(PSTR("FAIL: Bad input\n"));
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
653 return;
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
654 }
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
655
8
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
656 #ifndef SIM_DEBUG
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
657 long_delay(200);
8
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
658 #endif
7
76f3ed943180 a few fixes
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
659
11
e83b35e864d7 hmac and decrypt keys differ now
Matt Johnston <matt@ucc.asn.au>
parents: 8
diff changeset
660 uint8_t tmpbuf[256];
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
661 aesInit(avr_keys[key_index], tmpbuf);
42
082c8294c86b get rid of hmac message padding and aes hmac
Matt Johnston <matt@ucc.asn.au>
parents: 41
diff changeset
662 aesDecrypt(indata, NULL);
5
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
663
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
664 printf_P(PSTR("DECRYPTED: "));
87c8d0a11906 make it work
Matt Johnston <matt@ucc.asn.au>
parents: 4
diff changeset
665 printhex(output, AESLEN, stdout);
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
666 putchar('\n');
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
667 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
668
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
669 static void
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
670 cmd_oneshot_reboot(const char *params)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
671 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
672 uint32_t new_delay = strtoul(params, NULL, 10);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
673 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
674 {
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
675 oneshot_count = new_delay;
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
676 }
15
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
677 printf_P(PSTR("oneshot new delay %lu\n"), new_delay);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
678 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
679
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
680 static void
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
681 clamp_params()
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
682 {
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
683 if (watchdog_long_limit < WATCHDOG_LONG_MIN
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
684 || watchdog_long_limit > WATCHDOG_LONG_MAX)
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
685 {
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
686 watchdog_long_limit = WATCHDOG_LONG_DEFAULT;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
687 }
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
688
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
689 if (watchdog_short_limit != 0
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
690 && watchdog_short_limit < WATCHDOG_SHORT_MIN)
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
691 {
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
692 watchdog_short_limit = 0;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
693 }
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
694
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
695 if (newboot_limit < NEWBOOT_MIN || newboot_limit > NEWBOOT_MAX)
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
696 {
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
697 newboot_limit = NEWBOOT_DEFAULT;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
698 }
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
699 }
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
700
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
701 static void
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
702 load_params()
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
703 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
704 uint16_t magic;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
705 eeprom_read(magic, magic);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
706 if (magic == EXPECT_MAGIC)
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
707 {
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
708 eeprom_read(watchdog_long_limit, watchdog_long_limit);
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
709 eeprom_read(watchdog_short_limit, watchdog_short_limit);
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
710 eeprom_read(newboot_limit, newboot_limit);
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
711 }
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
712
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
713 clamp_params();
16
8b1aeff120e9 add max/min sanity checks
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
714
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
715 eeprom_read(avr_keys, avr_keys);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
716 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
717
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
718 static void
15
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
719 cmd_alive()
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
720 {
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
721 printf_P(PSTR("Ah, good.\n"));
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
722 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
723 {
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
724 watchdog_long_count = 0;
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
725 watchdog_short_count = 0;
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
726 }
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
727 long_reboot_mode = 0;
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
728 }
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
729
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
730 static void
35
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
731 cmd_poke()
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
732 {
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
733 printf_P(PSTR("Ah, good.\n"));
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
734 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
735 {
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
736 watchdog_short_count = 0;
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
737 }
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
738 }
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
739
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
740 static void
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
741 cmd_vcc()
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
742 {
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
743 uint16_t vcc = adc_vcc();
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
744 uint16_t v5 = adc_5v(vcc);
21
83a0663c082f Add temperature
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
745 uint16_t temp = adc_temp();
83a0663c082f Add temperature
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
746 // roughly?
83a0663c082f Add temperature
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
747 uint16_t temp_deg = temp - 290;
83a0663c082f Add temperature
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
748 printf_P(PSTR("vcc: %u mV\n"
83a0663c082f Add temperature
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
749 "5v: %u mV\n"
26
Matt Johnston <matt@ucc.asn.au>
parents: 25 22
diff changeset
750 "temp: %u mV (%dºC)\n"
Matt Johnston <matt@ucc.asn.au>
parents: 25 22
diff changeset
751 ),
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
752 vcc, v5, temp, temp_deg);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
753 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
754
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
755 static void
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
756 get_random(uint8_t *out)
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
757 {
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
758 uint32_t tries;
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
759 uint8_t rnd[20];
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
760 adc_random(0x44, rnd, sizeof(rnd), &tries);
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
761 hmac_sha1(out, buildid, sizeof(buildid)*8, rnd, sizeof(rnd)*8);
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
762 }
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
763
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
764 static void
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
765 cmd_bootid(const char *arg)
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
766 {
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
767 uint8_t hmac[HMACLEN];
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
768 uint8_t input[CHALLEN+sizeof(boot_id)];
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
769
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
770 if (strlen(arg) != CHALLEN*2)
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
771 {
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
772 printf_P(PSTR("Bad challenge\n"));
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
773 }
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
774 for (int i = 0, p = 0; i < CHALLEN; i++, p += 2)
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
775 {
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
776 input[i] = (from_hex(arg[p]) << 4) | from_hex(arg[p+1]);
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
777 }
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
778 memcpy(&input[CHALLEN], boot_id, sizeof(boot_id));
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
779
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
780 if (!boot_id_set)
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
781 {
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
782 _Static_assert(sizeof(boot_id) == HMACLEN, "boot_id size correct");
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
783 get_random(boot_id);
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
784 boot_id_set = 1;
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
785 }
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
786 hmac_sha1(hmac, avr_keys[0], KEYLEN*8, input, sizeof(input)*8);
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
787 printf_P(PSTR("bootid: "));
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
788 printhex(boot_id, sizeof(boot_id), stdout);
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
789 putchar(' ');
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
790 printhex(hmac, sizeof(hmac), stdout);
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
791 putchar('\n');
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
792 }
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
793
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
794 void(*bootloader)() __attribute__ ((noreturn)) = (void*)0x7800;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
795
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
796 #ifndef PROG_PASSWORD
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
797 #define PROG_PASSWORD "Y2vvjxO5"
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
798 #endif
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
799
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
800 static void
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
801 cmd_prog(const char* arg)
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
802 {
36
c6f77df67dde Fix programming
Matt Johnston <matt@ucc.asn.au>
parents: 35
diff changeset
803 if (!safe_str_eq(arg, PROG_PASSWORD))
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
804 {
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
805 printf_P(PSTR("Bad prog password\n"));
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
806 return;
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
807 }
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
808
36
c6f77df67dde Fix programming
Matt Johnston <matt@ucc.asn.au>
parents: 35
diff changeset
809 printf_P(PSTR("Programming...\n"));
c6f77df67dde Fix programming
Matt Johnston <matt@ucc.asn.au>
parents: 35
diff changeset
810 long_delay(100);
c6f77df67dde Fix programming
Matt Johnston <matt@ucc.asn.au>
parents: 35
diff changeset
811
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
812 // disable wdt
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
813 wdt_disable();
41
d07aa7644c66 bit more fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 38
diff changeset
814 MCUSR = 0;
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
815
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
816 // disable interrupts
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
817 TIMSK0 = 0;
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
818 TIMSK1 = 0;
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
819 TIMSK2 = 0;
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
820 EIMSK = 0;
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
821 PCMSK0 = 0;
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
822 PCMSK1 = 0;
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
823 PCMSK2 = 0;
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
824 ACSR &= ~_BV(ACIE);
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
825 ADCSRA &= ~_BV(ADIE);
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
826 UCSR0B &= ~_BV(RXCIE0);
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
827 UCSR0B &= _BV(TXCIE0);
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
828 // doesn't do TWI, other uart, probably others
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
829
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
830 _delay_ms(20);
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
831
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
832 bootloader();
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
833 }
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
834
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
835
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
836 static void
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
837 adc_sleep()
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
838 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
839 set_sleep_mode(SLEEP_MODE_IDLE);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
840 sleep_mode();
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
841 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
842
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
843 #define BITSET(v, n) (((v) >> (n)) & 1)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
844
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
845 static inline uint8_t
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
846 popcnt(uint8_t v)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
847 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
848 return BITSET(v, 0)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
849 + BITSET(v, 1)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
850 + BITSET(v, 2)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
851 + BITSET(v, 3)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
852 + BITSET(v, 4)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
853 + BITSET(v, 5)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
854 + BITSET(v, 6)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
855 + BITSET(v, 7);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
856 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
857
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
858 static uint8_t
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
859 adc_bit()
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
860 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
861 ADCSRA |= _BV(ADSC);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
862 loop_until_bit_is_clear(ADCSRA, ADSC);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
863 uint8_t low = ADCL;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
864 uint8_t high = ADCH;
35
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
865 uint8_t ret = (popcnt(low)&1) ^ (popcnt(high)&1);
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
866 return ret;
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
867 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
868
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
869 static void
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
870 adc_random(uint8_t admux,
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
871 uint8_t *out, uint16_t num, uint32_t *tries)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
872 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
873 PRR &= ~_BV(PRADC);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
874 // /16 prescaler for 691mhz, no interrupt
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
875 ADCSRA = _BV(ADEN) | _BV(ADPS2);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
876
35
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
877 ADMUX = admux;
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
878
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
879 *tries = 0;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
880 for (int i = 0; i < num; i++)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
881 {
35
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
882 uint8_t ret = 0;
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
883 uint8_t count = 0;
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
884
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
885 while (count <= 7)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
886 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
887 (*tries)++;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
888
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
889 // Von Neumann extractor
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
890 uint8_t one = adc_bit();
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
891 uint8_t two = adc_bit();
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
892 if (one == two)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
893 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
894 continue;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
895 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
896 ret |= one << count;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
897 count++;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
898 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
899 out[i] = ret;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
900 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
901 ADCSRA = 0;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
902 PRR |= _BV(PRADC);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
903 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
904
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
905 ISR(ADC_vect)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
906 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
907 adc_done = 1;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
908 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
909
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
910 static void
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
911 adc_generic(uint8_t admux, uint8_t *ret_num, uint16_t *ret_sum)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
912 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
913 PRR &= ~_BV(PRADC);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
914
31
5d6a841eef82 /128 prescaler for adc
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
915 // /128 prescaler (86kHz), interrupt
5d6a841eef82 /128 prescaler for adc
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
916 ADCSRA = _BV(ADEN)
5d6a841eef82 /128 prescaler for adc
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
917 | _BV(ADPS2) | _BV(ADPS1) | _BV(ADPS0)
5d6a841eef82 /128 prescaler for adc
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
918 | _BV(ADIE);
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
919
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
920 // set to measure 1.1 reference
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
921 ADMUX = admux;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
922
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
923 // delay after setting reference etc, allow settling
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
924 long_delay(300);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
925 // average a number of samples
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
926 uint16_t sum = 0;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
927 uint8_t num = 0;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
928 for (uint8_t n = 0; n < 20; n++)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
929 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
930 while (1)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
931 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
932 adc_done = 0;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
933 ADCSRA |= _BV(ADSC);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
934 adc_sleep();
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
935
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
936 uint8_t done;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
937 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
938 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
939 done = adc_done;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
940 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
941 if (done)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
942 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
943 break;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
944 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
945 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
946
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
947 uint8_t low_11 = ADCL;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
948 uint8_t high_11 = ADCH;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
949 uint16_t val = low_11 + (high_11 << 8);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
950
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
951 if (n >= 4)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
952 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
953 sum += val;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
954 num++;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
955 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
956 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
957 ADCSRA = 0;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
958 PRR |= _BV(PRADC);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
959
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
960 *ret_num = num;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
961 *ret_sum = sum;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
962 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
963
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
964 static uint16_t
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
965 adc_vcc()
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
966 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
967 const uint8_t mux = _BV(REFS0) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
968 uint16_t sum;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
969 uint8_t num;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
970
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
971 adc_generic(mux, &num, &sum);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
972
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
973 //float res_volts = 1.1 * 1024 * num / sum;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
974 //return 1000 * res_volts;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
975 return ((uint32_t)1100*1024*num) / sum;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
976 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
977
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
978 #define SCALER_5V 2
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
979
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
980 static uint16_t
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
981 adc_5v(uint16_t vcc)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
982 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
983 // set to measure ADC4 against AVCC
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
984 const uint8_t mux = _BV(REFS0) | _BV(MUX2);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
985 uint16_t sum;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
986 uint8_t num;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
987
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
988 adc_generic(mux, &num, &sum);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
989
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
990 return ((uint32_t)vcc*sum*SCALER_5V/(num*1024));
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
991 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
992
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
993 static uint16_t
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
994 adc_temp()
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
995 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
996 // set to measure temperature against 1.1v reference.
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
997 const uint8_t mux = _BV(REFS0) | _BV(REFS1) | _BV(MUX3);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
998 uint16_t sum;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
999 uint8_t num;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1000
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1001 adc_generic(mux, &num, &sum);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1002
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1003 // return the voltage
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1004
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1005 return ((uint32_t)1100*sum) / (num*1024);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1006 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1007
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1008 static void
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1009 cmd_random(const char* params)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1010 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1011 uint8_t admux;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1012 uint16_t num;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1013 uint8_t buf[100];
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1014
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1015 int ret = sscanf_P(params, PSTR("%hhu %u"),
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1016 &admux, &num);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1017 if (!ret)
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1018 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1019 printf_P(PSTR("Bad arguments\n"));
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1020 return;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1021 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1022 uint32_t tries = 0;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1023 printf_P(PSTR("output: "));
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1024 for (int i = 0; i < num; i+= sizeof(buf))
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1025 {
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1026 uint32_t t;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1027 uint16_t nr = MIN(num-i, sizeof(buf));
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1028 adc_random(admux, buf, nr, &t);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1029 printhex(buf, nr, stdout);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1030 tries += t;
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1031 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1032 putchar('\n');
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1033 printf_P(PSTR("%ld tries\n"), tries);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1034 }
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1035
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1036
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1037
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1038 static void
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1039 read_handler()
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1040 {
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1041 #define LOCAL_PSTR(x) const static char x ## _str[] PROGMEM = #x;
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1042 #define LOCAL_HELP(x, d) const static char x ## _help[] PROGMEM = d;
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1043
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1044 LOCAL_PSTR(set_params);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1045 LOCAL_PSTR(set_key);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1046 LOCAL_PSTR(oneshot);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1047 LOCAL_PSTR(hmac);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1048 LOCAL_PSTR(decrypt);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1049 LOCAL_PSTR(alive);
35
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
1050 LOCAL_PSTR(poke);
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1051 LOCAL_PSTR(vcc);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1052 LOCAL_PSTR(reset);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1053 LOCAL_PSTR(newboot);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1054 LOCAL_PSTR(oldboot);
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1055 LOCAL_PSTR(status);
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1056 LOCAL_PSTR(random);
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1057 LOCAL_PSTR(prog);
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
1058 LOCAL_PSTR(bootid);
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1059 LOCAL_HELP(set_params, "<long_limit> <short_limit> <newboot_limit>");
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1060 LOCAL_HELP(set_key, "20_byte_hex>");
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1061 LOCAL_HELP(oneshot, "<timeout>");
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1062 LOCAL_HELP(prog, "<password>");
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1063 LOCAL_HELP(random, "<admux> <nbytes>");
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1064 LOCAL_HELP(hmac, "<key_index> <20_byte_hex_data>");
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1065 LOCAL_HELP(decrypt, "<key_index> <20_byte_hmac|16_byte_aes_block>");
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
1066 LOCAL_HELP(bootid, "<8_byte_challenge>")
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1067
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1068 static const struct handler {
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1069 PGM_P name;
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1070 void(*cmd)(const char *param);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1071 // existence of arg_help indicates if the cmd takes a parameter.
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1072 PGM_P arg_help;
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1073 } handlers[] PROGMEM =
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1074 {
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1075 {alive_str, cmd_alive, NULL},
35
cce426bb6d3e fix rng and short watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
1076 {poke_str, cmd_poke, NULL},
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1077 {newboot_str, cmd_newboot, NULL},
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1078 {oldboot_str, cmd_oldboot, NULL},
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1079 {oneshot_str, cmd_oneshot_reboot, oneshot_help},
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1080 {status_str, cmd_status, NULL},
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1081 {hmac_str, cmd_hmac, hmac_help},
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1082 {decrypt_str, cmd_decrypt, decrypt_help},
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1083 {set_params_str, cmd_set_params, set_params_help},
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1084 {set_key_str, cmd_set_avr_key, set_key_help},
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1085 {random_str, cmd_random, random_help},
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1086 {vcc_str, cmd_vcc, NULL},
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1087 {reset_str, cmd_reset, NULL},
27
ce5097eacf2f try at adc_random()
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1088 {prog_str, cmd_prog, prog_help},
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
1089 {bootid_str, cmd_bootid, bootid_help},
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1090 };
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1091
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1092 if (readbuf[0] == '\0')
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1093 {
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1094 return;
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1095 }
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1096
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1097 if (strcmp_P(readbuf, PSTR("help")) == 0)
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1098 {
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1099 printf_P(PSTR("Commands:---\n"));
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1100 for (int i = 0; i < sizeof(handlers) / sizeof(handlers[0]); i++)
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1101 {
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1102 struct handler h;
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1103 memcpy_P(&h, &handlers[i], sizeof(h));
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1104 printf_P(h.name);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1105 if (h.arg_help)
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1106 {
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1107 putchar(' ');
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1108 printf_P(h.arg_help);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1109 }
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1110 putchar('\n');
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1111 };
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1112 printf_P(PSTR("---\n"));
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1113 return;
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1114 }
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1115
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1116 for (int i = 0; i < sizeof(handlers) / sizeof(handlers[0]); i++)
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1117 {
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1118 struct handler h;
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1119 memcpy_P(&h, &handlers[i], sizeof(h));
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1120
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1121 const int h_len = strlen_P(h.name);
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1122 if (strncmp_P(readbuf, h.name, h_len) == 0)
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1123 {
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1124 if (h.arg_help)
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1125 {
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1126 if (readbuf[h_len] == ' ')
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1127 {
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1128 h.cmd(&readbuf[h_len+1]);
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1129 return;
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1130 }
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1131 }
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1132 else
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1133 {
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1134 if (readbuf[h_len] == '\0')
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1135 {
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1136 void(*void_cmd)() = h.cmd;
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1137 void_cmd();
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1138 return;
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1139 }
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1140 }
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1141 }
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1142 }
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1143
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1144 printf_P(PSTR("Bad command '%s'\n"), readbuf);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1145 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1146
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1147 ISR(INT0_vect)
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1148 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1149 blink();
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
1150 long_delay(100);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1151 blink();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1152 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1153
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1154 ISR(USART_RX_vect)
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1155 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1156 char c = UDR0;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1157 #ifdef HAVE_UART_ECHO
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1158 uart_putchar(c, NULL);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1159 #endif
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1160 if (c == '\r' || c == '\n')
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1161 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1162 if (readpos > 0)
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1163 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1164 readbuf[readpos] = '\0';
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1165 have_cmd = 1;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1166 readpos = 0;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1167 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1168 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1169 else
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1170 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1171 readbuf[readpos] = c;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1172 readpos++;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1173 if (readpos >= sizeof(readbuf))
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1174 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1175 readpos = 0;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1176 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1177 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1178 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1179
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1180 ISR(TIMER1_COMPA_vect)
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1181 {
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1182 TCNT1 = 0;
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1183
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1184 clock_epoch += TICK;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1185
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1186 // watchdogs count up, continuous
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1187 if (watchdog_long_limit > 0) {
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1188 watchdog_long_count += TICK;
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1189 if (watchdog_long_count >= watchdog_long_limit)
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1190 {
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1191 watchdog_long_count = 0;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1192 watchdog_long_hit = 1;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1193 }
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1194 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1195
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1196 if (watchdog_short_limit > 0) {
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1197 watchdog_short_count += TICK;
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1198 if (watchdog_short_count >= watchdog_short_limit)
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1199 {
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1200 watchdog_short_count = 0;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1201 watchdog_short_hit = 1;
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1202 }
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1203 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1204
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1205 // newboot counts down
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1206 if (newboot_count > 0)
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1207 {
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1208 newboot_count-=TICK;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1209 if (newboot_count <= 0)
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1210 {
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1211 newboot_hit = 1;
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1212 newboot_count = 0;
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1213 }
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1214 }
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1215
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1216 if (oneshot_count > 0)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1217 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1218 oneshot_count-=TICK;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1219 if (oneshot_count <= 0)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1220 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1221 oneshot_hit = 1;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1222 oneshot_count = 0;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1223 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1224 }
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1225
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1226 if (reboot_count > 0)
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1227 {
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1228 reboot_count -= TICK;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1229 if (reboot_count <= 0)
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1230 {
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1231 reboot_hit = 1;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1232 reboot_count = 0;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1233 }
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1234 }
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1235 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1236
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1237 static void
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1238 idle_sleep()
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1239 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1240 set_sleep_mode(SLEEP_MODE_IDLE);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1241 sleep_mode();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1242 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1243
21
83a0663c082f Add temperature
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
1244 static void
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1245 reboot_pi()
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1246 {
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1247 printf_P(PSTR("Real reboot now\n"));
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
1248 boot_id_set = 0;
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1249 // pull it low for 200ms
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1250 PORT_PI_RESET &= ~_BV(PIN_PI_RESET);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1251 DDR_PI_RESET |= _BV(PIN_PI_RESET);
45
a0f2fcc6d9dd add buildid
Matt Johnston <matt@ucc.asn.au>
parents: 43
diff changeset
1252 long_delay(200);
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1253
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1254 PORT_PI_WARNING &= ~_BV(PIN_PI_WARNING);
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1255 DDR_PI_RESET &= ~_BV(PIN_PI_RESET);
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1256 }
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1257
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1258 static void
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1259 wait_reboot_pi()
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1260 {
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1261 PORT_PI_WARNING |= _BV(PIN_PI_WARNING);
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1262 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1263 {
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1264 reboot_count = WARNING_TIME;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1265 }
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1266 printf_P(PSTR("Rebooting in %hhu seconds\n"), reboot_count);
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1267 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1268
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1269 static void
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1270 set_pi_boot_normal(uint8_t normal)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1271 {
22
a55d7c2440fd basically done
Matt Johnston <matt@ucc.asn.au>
parents: 21
diff changeset
1272 boot_normal_status = normal;
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1273 PORT_PI_BOOT &= ~_BV(PIN_PI_BOOT);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1274 if (normal)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1275 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1276 // tristate
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1277 DDR_PI_BOOT &= ~_BV(PIN_PI_BOOT);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1278 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1279 else
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1280 {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1281 // pull it low
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1282 DDR_PI_RESET |= _BV(PIN_PI_BOOT);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1283 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1284 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1285
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1286 static void
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1287 check_flags()
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1288 {
15
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1289 if (watchdog_long_hit)
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1290 {
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1291 // alternate between booting normal and emergency
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1292 if (long_reboot_mode)
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1293 {
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1294 cmd_newboot();
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1295 }
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1296 long_reboot_mode ^= 1;
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1297 }
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1298
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1299 if (watchdog_long_hit
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1300 || watchdog_short_hit
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1301 || oneshot_hit)
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1302 {
12
aec45c673a60 Fix decryption
Matt Johnston <matt@ucc.asn.au>
parents: 11
diff changeset
1303 printf_P(PSTR("Rebooting! long %d, short %d, oneshot %d\n"),
aec45c673a60 Fix decryption
Matt Johnston <matt@ucc.asn.au>
parents: 11
diff changeset
1304 watchdog_long_hit, watchdog_short_hit, oneshot_hit);
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1305 wait_reboot_pi();
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1306 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1307
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1308 if (newboot_hit) {
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1309 set_pi_boot_normal(0);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1310 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1311
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1312 if (reboot_hit) {
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1313 reboot_pi();
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1314 }
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1315
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1316 watchdog_long_hit = 0;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1317 watchdog_short_hit = 0;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1318 newboot_hit = 0;
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1319 oneshot_hit = 0;
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1320 reboot_hit = 0;
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1321 }
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1322
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1323 static void
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1324 do_comms()
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1325 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1326 // avoid receiving rubbish, perhaps
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1327 uart_on();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1328
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1329 // write sd card here? same 3.3v regulator...
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1330
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1331 while (1)
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1332 {
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1333 wdt_reset();
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1334
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1335 #ifdef SIM_DEBUG
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1336 if (sim_idx != last_sim_idx)
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1337 {
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1338 last_sim_idx = sim_idx;
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1339 }
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1340 #endif
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1341
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1342 check_flags();
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1343
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1344 if (have_cmd)
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1345 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1346 have_cmd = 0;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1347 read_handler();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1348 continue;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1349 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1350
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1351 // wait for commands from the master
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1352 idle_sleep();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1353 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1354 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1355
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1356 static void
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1357 blink()
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1358 {
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1359 #if 0
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1360 PORT_ &= ~_BV(PIN_LED);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1361 _delay_ms(1);
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1362 PORT_LED |= _BV(PIN_LED);
18
021e6e0006f4 debug printing, 5v adc, fixes
Matt Johnston <matt@ucc.asn.au>
parents: 17
diff changeset
1363 #endif
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1364 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1365
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1366 static void
22
a55d7c2440fd basically done
Matt Johnston <matt@ucc.asn.au>
parents: 21
diff changeset
1367 long_delay(uint16_t ms)
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1368 {
22
a55d7c2440fd basically done
Matt Johnston <matt@ucc.asn.au>
parents: 21
diff changeset
1369 uint16_t iter = ms / 10;
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1370
22
a55d7c2440fd basically done
Matt Johnston <matt@ucc.asn.au>
parents: 21
diff changeset
1371 for (uint16_t i = 0; i < iter; i++)
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1372 {
22
a55d7c2440fd basically done
Matt Johnston <matt@ucc.asn.au>
parents: 21
diff changeset
1373 _delay_ms(10);
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1374 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1375 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1376
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1377 ISR(BADISR_vect)
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1378 {
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1379 //uart_on();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1380 printf_P(PSTR("Bad interrupt\n"));
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1381 }
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1382
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1383 // disable watchdog on boot
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1384 void wdt_init(void) __attribute__((naked)) __attribute__((section(".init3")));
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1385 void wdt_init(void)
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1386 {
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1387 MCUSR = 0;
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1388 wdt_disable();
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1389 }
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1390
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1391 int main(void)
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1392 {
17
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1393 _Static_assert(F_CPU % 256 == 0, "clock prescaler remainder 0");
21717153e0f1 change clock to 4915200
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
1394 _Static_assert(NEWBOOT_MAX < WATCHDOG_LONG_MIN, "newboot max shorter than watchdog min");
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1395 _Static_assert((F_CPU)%(16*(BAUD)) == 0, "baud rate good multiple");
15
915be6f0ff13 fix for 8mhz, add flip/flop long watchdog
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1396
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1397 setup_chip();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1398 blink();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1399
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1400 stdout = &mystdout;
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1401 uart_on();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1402
20
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1403 long_delay(500);
bc48a1d17edf near done
Matt Johnston <matt@ucc.asn.au>
parents: 18
diff changeset
1404 printf_P(PSTR("Pi Watchdog\nMatt Johnston [email protected]\n"));
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1405
2
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1406 set_pi_boot_normal(0);
0a6cbbb8c2b7 mostly there
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
1407
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1408 load_params();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1409
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1410 setup_tick_counter();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1411
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1412 sei();
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1413
8
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1414 #if 0
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1415 // encryption test
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1416 cmd_set_avr_key("1 6161626263636464656566666767686800000000");
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1417 cmd_set_avr_key("2 7979757569696f6f646465656666717164646969");
12
aec45c673a60 Fix decryption
Matt Johnston <matt@ucc.asn.au>
parents: 11
diff changeset
1418 //cmd_decrypt("1 ecd858ee07a8e16575723513d2d072a7565865e40ba302059bfc650d4491268448102119");
aec45c673a60 Fix decryption
Matt Johnston <matt@ucc.asn.au>
parents: 11
diff changeset
1419 cmd_decrypt("1 5a587b50fd48688bbda1b510cf9a3fab6fd4737b" "0ba302059bfc650d4491268448102119");
aec45c673a60 Fix decryption
Matt Johnston <matt@ucc.asn.au>
parents: 11
diff changeset
1420 cmd_hmac("2 7979757569696f6f646465656666717164646969");
8
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1421 #endif
03da5ff767e9 Some debug ifdefs
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1422
1
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1423 // doesn't return
e23c1b6f6080 few more changes
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1424 do_comms();
0
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1425
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1426 return 0; /* never reached */
8705acff2494 lots of stuff
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1427 }