Revision 90e5f3dd
Forgot to save merge resolution last time... fixed
| scout_avr/bom/tiny-twi.c | ||
|---|---|---|
| 126 | 126 |
twi_release_scl(); |
| 127 | 127 |
} |
| 128 | 128 |
|
| 129 |
<<<<<<< HEAD |
|
| 130 | 129 |
void smb_init(slave_rx_t callback) {
|
| 131 |
state = START; |
|
| 132 |
|
|
| 133 |
======= |
|
| 134 |
void smb_init() {
|
|
| 135 |
>>>>>>> Added sink/release sda/scl |
|
| 136 | 130 |
// TODO do we want USICS0 (3)? |
| 137 | 131 |
USICR = _BV(USIWM1) | _BV(USIWM0) | _BV(USICS1); |
| 138 | 132 |
twi_ready(); |
Also available in: Unified diff