mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-12 12:51:18 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
3d8aa1aade
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#ifdef OLED_ENABLE
|
||||
|
||||
void render_logo(void);
|
||||
|
@ -14,4 +14,6 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
void render_bongocat(void);
|
||||
|
@ -15,4 +15,6 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
void render_layer_status(void);
|
||||
|
@ -15,4 +15,6 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
void render_logo(void);
|
||||
|
@ -7,6 +7,8 @@
|
||||
* With this disgusting bodge, you can just edit your .defs and compile!
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
// Clear all X Macros
|
||||
#define PRES BLANK
|
||||
#define KEYS BLANK
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include "engine.h"
|
||||
|
||||
// Configuration options for the engine
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// Keymap helpers
|
||||
// define reference layers per layer.
|
||||
#define REF_LAYER_FOR_LAYER(LAYER, REF_LAYER) \
|
||||
|
@ -6,6 +6,9 @@
|
||||
* using a external generator (Like is done for the ASETNIOP base keymaps)
|
||||
* With this disgusting bodge, you can just edit your .defs and compile!
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "g/engine.h"
|
||||
|
||||
// Clear all X Macros
|
||||
|
@ -14,4 +14,6 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
void render_logo(void);
|
||||
|
@ -15,6 +15,8 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
extern const unsigned char font[] PROGMEM;
|
||||
|
||||
#define ROW_1 OLED_DISPLAY_WIDTH
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
typedef enum taphold_mode_t {
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#define COLOR_BLANK 0, 0, 0
|
||||
|
||||
#define COLOR_BLACK 0, 0, 0
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
void rgbsps_set(uint8_t index, uint8_t r, uint8_t g, uint8_t b);
|
||||
void rgbsps_setall(uint8_t r, uint8_t g, uint8_t b);
|
||||
void rgbsps_turnoff(void);
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
// list of OUTPUT(row) ports
|
||||
#define MATRIX_OUT_PORTS (Port_D, MCU_GPIO, D0), (Port_C, MCU_GPIO, C0), (Port_E, MCU_GPIO, E0), (Port_B, MCU_GPIO, B0)
|
||||
// list of OUTPUT(row) pins
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#define MATRIX_EXTENSION_74HC157 B2
|
||||
// #define MATRIX_EXTENSION_74HC153 B2, B6
|
||||
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#if defined(__AVR__)
|
||||
/* -------------------- AVR (Pro Micro) ----------------------- */
|
||||
|
||||
|
@ -1,8 +1,5 @@
|
||||
#ifndef SUART
|
||||
#define SUART
|
||||
#pragma once
|
||||
|
||||
void xmit(uint8_t);
|
||||
uint8_t rcvr(void);
|
||||
uint8_t recv(void);
|
||||
|
||||
#endif /* SUART */
|
||||
|
@ -14,4 +14,6 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
void render_bongocat(void);
|
||||
|
@ -14,4 +14,6 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
void render_galaxy(void);
|
||||
|
@ -14,4 +14,6 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
void render_logo(void);
|
||||
|
@ -14,4 +14,6 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
void render_bongocat(void);
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
#include "action.h"
|
||||
|
||||
|
@ -1,3 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#ifdef OLED_ENABLE
|
||||
|
||||
#include <stdint.h>
|
||||
|
@ -14,6 +14,8 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
#ifndef VIA_ENABLE
|
||||
|
@ -14,6 +14,8 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
enum layer_names {
|
||||
|
Loading…
Reference in New Issue
Block a user