diff options
author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2019-08-22 09:10:47 +0900 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-08-21 17:10:47 -0700 |
commit | 1c5b0cbbeb049b1ce3fb2da6a81fbf83dd9a3ea7 (patch) | |
tree | daeafd91c08b5631e6e4429fbbd8f895b2855a86 /quantum/quantum.h | |
parent | b62e160a8950f451b08f1fee0109e60a58c5ddaa (diff) | |
download | qmk_firmware-1c5b0cbbeb049b1ce3fb2da6a81fbf83dd9a3ea7.tar.gz qmk_firmware-1c5b0cbbeb049b1ce3fb2da6a81fbf83dd9a3ea7.zip |
AVR GPIO macro defines more readable (#5937)
* A little easier to read the definition of the GPIO control macro for AVR.
No change in build result.
* Changed to not use GNU statement expression extension.
No change in build result.
* Modified split_common/serial.c to use qmk_firmware standard GPIO control macro.
No change in build result.
* fix PE6 -> E6
* remove some space
* add some comment to config_common.h
* Changed split_common/serial.c to use a newer version of qmk_firmware standard GPIO control macro.
Diffstat (limited to 'quantum/quantum.h')
-rw-r--r-- | quantum/quantum.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index 221462567..2cb26d4f4 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h | |||
@@ -149,18 +149,17 @@ extern layer_state_t default_layer_state; | |||
149 | #if defined(__AVR__) | 149 | #if defined(__AVR__) |
150 | typedef uint8_t pin_t; | 150 | typedef uint8_t pin_t; |
151 | 151 | ||
152 | #define PIN_ADDRESS(p, offset) (_SFR_IO8(ADDRESS_BASE + ((p) >> PORT_SHIFTER) + (offset))) | 152 | #define setPinInput(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin) & 0xF)) |
153 | #define setPinInput(pin) (PIN_ADDRESS(pin, 1) &= ~_BV((pin) & 0xF)) | 153 | #define setPinInputHigh(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin) & 0xF), \ |
154 | #define setPinInputHigh(pin) (PIN_ADDRESS(pin, 1) &= ~_BV((pin) & 0xF), \ | 154 | PORTx_ADDRESS(pin) |= _BV((pin) & 0xF)) |
155 | PIN_ADDRESS(pin, 2) |= _BV((pin) & 0xF)) | ||
156 | #define setPinInputLow(pin) _Static_assert(0, "AVR processors cannot implement an input as pull low") | 155 | #define setPinInputLow(pin) _Static_assert(0, "AVR processors cannot implement an input as pull low") |
157 | #define setPinOutput(pin) (PIN_ADDRESS(pin, 1) |= _BV((pin) & 0xF)) | 156 | #define setPinOutput(pin) (DDRx_ADDRESS(pin) |= _BV((pin) & 0xF)) |
158 | 157 | ||
159 | #define writePinHigh(pin) (PIN_ADDRESS(pin, 2) |= _BV((pin) & 0xF)) | 158 | #define writePinHigh(pin) (PORTx_ADDRESS(pin) |= _BV((pin) & 0xF)) |
160 | #define writePinLow(pin) (PIN_ADDRESS(pin, 2) &= ~_BV((pin) & 0xF)) | 159 | #define writePinLow(pin) (PORTx_ADDRESS(pin) &= ~_BV((pin) & 0xF)) |
161 | #define writePin(pin, level) ((level) ? writePinHigh(pin) : writePinLow(pin)) | 160 | #define writePin(pin, level) ((level) ? writePinHigh(pin) : writePinLow(pin)) |
162 | 161 | ||
163 | #define readPin(pin) ((bool)(PIN_ADDRESS(pin, 0) & _BV((pin) & 0xF))) | 162 | #define readPin(pin) ((bool)(PINx_ADDRESS(pin) & _BV((pin) & 0xF))) |
164 | #elif defined(PROTOCOL_CHIBIOS) | 163 | #elif defined(PROTOCOL_CHIBIOS) |
165 | typedef ioline_t pin_t; | 164 | typedef ioline_t pin_t; |
166 | 165 | ||