~ruther/qmk_firmware

7014e1efa31d16fa30b796e2c13671c506223c33 — QMK Bot 3 years ago c5dc4b4 + c834608
Merge remote-tracking branch 'origin/master' into develop
2 files changed, 3 insertions(+), 1 deletions(-)

M keyboards/aurora65/config.h
M keyboards/loki65/config.h
M keyboards/aurora65/config.h => keyboards/aurora65/config.h +1 -0
@@ 39,6 39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
#define WS2812_DMA_CHANNEL 5
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB

#define RGB_DI_PIN B15
#define RGBLED_NUM 36

M keyboards/loki65/config.h => keyboards/loki65/config.h +2 -1
@@ 44,7 44,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_CHANNEL 2
#define WS2812_PWM_PAL_MODE 2
#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
#define WS2812_DMA_CHANNEL 5  
#define WS2812_DMA_CHANNEL 5
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB

#define RGB_DI_PIN A9
#define RGBLED_NUM 37