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

This commit is contained in:
QMK Bot 2020-12-16 03:27:52 +00:00
commit 2e0f2025bd
81 changed files with 108 additions and 291 deletions

View file

@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "hal.h"
#include <hal.h>
#include "led.h"

View file

@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "ch.h"
#include "hal.h"
#include <ch.h>
#include <hal.h>
/*
* scan matrix

View file

@ -14,7 +14,7 @@
limitations under the License.
*/
#include "hal.h"
#include <hal.h>
/**
* @brief PAL setup.

View file

@ -9,7 +9,7 @@
#include <inttypes.h>
#include <compat/twi.h>
#include <i2cmaster.h>
#include "i2cmaster.h"
/* define CPU frequency in Hz here if not defined in Makefile */
#ifndef F_CPU

View file

@ -1,7 +1,7 @@
#include "62key.h"
#include "rgblight.h"
#include <keymap_colemak.h>
#include <sendstring_colemak.h>
#include "keymap_colemak.h"
#include "sendstring_colemak.h"
// Automatic Layer ID:

View file

@ -1,7 +1,7 @@
#ifndef PROMETHIUM_H
#define PROMETHIUM_H
#include "stdint.h"
#include <stdint.h>
void battery_poll(uint8_t level);
void led_set_kb(uint8_t usb_led);