diff options
author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2018-12-15 04:00:10 +0900 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2018-12-14 11:00:10 -0800 |
commit | 155e9310ff685f557287749bef2e02510538a6d9 (patch) | |
tree | d33aea0d785f1be128e7f8831f0bb1c240cc2d88 /quantum/split_common | |
parent | 9739d6ba0ad3da93f42cc28a78a6722d39ad3d72 (diff) | |
download | qmk_firmware-155e9310ff685f557287749bef2e02510538a6d9.tar.gz qmk_firmware-155e9310ff685f557287749bef2e02510538a6d9.zip |
Make quantum/split_common/serial.[ch] configurable (#4419)
* add temporary compile test shell script
* add 'CONFIG_H += serial_backward_compatibility.h' into common_features.mk:SPLIT_KEYBOARD block
* add quantum/split_common/serial_backward_compatibility.h
SERIAL_PIN_PORT and other PIN define move to serial_backward_compatibility.h
SERIAL_BACKLIT_START move to split_util.h
* quantum/split_common/serial.c change to helix-serial.c style serial configuration
* add temporary file quantum/split_common/split-keyboards-list.txt
* add '#define SOFT_SERIAL_PIN D0' to keyboards/6lit/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/divergetm2/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/ergotravel/rev1/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/foobar/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/handwired/dactyl_manuform/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/handwired/qc60/config.h
* add '//#define SOFT_SERIAL_PIN D0' to keyboards/handwired/xealous/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/iris/rev*/config.h
* add '//#define SOFT_SERIAL_PIN D0' to keyboards/lets_split_eh/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/levinson/rev*/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/miniaxe/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/nyquist/rev?/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/quefrency/rev1/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/qwertyydox/config.h,keyboards/qwertyydox/rev1/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/redox/rev1/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/rorschach/rev1/config.h
* remove '#define SOFT_SERIAL_PIN D0' from quantum/split_common/serial_backward_compatibility.h
* remove temporary file quantum/split_common/split-keyboards-list.txt
* remove temporary compile test shell script
* Revert "remove temporary compile test shell script"
This reverts commit 15b0021b4092127b8d8a21f572642ad3702b46d4.
* update quantum/split_common/compile_split_test.sh for new keyboard test
* add '#define SOFT_SERIAL_PIN D0' to keyboards/diverge3/config.h
* add '#define SOFT_SERIAL_PIN D0' to keyboards/40percentclub/25/config.h
* remove temporary compile test shell script
* update docs/config_options.md, quantum/template/avr/config.h
* fix quantum/template/avr/config.h
* fix typo docs/config_options.md
Diffstat (limited to 'quantum/split_common')
-rw-r--r-- | quantum/split_common/serial.c | 53 | ||||
-rw-r--r-- | quantum/split_common/serial.h | 23 | ||||
-rw-r--r-- | quantum/split_common/serial_backward_compatibility.h | 11 | ||||
-rw-r--r-- | quantum/split_common/split_util.h | 3 |
4 files changed, 77 insertions, 13 deletions
diff --git a/quantum/split_common/serial.c b/quantum/split_common/serial.c index 74bcbb6bf..f34f824d7 100644 --- a/quantum/split_common/serial.c +++ b/quantum/split_common/serial.c | |||
@@ -14,6 +14,59 @@ | |||
14 | 14 | ||
15 | #ifndef USE_I2C | 15 | #ifndef USE_I2C |
16 | 16 | ||
17 | #ifndef SOFT_SERIAL_PIN | ||
18 | #error quantum/split_common/serial.c need SOFT_SERIAL_PIN define | ||
19 | #endif | ||
20 | |||
21 | #ifdef __AVR_ATmega32U4__ | ||
22 | // if using ATmega32U4 I2C, can not use PD0 and PD1 in soft serial. | ||
23 | #ifdef USE_I2C | ||
24 | #if SOFT_SERIAL_PIN == D0 || SOFT_SERIAL_PIN == D1 | ||
25 | #error Using ATmega32U4 I2C, so can not use PD0, PD1 | ||
26 | #endif | ||
27 | #endif | ||
28 | |||
29 | #if SOFT_SERIAL_PIN >= D0 && SOFT_SERIAL_PIN <= D3 | ||
30 | #define SERIAL_PIN_DDR DDRD | ||
31 | #define SERIAL_PIN_PORT PORTD | ||
32 | #define SERIAL_PIN_INPUT PIND | ||
33 | #if SOFT_SERIAL_PIN == D0 | ||
34 | #define SERIAL_PIN_MASK _BV(PD0) | ||
35 | #define EIMSK_BIT _BV(INT0) | ||
36 | #define EICRx_BIT (~(_BV(ISC00) | _BV(ISC01))) | ||
37 | #define SERIAL_PIN_INTERRUPT INT0_vect | ||
38 | #elif SOFT_SERIAL_PIN == D1 | ||
39 | #define SERIAL_PIN_MASK _BV(PD1) | ||
40 | #define EIMSK_BIT _BV(INT1) | ||
41 | #define EICRx_BIT (~(_BV(ISC10) | _BV(ISC11))) | ||
42 | #define SERIAL_PIN_INTERRUPT INT1_vect | ||
43 | #elif SOFT_SERIAL_PIN == D2 | ||
44 | #define SERIAL_PIN_MASK _BV(PD2) | ||
45 | #define EIMSK_BIT _BV(INT2) | ||
46 | #define EICRx_BIT (~(_BV(ISC20) | _BV(ISC21))) | ||
47 | #define SERIAL_PIN_INTERRUPT INT2_vect | ||
48 | #elif SOFT_SERIAL_PIN == D3 | ||
49 | #define SERIAL_PIN_MASK _BV(PD3) | ||
50 | #define EIMSK_BIT _BV(INT3) | ||
51 | #define EICRx_BIT (~(_BV(ISC30) | _BV(ISC31))) | ||
52 | #define SERIAL_PIN_INTERRUPT INT3_vect | ||
53 | #endif | ||
54 | #elif SOFT_SERIAL_PIN == E6 | ||
55 | #define SERIAL_PIN_DDR DDRE | ||
56 | #define SERIAL_PIN_PORT PORTE | ||
57 | #define SERIAL_PIN_INPUT PINE | ||
58 | #define SERIAL_PIN_MASK _BV(PE6) | ||
59 | #define EIMSK_BIT _BV(INT6) | ||
60 | #define EICRx_BIT (~(_BV(ISC60) | _BV(ISC61))) | ||
61 | #define SERIAL_PIN_INTERRUPT INT6_vect | ||
62 | #else | ||
63 | #error invalid SOFT_SERIAL_PIN value | ||
64 | #endif | ||
65 | |||
66 | #else | ||
67 | #error serial.c now support ATmega32U4 only | ||
68 | #endif | ||
69 | |||
17 | // Serial pulse period in microseconds. Its probably a bad idea to lower this | 70 | // Serial pulse period in microseconds. Its probably a bad idea to lower this |
18 | // value. | 71 | // value. |
19 | #define SERIAL_DELAY 24 | 72 | #define SERIAL_DELAY 24 |
diff --git a/quantum/split_common/serial.h b/quantum/split_common/serial.h index e566eb8a0..0b99f352d 100644 --- a/quantum/split_common/serial.h +++ b/quantum/split_common/serial.h | |||
@@ -1,21 +1,18 @@ | |||
1 | #ifndef MY_SERIAL_H | 1 | #ifndef MY_SERIAL_H |
2 | #define MY_SERIAL_H | 2 | #define MY_SERIAL_H |
3 | 3 | ||
4 | #include "config.h" | ||
5 | #include <stdbool.h> | 4 | #include <stdbool.h> |
6 | 5 | ||
7 | /* TODO: some defines for interrupt setup */ | 6 | // ///////////////////////////////////////////////////////////////// |
8 | #define SERIAL_PIN_DDR DDRD | 7 | // Need Soft Serial defines in config.h |
9 | #define SERIAL_PIN_PORT PORTD | 8 | // ///////////////////////////////////////////////////////////////// |
10 | #define SERIAL_PIN_INPUT PIND | 9 | // ex. |
11 | #define SERIAL_PIN_MASK _BV(PD0) | 10 | // /* Configuration of lower interface with the lower layer(hardware) of serial.c */ |
12 | #define SERIAL_PIN_INTERRUPT INT0_vect | 11 | // #define SOFT_SERIAL_PIN ?? // ?? = D0,D1,D2,D3,E6 |
13 | 12 | // | |
14 | #define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2 | 13 | // /* Configuration of upper interface with the upper layer of serial.c */ |
15 | #define SERIAL_MASTER_BUFFER_LENGTH 1 | 14 | // #define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2 |
16 | 15 | // #define SERIAL_MASTER_BUFFER_LENGTH 1 | |
17 | // Address location defines | ||
18 | #define SERIAL_BACKLIT_START 0x00 | ||
19 | 16 | ||
20 | // Buffers for master - slave communication | 17 | // Buffers for master - slave communication |
21 | extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH]; | 18 | extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH]; |
diff --git a/quantum/split_common/serial_backward_compatibility.h b/quantum/split_common/serial_backward_compatibility.h new file mode 100644 index 000000000..216b6c41f --- /dev/null +++ b/quantum/split_common/serial_backward_compatibility.h | |||
@@ -0,0 +1,11 @@ | |||
1 | /* serial.h backward compatibility */ | ||
2 | |||
3 | // #ifndef SOFT_SERIAL_PIN | ||
4 | // #define SOFT_SERIAL_PIN D0 | ||
5 | // #endif | ||
6 | |||
7 | #ifndef SERIAL_SLAVE_BUFFER_LENGTH | ||
8 | #define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2 | ||
9 | #define SERIAL_MASTER_BUFFER_LENGTH 1 | ||
10 | #endif | ||
11 | |||
diff --git a/quantum/split_common/split_util.h b/quantum/split_common/split_util.h index d6cf3e72a..45e8db0f2 100644 --- a/quantum/split_common/split_util.h +++ b/quantum/split_common/split_util.h | |||
@@ -7,6 +7,9 @@ | |||
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #include "eeconfig.h" | 8 | #include "eeconfig.h" |
9 | 9 | ||
10 | // backlight level store index in serial_master_buffer[] for slave to read | ||
11 | #define SERIAL_BACKLIT_START 0x00 | ||
12 | |||
10 | #define SLAVE_I2C_ADDRESS 0x32 | 13 | #define SLAVE_I2C_ADDRESS 0x32 |
11 | 14 | ||
12 | extern volatile bool isLeftHand; | 15 | extern volatile bool isLeftHand; |