diff options
| author | tmk <nobody@nowhere> | 2013-09-21 21:35:13 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-09-21 21:35:13 +0900 |
| commit | 6ccea742deb84451a5815e40ccfc3aaa74feb622 (patch) | |
| tree | 0c724d7951bdc1d5103d06dc5682ba54228e1b1f /protocol | |
| parent | b2c7529ec9dce2d1f32f0c3e228059092f5f2238 (diff) | |
| parent | 6cf6ddceb14851902aa62c82cee91d0419bf5b27 (diff) | |
| download | qmk_firmware-6ccea742deb84451a5815e40ccfc3aaa74feb622.tar.gz qmk_firmware-6ccea742deb84451a5815e40ccfc3aaa74feb622.zip | |
Merge branch 'm0110_next'
Diffstat (limited to 'protocol')
| -rw-r--r-- | protocol/m0110.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/protocol/m0110.c b/protocol/m0110.c index 8bf7cfe4f..9b53ec2cd 100644 --- a/protocol/m0110.c +++ b/protocol/m0110.c | |||
| @@ -91,10 +91,11 @@ uint8_t m0110_error = 0; | |||
| 91 | 91 | ||
| 92 | void m0110_init(void) | 92 | void m0110_init(void) |
| 93 | { | 93 | { |
| 94 | uint8_t data; | ||
| 95 | idle(); | 94 | idle(); |
| 96 | _delay_ms(1000); | 95 | _delay_ms(1000); |
| 97 | 96 | ||
| 97 | /* Not needed to initialize in fact. | ||
| 98 | uint8_t data; | ||
| 98 | m0110_send(M0110_MODEL); | 99 | m0110_send(M0110_MODEL); |
| 99 | data = m0110_recv(); | 100 | data = m0110_recv(); |
| 100 | print("m0110_init model: "); phex(data); print("\n"); | 101 | print("m0110_init model: "); phex(data); print("\n"); |
| @@ -102,6 +103,7 @@ void m0110_init(void) | |||
| 102 | m0110_send(M0110_TEST); | 103 | m0110_send(M0110_TEST); |
| 103 | data = m0110_recv(); | 104 | data = m0110_recv(); |
| 104 | print("m0110_init test: "); phex(data); print("\n"); | 105 | print("m0110_init test: "); phex(data); print("\n"); |
| 106 | */ | ||
| 105 | } | 107 | } |
| 106 | 108 | ||
| 107 | uint8_t m0110_send(uint8_t data) | 109 | uint8_t m0110_send(uint8_t data) |
