aboutsummaryrefslogtreecommitdiff
path: root/quantum/quantum.h
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2020-11-28 12:02:18 -0800
committerGitHub <noreply@github.com>2020-11-28 12:02:18 -0800
commitc66df1664497546f32662409778731143e45a552 (patch)
treeda73a2d532a27685a31d932b3a44a707d4a3af81 /quantum/quantum.h
parent15385d4113414d42bd062c60c9de5df797d3157f (diff)
downloadqmk_firmware-c66df1664497546f32662409778731143e45a552.tar.gz
qmk_firmware-c66df1664497546f32662409778731143e45a552.zip
2020 November 28 Breaking Changes Update (#11053)
* Branch point for 2020 November 28 Breaking Change * Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183) * Add support for soft serial to ATmega32U2 (#10204) * Change MIDI velocity implementation to allow direct control of velocity value (#9940) * Add ability to build a subset of all keyboards based on platform. * Actually use eeprom_driver_init(). * Make bootloader_jump weak for ChibiOS. (#10417) * Joystick 16-bit support (#10439) * Per-encoder resolutions (#10259) * Share button state from mousekey to pointing_device (#10179) * Add hotfix for chibios keyboards not wake (#10088) * Add advanced/efficient RGB Matrix Indicators (#8564) * Naming change. * Support for STM32 GPIOF,G,H,I,J,K (#10206) * Add milc as a dependency and remove the installed milc (#10563) * ChibiOS upgrade: early init conversions (#10214) * ChibiOS upgrade: configuration file migrator (#9952) * Haptic and solenoid cleanup (#9700) * XD75 cleanup (#10524) * OLED display update interval support (#10388) * Add definition based on currently-selected serial driver. (#10716) * New feature: Retro Tapping per key (#10622) * Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638) * Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530) * Rescale both ChibiOS and AVR backlighting. * Reduce Helix keyboard build variation (#8669) * Minor change to behavior allowing display updates to continue between task ticks (#10750) * Some GPIO manipulations in matrix.c change to atomic. (#10491) * qmk cformat (#10767) * [Keyboard] Update the Speedo firmware for v3.0 (#10657) * Maartenwut/Maarten namechange to evyd13/Evy (#10274) * [quantum] combine repeated lines of code (#10837) * Add step sequencer feature (#9703) * aeboards/ext65 refactor (#10820) * Refactor xelus/dawn60 for Rev2 later (#10584) * add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824) * [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549) * update chibios os usb for the otg driver (#8893) * Remove HD44780 References, Part 4 (#10735) * [Keyboard] Add Valor FRL TKL (+refactor) (#10512) * Fix cursor position bug in oled_write_raw functions (#10800) * Fixup version.h writing when using SKIP_VERSION=yes (#10972) * Allow for certain code in the codebase assuming length of string. (#10974) * Add AT90USB support for serial.c (#10706) * Auto shift: support repeats and early registration (#9826) * Rename ledmatrix.h to match .c file (#7949) * Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231) * Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840) * Merge point for 2020 Nov 28 Breaking Change
Diffstat (limited to 'quantum/quantum.h')
-rw-r--r--quantum/quantum.h62
1 files changed, 61 insertions, 1 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 0e452a062..cb0af306a 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -31,7 +31,7 @@
31 31
32#ifdef BACKLIGHT_ENABLE 32#ifdef BACKLIGHT_ENABLE
33# ifdef LED_MATRIX_ENABLE 33# ifdef LED_MATRIX_ENABLE
34# include "ledmatrix.h" 34# include "led_matrix.h"
35# else 35# else
36# include "backlight.h" 36# include "backlight.h"
37# endif 37# endif
@@ -68,6 +68,11 @@ extern layer_state_t default_layer_state;
68extern layer_state_t layer_state; 68extern layer_state_t layer_state;
69#endif 69#endif
70 70
71#if defined(SEQUENCER_ENABLE)
72# include "sequencer.h"
73# include "process_sequencer.h"
74#endif
75
71#if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED) 76#if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)
72# include "process_midi.h" 77# include "process_midi.h"
73#endif 78#endif
@@ -220,6 +225,61 @@ typedef ioline_t pin_t;
220# define togglePin(pin) palToggleLine(pin) 225# define togglePin(pin) palToggleLine(pin)
221#endif 226#endif
222 227
228// Atomic macro to help make GPIO and other controls atomic.
229#ifdef IGNORE_ATOMIC_BLOCK
230/* do nothing atomic macro */
231# define ATOMIC_BLOCK for (uint8_t __ToDo = 1; __ToDo; __ToDo = 0)
232# define ATOMIC_BLOCK_RESTORESTATE ATOMIC_BLOCK
233# define ATOMIC_BLOCK_FORCEON ATOMIC_BLOCK
234
235#elif defined(__AVR__)
236/* atomic macro for AVR */
237# include <util/atomic.h>
238
239# define ATOMIC_BLOCK_RESTORESTATE ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
240# define ATOMIC_BLOCK_FORCEON ATOMIC_BLOCK(ATOMIC_FORCEON)
241
242#elif defined(PROTOCOL_CHIBIOS) || defined(PROTOCOL_ARM_ATSAM)
243/* atomic macro for ChibiOS / ARM ATSAM */
244# if defined(PROTOCOL_ARM_ATSAM)
245# include "arm_atsam_protocol.h"
246# endif
247
248static __inline__ uint8_t __interrupt_disable__(void) {
249# if defined(PROTOCOL_CHIBIOS)
250 chSysLock();
251# endif
252# if defined(PROTOCOL_ARM_ATSAM)
253 __disable_irq();
254# endif
255 return 1;
256}
257
258static __inline__ void __interrupt_enable__(const uint8_t *__s) {
259# if defined(PROTOCOL_CHIBIOS)
260 chSysUnlock();
261# endif
262# if defined(PROTOCOL_ARM_ATSAM)
263 __enable_irq();
264# endif
265 __asm__ volatile("" ::: "memory");
266 (void)__s;
267}
268
269# define ATOMIC_BLOCK(type) for (type, __ToDo = __interrupt_disable__(); __ToDo; __ToDo = 0)
270# define ATOMIC_FORCEON uint8_t sreg_save __attribute__((__cleanup__(__interrupt_enable__))) = 0
271
272# define ATOMIC_BLOCK_RESTORESTATE _Static_assert(0, "ATOMIC_BLOCK_RESTORESTATE dose not implement")
273# define ATOMIC_BLOCK_FORCEON ATOMIC_BLOCK(ATOMIC_FORCEON)
274
275/* Other platform */
276#else
277
278# define ATOMIC_BLOCK_RESTORESTATE _Static_assert(0, "ATOMIC_BLOCK_RESTORESTATE dose not implement")
279# define ATOMIC_BLOCK_FORCEON _Static_assert(0, "ATOMIC_BLOCK_FORCEON dose not implement")
280
281#endif
282
223#define SEND_STRING(string) send_string_P(PSTR(string)) 283#define SEND_STRING(string) send_string_P(PSTR(string))
224#define SEND_STRING_DELAY(string, interval) send_string_with_delay_P(PSTR(string), interval) 284#define SEND_STRING_DELAY(string, interval) send_string_with_delay_P(PSTR(string), interval)
225 285