Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2023-03-23 17:22:21 +00:00
commit 3d8aa1aade
25 changed files with 50 additions and 4 deletions

View File

@ -1,3 +1,5 @@
#pragma once
#ifdef OLED_ENABLE
void render_logo(void);

View File

@ -14,4 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
void render_bongocat(void);

View File

@ -15,4 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
void render_layer_status(void);

View File

@ -15,4 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
void render_logo(void);

View File

@ -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

View File

@ -1,3 +1,5 @@
#pragma once
#include "engine.h"
// Configuration options for the engine

View File

@ -1,3 +1,5 @@
#pragma once
// Keymap helpers
// define reference layers per layer.
#define REF_LAYER_FOR_LAYER(LAYER, REF_LAYER) \

View File

@ -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

View File

@ -14,4 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
void render_logo(void);

View File

@ -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

View File

@ -1,3 +1,5 @@
#pragma once
#include "quantum.h"
typedef enum taphold_mode_t {

View File

@ -1,3 +1,5 @@
#pragma once
#define COLOR_BLANK 0, 0, 0
#define COLOR_BLACK 0, 0, 0

View File

@ -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);

View File

@ -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

View File

@ -1,3 +1,5 @@
#pragma once
#define MATRIX_EXTENSION_74HC157 B2
// #define MATRIX_EXTENSION_74HC153 B2, B6

View File

@ -1,3 +1,5 @@
#pragma once
#if defined(__AVR__)
/* -------------------- AVR (Pro Micro) ----------------------- */

View File

@ -1,8 +1,5 @@
#ifndef SUART
#define SUART
#pragma once
void xmit(uint8_t);
uint8_t rcvr(void);
uint8_t recv(void);
#endif /* SUART */

View File

@ -14,4 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
void render_bongocat(void);

View File

@ -14,4 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
void render_galaxy(void);

View File

@ -14,4 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
void render_logo(void);

View File

@ -14,4 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
void render_bongocat(void);

View File

@ -1,3 +1,5 @@
#pragma once
#include <stdint.h>
#include "action.h"

View File

@ -1,3 +1,5 @@
#pragma once
#ifdef OLED_ENABLE
#include <stdint.h>

View File

@ -14,6 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
#ifndef VIA_ENABLE

View File

@ -14,6 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
enum layer_names {