Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Run clang-format manually to fix recently changed files

Browse source
This commit is contained in:
zvecr 2019-11-17 14:02:26 +00:00 committed by Drashna Jaelre
parent 6b18ca2875
commit a91c0c4765
24 changed files with 235 additions and 235 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/haptic/DRV2605L.c
View file

@ -116,14 +116,12 @@ void DRV_init(void) {
void DRV_rtp_init(void) {
DRV_write(DRV_GO, 0x00);
DRV_write(DRV_RTP_INPUT, 20); //20 is the lowest value I've found where haptics can still be felt.
DRV_write(DRV_RTP_INPUT, 20); // 20 is the lowest value I've found where haptics can still be felt.
DRV_write(DRV_MODE, 0x05);
DRV_write(DRV_GO, 0x01);
}
void DRV_amplitude(uint8_t amplitude) {
DRV_write(DRV_RTP_INPUT, amplitude);
}
void DRV_amplitude(uint8_t amplitude) { DRV_write(DRV_RTP_INPUT, amplitude); }
void DRV_pulse(uint8_t sequence) {
DRV_write(DRV_GO, 0x00);

19
drivers/haptic/haptic.c
View file

@ -172,9 +172,9 @@ void haptic_set_amplitude(uint8_t amp) {
haptic_config.amplitude = amp;
eeconfig_update_haptic(haptic_config.raw);
xprintf("haptic_config.amplitude = %u\n", haptic_config.amplitude);
#ifdef DRV2605L
#ifdef DRV2605L
DRV_amplitude(amp);
#endif
#endif
}
void haptic_set_buzz(uint8_t buzz) {
@ -214,23 +214,23 @@ void haptic_enable_continuous(void) {
haptic_config.cont = 1;
xprintf("haptic_config.cont = %u\n", haptic_config.cont);
eeconfig_update_haptic(haptic_config.raw);
#ifdef DRV2605L
#ifdef DRV2605L
DRV_rtp_init();
#endif
#endif
}
void haptic_disable_continuous(void) {
haptic_config.cont = 0;
xprintf("haptic_config.cont = %u\n", haptic_config.cont);
eeconfig_update_haptic(haptic_config.raw);
#ifdef DRV2605L
DRV_write(DRV_MODE,0x00);
#endif
#ifdef DRV2605L
DRV_write(DRV_MODE, 0x00);
#endif
}
void haptic_toggle_continuous(void) {
#ifdef DRV2605L
if (haptic_config.cont) {
if (haptic_config.cont) {
haptic_disable_continuous();
} else {
haptic_enable_continuous();
@ -239,7 +239,6 @@ if (haptic_config.cont) {
#endif
}
void haptic_cont_increase(void) {
uint8_t amp = haptic_config.amplitude + 10;
if (haptic_config.amplitude >= 120) {
@ -256,7 +255,6 @@ void haptic_cont_decrease(void) {
haptic_set_amplitude(amp);
}
void haptic_play(void) {
#ifdef DRV2605L
uint8_t play_eff = 0;
@ -269,7 +267,6 @@ void haptic_play(void) {
}
bool process_haptic(uint16_t keycode, keyrecord_t *record) {
if (keycode == HPT_ON && record->event.pressed) {
haptic_enable();
}

16
drivers/haptic/haptic.h
View file

@ -34,14 +34,14 @@
typedef union {
uint32_t raw;
struct {
bool enable :1;
uint8_t feedback :2;
uint8_t mode :7;
bool buzz :1;
uint8_t dwell :7;
bool cont :1;
uint8_t amplitude :8;
uint16_t reserved :7;
bool enable : 1;
uint8_t feedback : 2;
uint8_t mode : 7;
bool buzz : 1;
uint8_t dwell : 7;
bool cont : 1;
uint8_t amplitude : 8;
uint16_t reserved : 7;
};
} haptic_config_t;

7
quantum/config_common.h
View file

@ -306,11 +306,12 @@
# elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__))
# define SERIAL_UART_BAUD 115200
# define SERIAL_UART_DATA UDR1
/* UBRR should result in ~16 and set UCSR1A = _BV(U2X1) as per rn42 documentation. HC05 needs baudrate configured accordingly */
/* UBRR should result in ~16 and set UCSR1A = _BV(U2X1) as per rn42 documentation. HC05 needs baudrate configured accordingly */
# define SERIAL_UART_UBRR (F_CPU / (8UL * SERIAL_UART_BAUD) - 1)
# define SERIAL_UART_RXD_VECT USART1_RX_vect
# define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1))
# define SERIAL_UART_INIT() do { \
# define SERIAL_UART_INIT() \
do { \
UCSR1A = _BV(U2X1); \
/* baud rate */ \
UBRR1L = SERIAL_UART_UBRR; \
@ -321,7 +322,7 @@
/* 8-bit data */ \
UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \
sei(); \
} while(0)
} while (0)
# else
# error "USART configuration is needed."
# endif

21
quantum/dip_switch.c
View file

@ -21,28 +21,22 @@
// for memcpy
#include <string.h>
#if !defined(DIP_SWITCH_PINS)
# error "No DIP switch pads defined by DIP_SWITCH_PINS"
#endif
#define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad)/sizeof(pin_t))
#define NUMBER_OF_DIP_SWITCHES (sizeof(dip_switch_pad) / sizeof(pin_t))
static pin_t dip_switch_pad[] = DIP_SWITCH_PINS;
static bool dip_switch_state[NUMBER_OF_DIP_SWITCHES] = { 0 };
static bool last_dip_switch_state[NUMBER_OF_DIP_SWITCHES] = { 0 };
static bool dip_switch_state[NUMBER_OF_DIP_SWITCHES] = {0};
static bool last_dip_switch_state[NUMBER_OF_DIP_SWITCHES] = {0};
__attribute__((weak)) void dip_switch_update_user(uint8_t index, bool active) {}
__attribute__((weak))
void dip_switch_update_user(uint8_t index, bool active) {}
__attribute__((weak)) void dip_switch_update_kb(uint8_t index, bool active) { dip_switch_update_user(index, active); }
__attribute__((weak))
void dip_switch_update_kb(uint8_t index, bool active) { dip_switch_update_user(index, active); }
__attribute__((weak)) void dip_switch_update_mask_user(uint32_t state) {}
__attribute__((weak))
void dip_switch_update_mask_user(uint32_t state) {}
__attribute__((weak))
void dip_switch_update_mask_kb(uint32_t state) { dip_switch_update_mask_user(state); }
__attribute__((weak)) void dip_switch_update_mask_kb(uint32_t state) { dip_switch_update_mask_user(state); }
void dip_switch_init(void) {
for (uint8_t i = 0; i < NUMBER_OF_DIP_SWITCHES; i++) {
@ -51,7 +45,6 @@ void dip_switch_init(void) {
dip_switch_read(true);
}
void dip_switch_read(bool forced) {
bool has_dip_state_changed = false;
uint32_t dip_switch_mask = 0;

2
quantum/keymap_extras/keymap_italian_osx_ansi.h
View file

@ -104,7 +104,7 @@
#define IT_RBRC LALT(IT_PLUS) // ]
#define IT_AT LALT(IT_OACC) // @
#define IT_EURO LALT(KC_E) // €
#define IT_SHRP LALT(IT_AACC ) // #
#define IT_SHRP LALT(IT_AACC) // #
#define IT_ACUT LALT(KC_8) // ´
#define IT_GRAVE LALT(KC_9) // `
#define IT_TILDE LALT(KC_5) // ~

4
quantum/keymap_extras/keymap_italian_osx_iso.h
View file

@ -65,7 +65,7 @@
#define IT_COMM KC_COMM // , and ;
#define IT_APOS KC_MINS // ' and ?
#define IT_BSLS KC_GRV // \ and |
#define IT_LESS KC_NUBS// < and >
#define IT_LESS KC_NUBS // < and >
#define IT_MINS KC_SLSH // - and _
// accented vowels (regular, with shift, with option, with option and shift)
@ -104,7 +104,7 @@
#define IT_RBRC LALT(IT_PLUS) // ]
#define IT_AT LALT(IT_OACC) // @
#define IT_EURO LALT(KC_E) // €
#define IT_SHRP LALT(IT_AACC ) // #
#define IT_SHRP LALT(IT_AACC) // #
#define IT_ACUT LALT(KC_8) // ´
#define IT_GRAVE LALT(KC_9) // `
#define IT_TILDE LALT(KC_5) // ~

6
quantum/process_keycode/process_tap_dance.h
View file

@ -63,10 +63,10 @@ typedef struct {
{ .fn = {qk_tap_dance_pair_on_each_tap, qk_tap_dance_pair_finished, qk_tap_dance_pair_reset}, .user_data = (void *)&((qk_tap_dance_pair_t){kc1, kc2}), }
# define ACTION_TAP_DANCE_DUAL_ROLE(kc, layer) \
{ .fn = { qk_tap_dance_dual_role_on_each_tap, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset }, .user_data = (void *)&((qk_tap_dance_dual_role_t) { kc, layer, layer_move }), }
{ .fn = {qk_tap_dance_dual_role_on_each_tap, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset}, .user_data = (void *)&((qk_tap_dance_dual_role_t){kc, layer, layer_move}), }
# define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer) \
{ .fn = { NULL, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset }, .user_data = (void *)&((qk_tap_dance_dual_role_t) { kc, layer, layer_invert }), }
{ .fn = {NULL, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset}, .user_data = (void *)&((qk_tap_dance_dual_role_t){kc, layer, layer_invert}), }
# define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) ACTION_TAP_DANCE_DUAL_ROLE(kc, layer)
@ -79,8 +79,6 @@ typedef struct {
# define ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term) \
{ .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset}, .user_data = NULL, .custom_tapping_term = tap_specific_tapping_term, }
extern qk_tap_dance_action_t tap_dance_actions[];
/* To be used internally */

2
quantum/quantum.c
View file

@ -1116,7 +1116,7 @@ __attribute__((weak)) void led_set(uint8_t usb_led) {
#endif
led_set_kb(usb_led);
led_update_kb((led_t) usb_led);
led_update_kb((led_t)usb_led);
}
//------------------------------------------------------------------------------

5
quantum/quantum.h
View file

@ -146,14 +146,13 @@ extern layer_state_t layer_state;
#endif
#ifdef DIP_SWITCH_ENABLE
#include "dip_switch.h"
# include "dip_switch.h"
#endif
#ifdef DYNAMIC_MACRO_ENABLE
#include "process_dynamic_macro.h"
# include "process_dynamic_macro.h"
#endif
// Function substitutions to ease GPIO manipulation
#if defined(__AVR__)
typedef uint8_t pin_t;

33
quantum/stm32/chconf.h
View file

@ -420,33 +420,38 @@
* the threads creation APIs.
*/
# define CH_CFG_THREAD_INIT_HOOK(tp) \
{ /* Add threads initialization code here.*/ }
{ /* Add threads initialization code here.*/ \
}
/**
* @brief Threads finalization hook.
* @details User finalization code added to the @p chThdExit() API.
*/
# define CH_CFG_THREAD_EXIT_HOOK(tp) \
{ /* Add threads finalization code here.*/ }
{ /* Add threads finalization code here.*/ \
}
/**
* @brief Context switch hook.
* @details This hook is invoked just before switching between threads.
*/
# define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) \
{ /* Context switch code here.*/ }
{ /* Context switch code here.*/ \
}
/**
* @brief ISR enter hook.
*/
# define CH_CFG_IRQ_PROLOGUE_HOOK() \
{ /* IRQ prologue code here.*/ }
{ /* IRQ prologue code here.*/ \
}
/**
* @brief ISR exit hook.
*/
# define CH_CFG_IRQ_EPILOGUE_HOOK() \
{ /* IRQ epilogue code here.*/ }
{ /* IRQ epilogue code here.*/ \
}
/**
* @brief Idle thread enter hook.
@ -455,7 +460,8 @@
* @note This macro can be used to activate a power saving mode.
*/
# define CH_CFG_IDLE_ENTER_HOOK() \
{ /* Idle-enter code here.*/ }
{ /* Idle-enter code here.*/ \
}
/**
* @brief Idle thread leave hook.
@ -464,14 +470,16 @@
* @note This macro can be used to deactivate a power saving mode.
*/
# define CH_CFG_IDLE_LEAVE_HOOK() \
{ /* Idle-leave code here.*/ }
{ /* Idle-leave code here.*/ \
}
/**
* @brief Idle Loop hook.
* @details This hook is continuously invoked by the idle thread loop.
*/
# define CH_CFG_IDLE_LOOP_HOOK() \
{ /* Idle loop code here.*/ }
{ /* Idle loop code here.*/ \
}
/**
* @brief System tick event hook.
@ -479,7 +487,8 @@
* after processing the virtual timers queue.
*/
# define CH_CFG_SYSTEM_TICK_HOOK() \
{ /* System tick event code here.*/ }
{ /* System tick event code here.*/ \
}
/**
* @brief System halt hook.
@ -487,7 +496,8 @@
* the system is halted.
*/
# define CH_CFG_SYSTEM_HALT_HOOK(reason) \
{ /* System halt code here.*/ }
{ /* System halt code here.*/ \
}
/**
* @brief Trace hook.
@ -495,7 +505,8 @@
* trace buffer.
*/
# define CH_CFG_TRACE_HOOK(tep) \
{ /* Trace code here.*/ }
{ /* Trace code here.*/ \
}
/** @} */

3
tmk_core/common/arm_atsam/suspend.c
View file

@ -7,7 +7,8 @@
*
* FIXME: needs doc
*/
void suspend_idle(uint8_t time) { /* Note: Not used anywhere currently */ }
void suspend_idle(uint8_t time) { /* Note: Not used anywhere currently */
}
/** \brief Run user level Power down
*

4
tmk_core/common/eeconfig.c
View file

@ -51,10 +51,10 @@ void eeconfig_init_quantum(void) {
// TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS
// within the emulated eeprom via dfu-util or another tool
#if defined INIT_EE_HANDS_LEFT
#pragma message "Faking EE_HANDS for left hand"
# pragma message "Faking EE_HANDS for left hand"
eeprom_update_byte(EECONFIG_HANDEDNESS, 1);
#elif defined INIT_EE_HANDS_RIGHT
#pragma message "Faking EE_HANDS for right hand"
# pragma message "Faking EE_HANDS for right hand"
eeprom_update_byte(EECONFIG_HANDEDNESS, 0);
#endif

2
tmk_core/common/host.c
View file

@ -41,7 +41,7 @@ uint8_t host_keyboard_leds(void) {
}
led_t host_keyboard_led_state(void) {
if (!driver) return (led_t) {0};
if (!driver) return (led_t){0};
return (led_t)((*driver->keyboard_leds)());
}

3
tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
View file

@ -186,7 +186,8 @@ COMPILER_PACK_RESET()
#define USB_HID_COUNTRY_UK 32 // UK
#define USB_HID_COUNTRY_US 33 // US
#define USB_HID_COUNTRY_YUGOSLAVIA 34 // Yugoslavia
#define USB_HID_COUNTRY_TURKISH_F 35 // Turkish-F
#define USB_HID_COUNTRY_TURKISH_F \
35 // Turkish-F
//! @}
//! @}
//! @}

3
tmk_core/protocol/iwrap/iwrap.c
View file

@ -320,7 +320,8 @@ static void send_mouse(report_mouse_t *report) {
#endif
}
static void send_system(uint16_t data) { /* not supported */ }
static void send_system(uint16_t data) { /* not supported */
}
static void send_consumer(uint16_t data) {
#ifdef EXTRAKEY_ENABLE

4
tmk_core/protocol/lufa/adafruit_ble.cpp
View file

@ -31,9 +31,9 @@
#define ConnectionUpdateInterval 1000 /* milliseconds */
#ifdef SAMPLE_BATTERY
#ifndef BATTERY_LEVEL_PIN
# ifndef BATTERY_LEVEL_PIN
# define BATTERY_LEVEL_PIN 7
#endif
# endif
#endif
static struct {