diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-04-01 00:09:01 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-01 00:09:01 +1100 |
| commit | c5ddada32ea45f50ddecdfc1e7d39f51465ef302 (patch) | |
| tree | 99338950fd47aa22846900c2888762e8734a6b54 | |
| parent | 8a950a7116fa8401148efa14a1da47b0879ec379 (diff) | |
| download | qmk_firmware-c5ddada32ea45f50ddecdfc1e7d39f51465ef302.tar.gz qmk_firmware-c5ddada32ea45f50ddecdfc1e7d39f51465ef302.zip | |
Remove leftover old implementations of the lily58 split code. (#12442)
| -rw-r--r-- | keyboards/lily58/rev1/config.h | 2 | ||||
| -rwxr-xr-x | keyboards/lily58/rev1/matrix.c | 357 | ||||
| -rwxr-xr-x | keyboards/lily58/rev1/serial_config.h | 4 | ||||
| -rwxr-xr-x | keyboards/lily58/rev1/split_util.c | 100 | ||||
| -rwxr-xr-x | keyboards/lily58/serial.c | 589 |
5 files changed, 2 insertions, 1050 deletions
diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h index 39b15fc5b..24dc41151 100644 --- a/keyboards/lily58/rev1/config.h +++ b/keyboards/lily58/rev1/config.h | |||
| @@ -35,6 +35,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 35 | #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } | 35 | #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } |
| 36 | #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } | 36 | #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } |
| 37 | 37 | ||
| 38 | #define SOFT_SERIAL_PIN D2 | ||
| 39 | #define SERIAL_USE_MULTI_TRANSACTION | ||
| 38 | 40 | ||
| 39 | /* define if matrix has ghost */ | 41 | /* define if matrix has ghost */ |
| 40 | //#define MATRIX_HAS_GHOST | 42 | //#define MATRIX_HAS_GHOST |
diff --git a/keyboards/lily58/rev1/matrix.c b/keyboards/lily58/rev1/matrix.c deleted file mode 100755 index d3ba1c924..000000000 --- a/keyboards/lily58/rev1/matrix.c +++ /dev/null | |||
| @@ -1,357 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2012 Jun Wako <wakojun@gmail.com> | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | /* | ||
| 19 | * scan matrix | ||
| 20 | */ | ||
| 21 | #include <stdint.h> | ||
| 22 | #include <stdbool.h> | ||
| 23 | #include <string.h> | ||
| 24 | #include <avr/io.h> | ||
| 25 | #include <avr/wdt.h> | ||
| 26 | #include <avr/interrupt.h> | ||
| 27 | #include <util/delay.h> | ||
| 28 | #include "print.h" | ||
| 29 | #include "debug.h" | ||
| 30 | #include "util.h" | ||
| 31 | #include "matrix.h" | ||
| 32 | #include "split_util.h" | ||
| 33 | #include "quantum.h" | ||
| 34 | |||
| 35 | #ifdef USE_MATRIX_I2C | ||
| 36 | # include "i2c.h" | ||
| 37 | #else // USE_SERIAL | ||
| 38 | # include "split_scomm.h" | ||
| 39 | #endif | ||
| 40 | |||
| 41 | #ifndef DEBOUNCE | ||
| 42 | # define DEBOUNCE 5 | ||
| 43 | #endif | ||
| 44 | |||
| 45 | #define ERROR_DISCONNECT_COUNT 5 | ||
| 46 | |||
| 47 | static uint8_t debouncing = DEBOUNCE; | ||
| 48 | static const int ROWS_PER_HAND = MATRIX_ROWS/2; | ||
| 49 | static uint8_t error_count = 0; | ||
| 50 | uint8_t is_master = 0 ; | ||
| 51 | |||
| 52 | static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; | ||
| 53 | static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; | ||
| 54 | |||
| 55 | /* matrix state(1:on, 0:off) */ | ||
| 56 | static matrix_row_t matrix[MATRIX_ROWS]; | ||
| 57 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; | ||
| 58 | |||
| 59 | static matrix_row_t read_cols(void); | ||
| 60 | static void init_cols(void); | ||
| 61 | static void unselect_rows(void); | ||
| 62 | static void select_row(uint8_t row); | ||
| 63 | static uint8_t matrix_master_scan(void); | ||
| 64 | |||
| 65 | |||
| 66 | __attribute__ ((weak)) | ||
| 67 | void matrix_init_kb(void) { | ||
| 68 | matrix_init_user(); | ||
| 69 | } | ||
| 70 | |||
| 71 | __attribute__ ((weak)) | ||
| 72 | void matrix_scan_kb(void) { | ||
| 73 | matrix_scan_user(); | ||
| 74 | } | ||
| 75 | |||
| 76 | __attribute__ ((weak)) | ||
| 77 | void matrix_init_user(void) { | ||
| 78 | } | ||
| 79 | |||
| 80 | __attribute__ ((weak)) | ||
| 81 | void matrix_scan_user(void) { | ||
| 82 | } | ||
| 83 | |||
| 84 | inline | ||
| 85 | uint8_t matrix_rows(void) | ||
| 86 | { | ||
| 87 | return MATRIX_ROWS; | ||
| 88 | } | ||
| 89 | |||
| 90 | inline | ||
| 91 | uint8_t matrix_cols(void) | ||
| 92 | { | ||
| 93 | return MATRIX_COLS; | ||
| 94 | } | ||
| 95 | |||
| 96 | void matrix_init(void) | ||
| 97 | { | ||
| 98 | split_keyboard_setup(); | ||
| 99 | |||
| 100 | // initialize row and col | ||
| 101 | unselect_rows(); | ||
| 102 | init_cols(); | ||
| 103 | |||
| 104 | setPinOutput(B0); | ||
| 105 | setPinOutput(D5); | ||
| 106 | writePinHigh(B0); | ||
| 107 | writePinHigh(D5); | ||
| 108 | |||
| 109 | // initialize matrix state: all keys off | ||
| 110 | for (uint8_t i=0; i < MATRIX_ROWS; i++) { | ||
| 111 | matrix[i] = 0; | ||
| 112 | matrix_debouncing[i] = 0; | ||
| 113 | } | ||
| 114 | |||
| 115 | is_master = has_usb(); | ||
| 116 | |||
| 117 | matrix_init_quantum(); | ||
| 118 | } | ||
| 119 | |||
| 120 | uint8_t _matrix_scan(void) | ||
| 121 | { | ||
| 122 | // Right hand is stored after the left in the matirx so, we need to offset it | ||
| 123 | int offset = isLeftHand ? 0 : (ROWS_PER_HAND); | ||
| 124 | |||
| 125 | for (uint8_t i = 0; i < ROWS_PER_HAND; i++) { | ||
| 126 | select_row(i); | ||
| 127 | _delay_us(30); // without this wait read unstable value. | ||
| 128 | matrix_row_t cols = read_cols(); | ||
| 129 | if (matrix_debouncing[i+offset] != cols) { | ||
| 130 | matrix_debouncing[i+offset] = cols; | ||
| 131 | debouncing = DEBOUNCE; | ||
| 132 | } | ||
| 133 | unselect_rows(); | ||
| 134 | } | ||
| 135 | |||
| 136 | if (debouncing) { | ||
| 137 | if (--debouncing) { | ||
| 138 | _delay_ms(1); | ||
| 139 | } else { | ||
| 140 | for (uint8_t i = 0; i < ROWS_PER_HAND; i++) { | ||
| 141 | matrix[i+offset] = matrix_debouncing[i+offset]; | ||
| 142 | } | ||
| 143 | } | ||
| 144 | } | ||
| 145 | |||
| 146 | return 1; | ||
| 147 | } | ||
| 148 | |||
| 149 | #ifdef USE_MATRIX_I2C | ||
| 150 | |||
| 151 | // Get rows from other half over i2c | ||
| 152 | int i2c_transaction(void) { | ||
| 153 | int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0; | ||
| 154 | |||
| 155 | int err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE); | ||
| 156 | if (err) goto i2c_error; | ||
| 157 | |||
| 158 | // start of matrix stored at 0x00 | ||
| 159 | err = i2c_master_write(0x00); | ||
| 160 | if (err) goto i2c_error; | ||
| 161 | |||
| 162 | // Start read | ||
| 163 | err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ); | ||
| 164 | if (err) goto i2c_error; | ||
| 165 | |||
| 166 | if (!err) { | ||
| 167 | int i; | ||
| 168 | for (i = 0; i < ROWS_PER_HAND-1; ++i) { | ||
| 169 | matrix[slaveOffset+i] = i2c_master_read(I2C_ACK); | ||
| 170 | } | ||
| 171 | matrix[slaveOffset+i] = i2c_master_read(I2C_NACK); | ||
| 172 | i2c_master_stop(); | ||
| 173 | } else { | ||
| 174 | i2c_error: // the cable is disconnceted, or something else went wrong | ||
| 175 | i2c_reset_state(); | ||
| 176 | return err; | ||
| 177 | } | ||
| 178 | |||
| 179 | return 0; | ||
| 180 | } | ||
| 181 | |||
| 182 | #else // USE_SERIAL | ||
| 183 | |||
| 184 | int serial_transaction(int master_changed) { | ||
| 185 | int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0; | ||
| 186 | #ifdef SERIAL_USE_MULTI_TRANSACTION | ||
| 187 | int ret=serial_update_buffers(master_changed); | ||
| 188 | #else | ||
| 189 | int ret=serial_update_buffers(); | ||
| 190 | #endif | ||
| 191 | if (ret ) { | ||
| 192 | if(ret==2) writePinLow(B0); | ||
| 193 | return 1; | ||
| 194 | } | ||
| 195 | writePinHigh(B0); | ||
| 196 | memcpy(&matrix[slaveOffset], | ||
| 197 | (void *)serial_slave_buffer, SERIAL_SLAVE_BUFFER_LENGTH); | ||
| 198 | return 0; | ||
| 199 | } | ||
| 200 | #endif | ||
| 201 | |||
| 202 | uint8_t matrix_scan(void) | ||
| 203 | { | ||
| 204 | if (is_master) { | ||
| 205 | matrix_master_scan(); | ||
| 206 | }else{ | ||
| 207 | matrix_slave_scan(); | ||
| 208 | int offset = (isLeftHand) ? ROWS_PER_HAND : 0; | ||
| 209 | memcpy(&matrix[offset], | ||
| 210 | (void *)serial_master_buffer, SERIAL_MASTER_BUFFER_LENGTH); | ||
| 211 | matrix_scan_quantum(); | ||
| 212 | } | ||
| 213 | return 1; | ||
| 214 | } | ||
| 215 | |||
| 216 | |||
| 217 | uint8_t matrix_master_scan(void) { | ||
| 218 | |||
| 219 | int ret = _matrix_scan(); | ||
| 220 | int mchanged = 1; | ||
| 221 | |||
| 222 | int offset = (isLeftHand) ? 0 : ROWS_PER_HAND; | ||
| 223 | |||
| 224 | #ifdef USE_MATRIX_I2C | ||
| 225 | // for (int i = 0; i < ROWS_PER_HAND; ++i) { | ||
| 226 | /* i2c_slave_buffer[i] = matrix[offset+i]; */ | ||
| 227 | // i2c_slave_buffer[i] = matrix[offset+i]; | ||
| 228 | // } | ||
| 229 | #else // USE_SERIAL | ||
| 230 | #ifdef SERIAL_USE_MULTI_TRANSACTION | ||
| 231 | mchanged = memcmp((void *)serial_master_buffer, | ||
| 232 | &matrix[offset], SERIAL_MASTER_BUFFER_LENGTH); | ||
| 233 | #endif | ||
| 234 | memcpy((void *)serial_master_buffer, | ||
| 235 | &matrix[offset], SERIAL_MASTER_BUFFER_LENGTH); | ||
| 236 | #endif | ||
| 237 | |||
| 238 | #ifdef USE_MATRIX_I2C | ||
| 239 | if( i2c_transaction() ) { | ||
| 240 | #else // USE_SERIAL | ||
| 241 | if( serial_transaction(mchanged) ) { | ||
| 242 | #endif | ||
| 243 | // turn on the indicator led when halves are disconnected | ||
| 244 | writePinLow(D5); | ||
| 245 | |||
| 246 | error_count++; | ||
| 247 | |||
| 248 | if (error_count > ERROR_DISCONNECT_COUNT) { | ||
| 249 | // reset other half if disconnected | ||
| 250 | int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0; | ||
| 251 | for (int i = 0; i < ROWS_PER_HAND; ++i) { | ||
| 252 | matrix[slaveOffset+i] = 0; | ||
| 253 | } | ||
| 254 | } | ||
| 255 | } else { | ||
| 256 | // turn off the indicator led on no error | ||
| 257 | writePinHigh(D5); | ||
| 258 | error_count = 0; | ||
| 259 | } | ||
| 260 | matrix_scan_quantum(); | ||
| 261 | return ret; | ||
| 262 | } | ||
| 263 | |||
| 264 | void matrix_slave_scan(void) { | ||
| 265 | _matrix_scan(); | ||
| 266 | |||
| 267 | int offset = (isLeftHand) ? 0 : ROWS_PER_HAND; | ||
| 268 | |||
| 269 | #ifdef USE_MATRIX_I2C | ||
| 270 | for (int i = 0; i < ROWS_PER_HAND; ++i) { | ||
| 271 | /* i2c_slave_buffer[i] = matrix[offset+i]; */ | ||
| 272 | i2c_slave_buffer[i] = matrix[offset+i]; | ||
| 273 | } | ||
| 274 | #else // USE_SERIAL | ||
| 275 | #ifdef SERIAL_USE_MULTI_TRANSACTION | ||
| 276 | int change = 0; | ||
| 277 | #endif | ||
| 278 | for (int i = 0; i < ROWS_PER_HAND; ++i) { | ||
| 279 | #ifdef SERIAL_USE_MULTI_TRANSACTION | ||
| 280 | if( serial_slave_buffer[i] != matrix[offset+i] ) | ||
| 281 | change = 1; | ||
| 282 | #endif | ||
| 283 | serial_slave_buffer[i] = matrix[offset+i]; | ||
| 284 | } | ||
| 285 | #ifdef SERIAL_USE_MULTI_TRANSACTION | ||
| 286 | slave_buffer_change_count += change; | ||
| 287 | #endif | ||
| 288 | #endif | ||
| 289 | } | ||
| 290 | |||
| 291 | bool matrix_is_modified(void) | ||
| 292 | { | ||
| 293 | if (debouncing) return false; | ||
| 294 | return true; | ||
| 295 | } | ||
| 296 | |||
| 297 | inline | ||
| 298 | bool matrix_is_on(uint8_t row, uint8_t col) | ||
| 299 | { | ||
| 300 | return (matrix[row] & ((matrix_row_t)1<<col)); | ||
| 301 | } | ||
| 302 | |||
| 303 | inline | ||
| 304 | matrix_row_t matrix_get_row(uint8_t row) | ||
| 305 | { | ||
| 306 | return matrix[row]; | ||
| 307 | } | ||
| 308 | |||
| 309 | void matrix_print(void) | ||
| 310 | { | ||
| 311 | print("\nr/c 0123456789ABCDEF\n"); | ||
| 312 | for (uint8_t row = 0; row < MATRIX_ROWS; row++) { | ||
| 313 | print_hex8(row); print(": "); | ||
| 314 | print_bin_reverse16(matrix_get_row(row)); | ||
| 315 | print("\n"); | ||
| 316 | } | ||
| 317 | } | ||
| 318 | |||
| 319 | uint8_t matrix_key_count(void) | ||
| 320 | { | ||
| 321 | uint8_t count = 0; | ||
| 322 | for (uint8_t i = 0; i < MATRIX_ROWS; i++) { | ||
| 323 | count += bitpop16(matrix[i]); | ||
| 324 | } | ||
| 325 | return count; | ||
| 326 | } | ||
| 327 | |||
| 328 | static void init_cols(void) | ||
| 329 | { | ||
| 330 | for(int x = 0; x < MATRIX_COLS; x++) { | ||
| 331 | _SFR_IO8((col_pins[x] >> 4) + 1) &= ~_BV(col_pins[x] & 0xF); | ||
| 332 | _SFR_IO8((col_pins[x] >> 4) + 2) |= _BV(col_pins[x] & 0xF); | ||
| 333 | } | ||
| 334 | } | ||
| 335 | |||
| 336 | static matrix_row_t read_cols(void) | ||
| 337 | { | ||
| 338 | matrix_row_t result = 0; | ||
| 339 | for(int x = 0; x < MATRIX_COLS; x++) { | ||
| 340 | result |= (_SFR_IO8(col_pins[x] >> 4) & _BV(col_pins[x] & 0xF)) ? 0 : (1 << x); | ||
| 341 | } | ||
| 342 | return result; | ||
| 343 | } | ||
| 344 | |||
| 345 | static void unselect_rows(void) | ||
| 346 | { | ||
| 347 | for(int x = 0; x < ROWS_PER_HAND; x++) { | ||
| 348 | _SFR_IO8((row_pins[x] >> 4) + 1) &= ~_BV(row_pins[x] & 0xF); | ||
| 349 | _SFR_IO8((row_pins[x] >> 4) + 2) |= _BV(row_pins[x] & 0xF); | ||
| 350 | } | ||
| 351 | } | ||
| 352 | |||
| 353 | static void select_row(uint8_t row) | ||
| 354 | { | ||
| 355 | _SFR_IO8((row_pins[row] >> 4) + 1) |= _BV(row_pins[row] & 0xF); | ||
| 356 | _SFR_IO8((row_pins[row] >> 4) + 2) &= ~_BV(row_pins[row] & 0xF); | ||
| 357 | } | ||
diff --git a/keyboards/lily58/rev1/serial_config.h b/keyboards/lily58/rev1/serial_config.h deleted file mode 100755 index 4fab8e8dd..000000000 --- a/keyboards/lily58/rev1/serial_config.h +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | #ifndef SOFT_SERIAL_PIN | ||
| 2 | #define SOFT_SERIAL_PIN D2 | ||
| 3 | #define SERIAL_USE_MULTI_TRANSACTION | ||
| 4 | #endif | ||
diff --git a/keyboards/lily58/rev1/split_util.c b/keyboards/lily58/rev1/split_util.c deleted file mode 100755 index 316c1c389..000000000 --- a/keyboards/lily58/rev1/split_util.c +++ /dev/null | |||
| @@ -1,100 +0,0 @@ | |||
| 1 | #include <avr/io.h> | ||
| 2 | #include <avr/wdt.h> | ||
| 3 | #include <avr/power.h> | ||
| 4 | #include <avr/interrupt.h> | ||
| 5 | #include <util/delay.h> | ||
| 6 | #include <avr/eeprom.h> | ||
| 7 | #include "split_util.h" | ||
| 8 | #include "matrix.h" | ||
| 9 | #include "keyboard.h" | ||
| 10 | #include "wait.h" | ||
| 11 | |||
| 12 | #ifdef USE_MATRIX_I2C | ||
| 13 | # include "i2c.h" | ||
| 14 | #else | ||
| 15 | # include "split_scomm.h" | ||
| 16 | #endif | ||
| 17 | |||
| 18 | #ifndef SPLIT_USB_TIMEOUT | ||
| 19 | # define SPLIT_USB_TIMEOUT 2500 | ||
| 20 | #endif | ||
| 21 | |||
| 22 | volatile bool isLeftHand = true; | ||
| 23 | |||
| 24 | bool waitForUsb(void) { | ||
| 25 | for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / 100); i++) { | ||
| 26 | // This will return true of a USB connection has been established | ||
| 27 | if (UDADDR & _BV(ADDEN)) { | ||
| 28 | return true; | ||
| 29 | } | ||
| 30 | wait_ms(100); | ||
| 31 | } | ||
| 32 | |||
| 33 | // Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow | ||
| 34 | (USBCON &= ~(_BV(USBE) | _BV(OTGPADE))); | ||
| 35 | |||
| 36 | return false; | ||
| 37 | } | ||
| 38 | |||
| 39 | __attribute__((weak)) bool is_keyboard_left(void) { | ||
| 40 | #if defined(SPLIT_HAND_PIN) | ||
| 41 | // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand | ||
| 42 | setPinInput(SPLIT_HAND_PIN); | ||
| 43 | return readPin(SPLIT_HAND_PIN); | ||
| 44 | #elif defined(EE_HANDS) | ||
| 45 | return eeconfig_read_handedness(); | ||
| 46 | #elif defined(MASTER_RIGHT) | ||
| 47 | return !has_usb(); | ||
| 48 | #endif | ||
| 49 | |||
| 50 | return has_usb(); | ||
| 51 | } | ||
| 52 | |||
| 53 | __attribute__((weak)) bool has_usb(void) { | ||
| 54 | static enum { UNKNOWN, MASTER, SLAVE } usbstate = UNKNOWN; | ||
| 55 | |||
| 56 | // only check once, as this is called often | ||
| 57 | if (usbstate == UNKNOWN) { | ||
| 58 | #if defined(SPLIT_USB_DETECT) | ||
| 59 | usbstate = waitForUsb() ? MASTER : SLAVE; | ||
| 60 | #elif defined(__AVR__) | ||
| 61 | USBCON |= (1 << OTGPADE); // enables VBUS pad | ||
| 62 | wait_us(5); | ||
| 63 | |||
| 64 | usbstate = (USBSTA & (1 << VBUS)) ? MASTER : SLAVE; // checks state of VBUS | ||
| 65 | #else | ||
| 66 | usbstate = MASTER; | ||
| 67 | #endif | ||
| 68 | } | ||
| 69 | |||
| 70 | return (usbstate == MASTER); | ||
| 71 | } | ||
| 72 | |||
| 73 | static void keyboard_master_setup(void) { | ||
| 74 | |||
| 75 | #ifdef USE_MATRIX_I2C | ||
| 76 | i2c_master_init(); | ||
| 77 | #else | ||
| 78 | serial_master_init(); | ||
| 79 | #endif | ||
| 80 | } | ||
| 81 | |||
| 82 | static void keyboard_slave_setup(void) { | ||
| 83 | |||
| 84 | #ifdef USE_MATRIX_I2C | ||
| 85 | i2c_slave_init(SLAVE_I2C_ADDRESS); | ||
| 86 | #else | ||
| 87 | serial_slave_init(); | ||
| 88 | #endif | ||
| 89 | } | ||
| 90 | |||
| 91 | void split_keyboard_setup(void) { | ||
| 92 | isLeftHand = is_keyboard_left(); | ||
| 93 | |||
| 94 | if (has_usb()) { | ||
| 95 | keyboard_master_setup(); | ||
| 96 | } else { | ||
| 97 | keyboard_slave_setup(); | ||
| 98 | } | ||
| 99 | sei(); | ||
| 100 | } | ||
diff --git a/keyboards/lily58/serial.c b/keyboards/lily58/serial.c deleted file mode 100755 index f6293c3dc..000000000 --- a/keyboards/lily58/serial.c +++ /dev/null | |||
| @@ -1,589 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * WARNING: be careful changing this code, it is very timing dependent | ||
| 3 | * | ||
| 4 | * 2018-10-28 checked | ||
| 5 | * avr-gcc 4.9.2 | ||
| 6 | * avr-gcc 5.4.0 | ||
| 7 | * avr-gcc 7.3.0 | ||
| 8 | */ | ||
| 9 | |||
| 10 | #ifndef F_CPU | ||
| 11 | #define F_CPU 16000000 | ||
| 12 | #endif | ||
| 13 | |||
| 14 | #include <avr/io.h> | ||
| 15 | #include <avr/interrupt.h> | ||
| 16 | #include <util/delay.h> | ||
| 17 | #include <stddef.h> | ||
| 18 | #include <stdbool.h> | ||
| 19 | #include "serial.h" | ||
| 20 | |||
| 21 | #ifdef SOFT_SERIAL_PIN | ||
| 22 | |||
| 23 | #ifdef __AVR_ATmega32U4__ | ||
| 24 | // if using ATmega32U4 I2C, can not use PD0 and PD1 in soft serial. | ||
| 25 | #ifdef USE_I2C | ||
| 26 | #if SOFT_SERIAL_PIN == D0 || SOFT_SERIAL_PIN == D1 | ||
| 27 | #error Using ATmega32U4 I2C, so can not use PD0, PD1 | ||
| 28 | #endif | ||
| 29 | #endif | ||
| 30 | |||
| 31 | #if SOFT_SERIAL_PIN >= D0 && SOFT_SERIAL_PIN <= D3 | ||
| 32 | #define SERIAL_PIN_DDR DDRD | ||
| 33 | #define SERIAL_PIN_PORT PORTD | ||
| 34 | #define SERIAL_PIN_INPUT PIND | ||
| 35 | #if SOFT_SERIAL_PIN == D0 | ||
| 36 | #define SERIAL_PIN_MASK _BV(PD0) | ||
| 37 | #define EIMSK_BIT _BV(INT0) | ||
| 38 | #define EICRx_BIT (~(_BV(ISC00) | _BV(ISC01))) | ||
| 39 | #define SERIAL_PIN_INTERRUPT INT0_vect | ||
| 40 | #elif SOFT_SERIAL_PIN == D1 | ||
| 41 | #define SERIAL_PIN_MASK _BV(PD1) | ||
| 42 | #define EIMSK_BIT _BV(INT1) | ||
| 43 | #define EICRx_BIT (~(_BV(ISC10) | _BV(ISC11))) | ||
| 44 | #define SERIAL_PIN_INTERRUPT INT1_vect | ||
| 45 | #elif SOFT_SERIAL_PIN == D2 | ||
| 46 | #define SERIAL_PIN_MASK _BV(PD2) | ||
| 47 | #define EIMSK_BIT _BV(INT2) | ||
| 48 | #define EICRx_BIT (~(_BV(ISC20) | _BV(ISC21))) | ||
| 49 | #define SERIAL_PIN_INTERRUPT INT2_vect | ||
| 50 | #elif SOFT_SERIAL_PIN == D3 | ||
| 51 | #define SERIAL_PIN_MASK _BV(PD3) | ||
| 52 | #define EIMSK_BIT _BV(INT3) | ||
| 53 | #define EICRx_BIT (~(_BV(ISC30) | _BV(ISC31))) | ||
| 54 | #define SERIAL_PIN_INTERRUPT INT3_vect | ||
| 55 | #endif | ||
| 56 | #elif SOFT_SERIAL_PIN == E6 | ||
| 57 | #define SERIAL_PIN_DDR DDRE | ||
| 58 | #define SERIAL_PIN_PORT PORTE | ||
| 59 | #define SERIAL_PIN_INPUT PINE | ||
| 60 | #define SERIAL_PIN_MASK _BV(PE6) | ||
| 61 | #define EIMSK_BIT _BV(INT6) | ||
| 62 | #define EICRx_BIT (~(_BV(ISC60) | _BV(ISC61))) | ||
| 63 | #define SERIAL_PIN_INTERRUPT INT6_vect | ||
| 64 | #else | ||
| 65 | #error invalid SOFT_SERIAL_PIN value | ||
| 66 | #endif | ||
| 67 | |||
| 68 | #else | ||
| 69 | #error serial.c now support ATmega32U4 only | ||
| 70 | #endif | ||
| 71 | |||
| 72 | //////////////// for backward compatibility //////////////////////////////// | ||
| 73 | #ifndef SERIAL_USE_MULTI_TRANSACTION | ||
| 74 | /* --- USE Simple API (OLD API, compatible with let's split serial.c) */ | ||
| 75 | #if SERIAL_SLAVE_BUFFER_LENGTH > 0 | ||
| 76 | uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0}; | ||
| 77 | #endif | ||
| 78 | #if SERIAL_MASTER_BUFFER_LENGTH > 0 | ||
| 79 | uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0}; | ||
| 80 | #endif | ||
| 81 | uint8_t volatile status0 = 0; | ||
| 82 | |||
| 83 | SSTD_t transactions[] = { | ||
| 84 | { (uint8_t *)&status0, | ||
| 85 | #if SERIAL_MASTER_BUFFER_LENGTH > 0 | ||
| 86 | sizeof(serial_master_buffer), (uint8_t *)serial_master_buffer, | ||
| 87 | #else | ||
| 88 | 0, (uint8_t *)NULL, | ||
| 89 | #endif | ||
| 90 | #if SERIAL_SLAVE_BUFFER_LENGTH > 0 | ||
| 91 | sizeof(serial_slave_buffer), (uint8_t *)serial_slave_buffer | ||
| 92 | #else | ||
| 93 | 0, (uint8_t *)NULL, | ||
| 94 | #endif | ||
| 95 | } | ||
| 96 | }; | ||
| 97 | |||
| 98 | void serial_master_init(void) | ||
| 99 | { soft_serial_initiator_init(transactions, TID_LIMIT(transactions)); } | ||
| 100 | |||
| 101 | void serial_slave_init(void) | ||
| 102 | { soft_serial_target_init(transactions, TID_LIMIT(transactions)); } | ||
| 103 | |||
| 104 | // 0 => no error | ||
| 105 | // 1 => slave did not respond | ||
| 106 | // 2 => checksum error | ||
| 107 | int serial_update_buffers() | ||
| 108 | { | ||
| 109 | int result; | ||
| 110 | result = soft_serial_transaction(); | ||
| 111 | return result; | ||
| 112 | } | ||
| 113 | |||
| 114 | #endif // end of Simple API (OLD API, compatible with let's split serial.c) | ||
| 115 | //////////////////////////////////////////////////////////////////////////// | ||
| 116 | |||
| 117 | #define ALWAYS_INLINE __attribute__((always_inline)) | ||
| 118 | #define NO_INLINE __attribute__((noinline)) | ||
| 119 | #define _delay_sub_us(x) __builtin_avr_delay_cycles(x) | ||
| 120 | |||
| 121 | // parity check | ||
| 122 | #define ODD_PARITY 1 | ||
| 123 | #define EVEN_PARITY 0 | ||
| 124 | #define PARITY EVEN_PARITY | ||
| 125 | |||
| 126 | #ifdef SERIAL_DELAY | ||
| 127 | // custom setup in config.h | ||
| 128 | // #define TID_SEND_ADJUST 2 | ||
| 129 | // #define SERIAL_DELAY 6 // micro sec | ||
| 130 | // #define READ_WRITE_START_ADJUST 30 // cycles | ||
| 131 | // #define READ_WRITE_WIDTH_ADJUST 8 // cycles | ||
| 132 | #else | ||
| 133 | // ============ Standard setups ============ | ||
| 134 | |||
| 135 | #ifndef SELECT_SOFT_SERIAL_SPEED | ||
| 136 | #define SELECT_SOFT_SERIAL_SPEED 1 | ||
| 137 | // 0: about 189kbps | ||
| 138 | // 1: about 137kbps (default) | ||
| 139 | // 2: about 75kbps | ||
| 140 | // 3: about 39kbps | ||
| 141 | // 4: about 26kbps | ||
| 142 | // 5: about 20kbps | ||
| 143 | #endif | ||
| 144 | |||
| 145 | #if __GNUC__ < 6 | ||
| 146 | #define TID_SEND_ADJUST 14 | ||
| 147 | #else | ||
| 148 | #define TID_SEND_ADJUST 2 | ||
| 149 | #endif | ||
| 150 | |||
| 151 | #if SELECT_SOFT_SERIAL_SPEED == 0 | ||
| 152 | // Very High speed | ||
| 153 | #define SERIAL_DELAY 4 // micro sec | ||
| 154 | #if __GNUC__ < 6 | ||
| 155 | #define READ_WRITE_START_ADJUST 33 // cycles | ||
| 156 | #define READ_WRITE_WIDTH_ADJUST 3 // cycles | ||
| 157 | #else | ||
| 158 | #define READ_WRITE_START_ADJUST 34 // cycles | ||
| 159 | #define READ_WRITE_WIDTH_ADJUST 7 // cycles | ||
| 160 | #endif | ||
| 161 | #elif SELECT_SOFT_SERIAL_SPEED == 1 | ||
| 162 | // High speed | ||
| 163 | #define SERIAL_DELAY 6 // micro sec | ||
| 164 | #if __GNUC__ < 6 | ||
| 165 | #define READ_WRITE_START_ADJUST 30 // cycles | ||
| 166 | #define READ_WRITE_WIDTH_ADJUST 3 // cycles | ||
| 167 | #else | ||
| 168 | #define READ_WRITE_START_ADJUST 33 // cycles | ||
| 169 | #define READ_WRITE_WIDTH_ADJUST 7 // cycles | ||
| 170 | #endif | ||
| 171 | #elif SELECT_SOFT_SERIAL_SPEED == 2 | ||
| 172 | // Middle speed | ||
| 173 | #define SERIAL_DELAY 12 // micro sec | ||
| 174 | #define READ_WRITE_START_ADJUST 30 // cycles | ||
| 175 | #if __GNUC__ < 6 | ||
| 176 | #define READ_WRITE_WIDTH_ADJUST 3 // cycles | ||
| 177 | #else | ||
| 178 | #define READ_WRITE_WIDTH_ADJUST 7 // cycles | ||
| 179 | #endif | ||
| 180 | #elif SELECT_SOFT_SERIAL_SPEED == 3 | ||
| 181 | // Low speed | ||
| 182 | #define SERIAL_DELAY 24 // micro sec | ||
| 183 | #define READ_WRITE_START_ADJUST 30 // cycles | ||
| 184 | #if __GNUC__ < 6 | ||
| 185 | #define READ_WRITE_WIDTH_ADJUST 3 // cycles | ||
| 186 | #else | ||
| 187 | #define READ_WRITE_WIDTH_ADJUST 7 // cycles | ||
| 188 | #endif | ||
| 189 | #elif SELECT_SOFT_SERIAL_SPEED == 4 | ||
| 190 | // Very Low speed | ||
| 191 | #define SERIAL_DELAY 36 // micro sec | ||
| 192 | #define READ_WRITE_START_ADJUST 30 // cycles | ||
| 193 | #if __GNUC__ < 6 | ||
| 194 | #define READ_WRITE_WIDTH_ADJUST 3 // cycles | ||
| 195 | #else | ||
| 196 | #define READ_WRITE_WIDTH_ADJUST 7 // cycles | ||
| 197 | #endif | ||
| 198 | #elif SELECT_SOFT_SERIAL_SPEED == 5 | ||
| 199 | // Ultra Low speed | ||
| 200 | #define SERIAL_DELAY 48 // micro sec | ||
| 201 | #define READ_WRITE_START_ADJUST 30 // cycles | ||
| 202 | #if __GNUC__ < 6 | ||
| 203 | #define READ_WRITE_WIDTH_ADJUST 3 // cycles | ||
| 204 | #else | ||
| 205 | #define READ_WRITE_WIDTH_ADJUST 7 // cycles | ||
| 206 | #endif | ||
| 207 | #else | ||
| 208 | #error invalid SELECT_SOFT_SERIAL_SPEED value | ||
| 209 | #endif /* SELECT_SOFT_SERIAL_SPEED */ | ||
| 210 | #endif /* SERIAL_DELAY */ | ||
| 211 | |||
| 212 | #define SERIAL_DELAY_HALF1 (SERIAL_DELAY/2) | ||
| 213 | #define SERIAL_DELAY_HALF2 (SERIAL_DELAY - SERIAL_DELAY/2) | ||
| 214 | |||
| 215 | #define SLAVE_INT_WIDTH_US 1 | ||
| 216 | #ifndef SERIAL_USE_MULTI_TRANSACTION | ||
| 217 | #define SLAVE_INT_RESPONSE_TIME SERIAL_DELAY | ||
| 218 | #else | ||
| 219 | #define SLAVE_INT_ACK_WIDTH_UNIT 2 | ||
| 220 | #define SLAVE_INT_ACK_WIDTH 4 | ||
| 221 | #endif | ||
| 222 | |||
| 223 | static SSTD_t *Transaction_table = NULL; | ||
| 224 | static uint8_t Transaction_table_size = 0; | ||
| 225 | |||
| 226 | inline static void serial_delay(void) ALWAYS_INLINE; | ||
| 227 | inline static | ||
| 228 | void serial_delay(void) { | ||
| 229 | _delay_us(SERIAL_DELAY); | ||
| 230 | } | ||
| 231 | |||
| 232 | inline static void serial_delay_half1(void) ALWAYS_INLINE; | ||
| 233 | inline static | ||
| 234 | void serial_delay_half1(void) { | ||
| 235 | _delay_us(SERIAL_DELAY_HALF1); | ||
| 236 | } | ||
| 237 | |||
| 238 | inline static void serial_delay_half2(void) ALWAYS_INLINE; | ||
| 239 | inline static | ||
| 240 | void serial_delay_half2(void) { | ||
| 241 | _delay_us(SERIAL_DELAY_HALF2); | ||
| 242 | } | ||
| 243 | |||
| 244 | inline static void serial_output(void) ALWAYS_INLINE; | ||
| 245 | inline static | ||
| 246 | void serial_output(void) { | ||
| 247 | SERIAL_PIN_DDR |= SERIAL_PIN_MASK; | ||
| 248 | } | ||
| 249 | |||
| 250 | // make the serial pin an input with pull-up resistor | ||
| 251 | inline static void serial_input_with_pullup(void) ALWAYS_INLINE; | ||
| 252 | inline static | ||
| 253 | void serial_input_with_pullup(void) { | ||
| 254 | SERIAL_PIN_DDR &= ~SERIAL_PIN_MASK; | ||
| 255 | SERIAL_PIN_PORT |= SERIAL_PIN_MASK; | ||
| 256 | } | ||
| 257 | |||
| 258 | inline static uint8_t serial_read_pin(void) ALWAYS_INLINE; | ||
| 259 | inline static | ||
| 260 | uint8_t serial_read_pin(void) { | ||
| 261 | return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK); | ||
| 262 | } | ||
| 263 | |||
| 264 | inline static void serial_low(void) ALWAYS_INLINE; | ||
| 265 | inline static | ||
| 266 | void serial_low(void) { | ||
| 267 | SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK; | ||
| 268 | } | ||
| 269 | |||
| 270 | inline static void serial_high(void) ALWAYS_INLINE; | ||
| 271 | inline static | ||
| 272 | void serial_high(void) { | ||
| 273 | SERIAL_PIN_PORT |= SERIAL_PIN_MASK; | ||
| 274 | } | ||
| 275 | |||
| 276 | void soft_serial_initiator_init(SSTD_t *sstd_table, int sstd_table_size) | ||
| 277 | { | ||
| 278 | Transaction_table = sstd_table; | ||
| 279 | Transaction_table_size = (uint8_t)sstd_table_size; | ||
| 280 | serial_output(); | ||
| 281 | serial_high(); | ||
| 282 | } | ||
| 283 | |||
| 284 | void soft_serial_target_init(SSTD_t *sstd_table, int sstd_table_size) | ||
| 285 | { | ||
| 286 | Transaction_table = sstd_table; | ||
| 287 | Transaction_table_size = (uint8_t)sstd_table_size; | ||
| 288 | serial_input_with_pullup(); | ||
| 289 | |||
| 290 | // Enable INT0-INT3,INT6 | ||
| 291 | EIMSK |= EIMSK_BIT; | ||
| 292 | #if SERIAL_PIN_MASK == _BV(PE6) | ||
| 293 | // Trigger on falling edge of INT6 | ||
| 294 | EICRB &= EICRx_BIT; | ||
| 295 | #else | ||
| 296 | // Trigger on falling edge of INT0-INT3 | ||
| 297 | EICRA &= EICRx_BIT; | ||
| 298 | #endif | ||
| 299 | } | ||
| 300 | |||
| 301 | // Used by the sender to synchronize timing with the reciver. | ||
| 302 | static void sync_recv(void) NO_INLINE; | ||
| 303 | static | ||
| 304 | void sync_recv(void) { | ||
| 305 | for (uint8_t i = 0; i < SERIAL_DELAY*5 && serial_read_pin(); i++ ) { | ||
| 306 | } | ||
| 307 | // This shouldn't hang if the target disconnects because the | ||
| 308 | // serial line will float to high if the target does disconnect. | ||
| 309 | while (!serial_read_pin()); | ||
| 310 | } | ||
| 311 | |||
| 312 | // Used by the reciver to send a synchronization signal to the sender. | ||
| 313 | static void sync_send(void) NO_INLINE; | ||
| 314 | static | ||
| 315 | void sync_send(void) { | ||
| 316 | serial_low(); | ||
| 317 | serial_delay(); | ||
| 318 | serial_high(); | ||
| 319 | } | ||
| 320 | |||
| 321 | // Reads a byte from the serial line | ||
| 322 | static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) NO_INLINE; | ||
| 323 | static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) { | ||
| 324 | uint8_t byte, i, p, pb; | ||
| 325 | |||
| 326 | _delay_sub_us(READ_WRITE_START_ADJUST); | ||
| 327 | for( i = 0, byte = 0, p = PARITY; i < bit; i++ ) { | ||
| 328 | serial_delay_half1(); // read the middle of pulses | ||
| 329 | if( serial_read_pin() ) { | ||
| 330 | byte = (byte << 1) | 1; p ^= 1; | ||
| 331 | } else { | ||
| 332 | byte = (byte << 1) | 0; p ^= 0; | ||
| 333 | } | ||
| 334 | _delay_sub_us(READ_WRITE_WIDTH_ADJUST); | ||
| 335 | serial_delay_half2(); | ||
| 336 | } | ||
| 337 | /* recive parity bit */ | ||
| 338 | serial_delay_half1(); // read the middle of pulses | ||
| 339 | pb = serial_read_pin(); | ||
| 340 | _delay_sub_us(READ_WRITE_WIDTH_ADJUST); | ||
| 341 | serial_delay_half2(); | ||
| 342 | |||
| 343 | *pterrcount += (p != pb)? 1 : 0; | ||
| 344 | |||
| 345 | return byte; | ||
| 346 | } | ||
| 347 | |||
| 348 | // Sends a byte with MSB ordering | ||
| 349 | void serial_write_chunk(uint8_t data, uint8_t bit) NO_INLINE; | ||
| 350 | void serial_write_chunk(uint8_t data, uint8_t bit) { | ||
| 351 | uint8_t b, p; | ||
| 352 | for( p = PARITY, b = 1<<(bit-1); b ; b >>= 1) { | ||
| 353 | if(data & b) { | ||
| 354 | serial_high(); p ^= 1; | ||
| 355 | } else { | ||
| 356 | serial_low(); p ^= 0; | ||
| 357 | } | ||
| 358 | serial_delay(); | ||
| 359 | } | ||
| 360 | /* send parity bit */ | ||
| 361 | if(p & 1) { serial_high(); } | ||
| 362 | else { serial_low(); } | ||
| 363 | serial_delay(); | ||
| 364 | |||
| 365 | serial_low(); // sync_send() / senc_recv() need raise edge | ||
| 366 | } | ||
| 367 | |||
| 368 | static void serial_send_packet(uint8_t *buffer, uint8_t size) NO_INLINE; | ||
| 369 | static | ||
| 370 | void serial_send_packet(uint8_t *buffer, uint8_t size) { | ||
| 371 | for (uint8_t i = 0; i < size; ++i) { | ||
| 372 | uint8_t data; | ||
| 373 | data = buffer[i]; | ||
| 374 | sync_send(); | ||
| 375 | serial_write_chunk(data,8); | ||
| 376 | } | ||
| 377 | } | ||
| 378 | |||
| 379 | static uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) NO_INLINE; | ||
| 380 | static | ||
| 381 | uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) { | ||
| 382 | uint8_t pecount = 0; | ||
| 383 | for (uint8_t i = 0; i < size; ++i) { | ||
| 384 | uint8_t data; | ||
| 385 | sync_recv(); | ||
| 386 | data = serial_read_chunk(&pecount, 8); | ||
| 387 | buffer[i] = data; | ||
| 388 | } | ||
| 389 | return pecount == 0; | ||
| 390 | } | ||
| 391 | |||
| 392 | inline static | ||
| 393 | void change_sender2reciver(void) { | ||
| 394 | sync_send(); //0 | ||
| 395 | serial_delay_half1(); //1 | ||
| 396 | serial_low(); //2 | ||
| 397 | serial_input_with_pullup(); //2 | ||
| 398 | serial_delay_half1(); //3 | ||
| 399 | } | ||
| 400 | |||
| 401 | inline static | ||
| 402 | void change_reciver2sender(void) { | ||
| 403 | sync_recv(); //0 | ||
| 404 | serial_delay(); //1 | ||
| 405 | serial_low(); //3 | ||
| 406 | serial_output(); //3 | ||
| 407 | serial_delay_half1(); //4 | ||
| 408 | } | ||
| 409 | |||
| 410 | static inline uint8_t nibble_bits_count(uint8_t bits) | ||
| 411 | { | ||
| 412 | bits = (bits & 0x5) + (bits >> 1 & 0x5); | ||
| 413 | bits = (bits & 0x3) + (bits >> 2 & 0x3); | ||
| 414 | return bits; | ||
| 415 | } | ||
| 416 | |||
| 417 | // interrupt handle to be used by the target device | ||
| 418 | ISR(SERIAL_PIN_INTERRUPT) { | ||
| 419 | |||
| 420 | #ifndef SERIAL_USE_MULTI_TRANSACTION | ||
| 421 | serial_low(); | ||
| 422 | serial_output(); | ||
| 423 | SSTD_t *trans = Transaction_table; | ||
| 424 | #else | ||
| 425 | // recive transaction table index | ||
| 426 | uint8_t tid, bits; | ||
| 427 | uint8_t pecount = 0; | ||
| 428 | sync_recv(); | ||
| 429 | bits = serial_read_chunk(&pecount,7); | ||
| 430 | tid = bits>>3; | ||
| 431 | bits = (bits&7) != nibble_bits_count(tid); | ||
| 432 | if( bits || pecount> 0 || tid > Transaction_table_size ) { | ||
| 433 | return; | ||
| 434 | } | ||
| 435 | serial_delay_half1(); | ||
| 436 | |||
| 437 | serial_high(); // response step1 low->high | ||
| 438 | serial_output(); | ||
| 439 | _delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT*SLAVE_INT_ACK_WIDTH); | ||
| 440 | SSTD_t *trans = &Transaction_table[tid]; | ||
| 441 | serial_low(); // response step2 ack high->low | ||
| 442 | #endif | ||
| 443 | |||
| 444 | // target send phase | ||
| 445 | if( trans->target2initiator_buffer_size > 0 ) | ||
| 446 | serial_send_packet((uint8_t *)trans->target2initiator_buffer, | ||
| 447 | trans->target2initiator_buffer_size); | ||
| 448 | // target switch to input | ||
| 449 | change_sender2reciver(); | ||
| 450 | |||
| 451 | // target recive phase | ||
| 452 | if( trans->initiator2target_buffer_size > 0 ) { | ||
| 453 | if (serial_recive_packet((uint8_t *)trans->initiator2target_buffer, | ||
| 454 | trans->initiator2target_buffer_size) ) { | ||
| 455 | *trans->status = TRANSACTION_ACCEPTED; | ||
| 456 | } else { | ||
| 457 | *trans->status = TRANSACTION_DATA_ERROR; | ||
| 458 | } | ||
| 459 | } else { | ||
| 460 | *trans->status = TRANSACTION_ACCEPTED; | ||
| 461 | } | ||
| 462 | |||
| 463 | sync_recv(); //weit initiator output to high | ||
| 464 | } | ||
| 465 | |||
| 466 | ///////// | ||
| 467 | // start transaction by initiator | ||
| 468 | // | ||
| 469 | // int soft_serial_transaction(int sstd_index) | ||
| 470 | // | ||
| 471 | // Returns: | ||
| 472 | // TRANSACTION_END | ||
| 473 | // TRANSACTION_NO_RESPONSE | ||
| 474 | // TRANSACTION_DATA_ERROR | ||
| 475 | // this code is very time dependent, so we need to disable interrupts | ||
| 476 | #ifndef SERIAL_USE_MULTI_TRANSACTION | ||
| 477 | int soft_serial_transaction(void) { | ||
| 478 | SSTD_t *trans = Transaction_table; | ||
| 479 | #else | ||
| 480 | int soft_serial_transaction(int sstd_index) { | ||
| 481 | if( sstd_index > Transaction_table_size ) | ||
| 482 | return TRANSACTION_TYPE_ERROR; | ||
| 483 | SSTD_t *trans = &Transaction_table[sstd_index]; | ||
| 484 | #endif | ||
| 485 | cli(); | ||
| 486 | |||
| 487 | // signal to the target that we want to start a transaction | ||
| 488 | serial_output(); | ||
| 489 | serial_low(); | ||
| 490 | _delay_us(SLAVE_INT_WIDTH_US); | ||
| 491 | |||
| 492 | #ifndef SERIAL_USE_MULTI_TRANSACTION | ||
| 493 | // wait for the target response | ||
| 494 | serial_input_with_pullup(); | ||
| 495 | _delay_us(SLAVE_INT_RESPONSE_TIME); | ||
| 496 | |||
| 497 | // check if the target is present | ||
| 498 | if (serial_read_pin()) { | ||
| 499 | // target failed to pull the line low, assume not present | ||
| 500 | serial_output(); | ||
| 501 | serial_high(); | ||
| 502 | *trans->status = TRANSACTION_NO_RESPONSE; | ||
| 503 | sei(); | ||
| 504 | return TRANSACTION_NO_RESPONSE; | ||
| 505 | } | ||
| 506 | |||
| 507 | #else | ||
| 508 | // send transaction table index | ||
| 509 | int tid = (sstd_index<<3) | (7 & nibble_bits_count(sstd_index)); | ||
| 510 | sync_send(); | ||
| 511 | _delay_sub_us(TID_SEND_ADJUST); | ||
| 512 | serial_write_chunk(tid, 7); | ||
| 513 | serial_delay_half1(); | ||
| 514 | |||
| 515 | // wait for the target response (step1 low->high) | ||
| 516 | serial_input_with_pullup(); | ||
| 517 | while( !serial_read_pin() ) { | ||
| 518 | _delay_sub_us(2); | ||
| 519 | } | ||
| 520 | |||
| 521 | // check if the target is present (step2 high->low) | ||
| 522 | for( int i = 0; serial_read_pin(); i++ ) { | ||
| 523 | if (i > SLAVE_INT_ACK_WIDTH + 1) { | ||
| 524 | // slave failed to pull the line low, assume not present | ||
| 525 | serial_output(); | ||
| 526 | serial_high(); | ||
| 527 | *trans->status = TRANSACTION_NO_RESPONSE; | ||
| 528 | sei(); | ||
| 529 | return TRANSACTION_NO_RESPONSE; | ||
| 530 | } | ||
| 531 | _delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT); | ||
| 532 | } | ||
| 533 | #endif | ||
| 534 | |||
| 535 | // initiator recive phase | ||
| 536 | // if the target is present syncronize with it | ||
| 537 | if( trans->target2initiator_buffer_size > 0 ) { | ||
| 538 | if (!serial_recive_packet((uint8_t *)trans->target2initiator_buffer, | ||
| 539 | trans->target2initiator_buffer_size) ) { | ||
| 540 | serial_output(); | ||
| 541 | serial_high(); | ||
| 542 | *trans->status = TRANSACTION_DATA_ERROR; | ||
| 543 | sei(); | ||
| 544 | return TRANSACTION_DATA_ERROR; | ||
| 545 | } | ||
| 546 | } | ||
| 547 | |||
| 548 | // initiator switch to output | ||
| 549 | change_reciver2sender(); | ||
| 550 | |||
| 551 | // initiator send phase | ||
| 552 | if( trans->initiator2target_buffer_size > 0 ) { | ||
| 553 | serial_send_packet((uint8_t *)trans->initiator2target_buffer, | ||
| 554 | trans->initiator2target_buffer_size); | ||
| 555 | } | ||
| 556 | |||
| 557 | // always, release the line when not in use | ||
| 558 | sync_send(); | ||
| 559 | |||
| 560 | *trans->status = TRANSACTION_END; | ||
| 561 | sei(); | ||
| 562 | return TRANSACTION_END; | ||
| 563 | } | ||
| 564 | |||
| 565 | #ifdef SERIAL_USE_MULTI_TRANSACTION | ||
| 566 | int soft_serial_get_and_clean_status(int sstd_index) { | ||
| 567 | SSTD_t *trans = &Transaction_table[sstd_index]; | ||
| 568 | cli(); | ||
| 569 | int retval = *trans->status; | ||
| 570 | *trans->status = 0;; | ||
| 571 | sei(); | ||
| 572 | return retval; | ||
| 573 | } | ||
| 574 | #endif | ||
| 575 | |||
| 576 | #endif | ||
| 577 | |||
| 578 | // Helix serial.c history | ||
| 579 | // 2018-1-29 fork from let's split and add PD2, modify sync_recv() (#2308, bceffdefc) | ||
| 580 | // 2018-6-28 bug fix master to slave comm and speed up (#3255, 1038bbef4) | ||
| 581 | // (adjusted with avr-gcc 4.9.2) | ||
| 582 | // 2018-7-13 remove USE_SERIAL_PD2 macro (#3374, f30d6dd78) | ||
| 583 | // (adjusted with avr-gcc 4.9.2) | ||
| 584 | // 2018-8-11 add support multi-type transaction (#3608, feb5e4aae) | ||
| 585 | // (adjusted with avr-gcc 4.9.2) | ||
| 586 | // 2018-10-21 fix serial and RGB animation conflict (#4191, 4665e4fff) | ||
| 587 | // (adjusted with avr-gcc 7.3.0) | ||
| 588 | // 2018-10-28 re-adjust compiler depend value of delay (#4269, 8517f8a66) | ||
| 589 | // (adjusted with avr-gcc 5.4.0, 7.3.0) | ||
