ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2023-03-12 10:24:16 +00:00
commit b74f2c7b86
4 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
keyboards/annepro2/annepro2.c
View file

@ -101,11 +101,9 @@ void keyboard_post_init_kb(void) {
// loop to clear out receive buffer from ble wakeup // loop to clear out receive buffer from ble wakeup
while (!sdGetWouldBlock(&SD1)) sdGet(&SD1); while (!sdGetWouldBlock(&SD1)) sdGet(&SD1);
ap2_led_get_status();
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
ap2_led_enable();
ap2_led_set_manual_control(1); ap2_led_set_manual_control(1);
ap2_led_enable();
#endif #endif
keyboard_post_init_user(); keyboard_post_init_user();

2
keyboards/annepro2/ap2_led.c
View file

@ -60,8 +60,6 @@ void ap2_led_enable(void) { proto_tx(CMD_LED_ON, NULL, 0, 3); }
void ap2_led_set_profile(uint8_t prof) { proto_tx(CMD_LED_SET_PROFILE, &prof, sizeof(prof), 3); } void ap2_led_set_profile(uint8_t prof) { proto_tx(CMD_LED_SET_PROFILE, &prof, sizeof(prof), 3); }
void ap2_led_get_status(void) { proto_tx(CMD_LED_GET_STATUS, NULL, 0, 3); }
void ap2_led_next_profile(void) { proto_tx(CMD_LED_NEXT_PROFILE, NULL, 0, 3); } void ap2_led_next_profile(void) { proto_tx(CMD_LED_NEXT_PROFILE, NULL, 0, 3); }
void ap2_led_next_intensity(void) { proto_tx(CMD_LED_NEXT_INTENSITY, NULL, 0, 3); } void ap2_led_next_intensity(void) { proto_tx(CMD_LED_NEXT_INTENSITY, NULL, 0, 3); }

1
keyboards/annepro2/ap2_led.h
View file

@ -49,7 +49,6 @@ void ap2_set_IAP(void);
void ap2_led_disable(void); void ap2_led_disable(void);
void ap2_led_enable(void); void ap2_led_enable(void);
void ap2_led_set_profile(uint8_t prof); void ap2_led_set_profile(uint8_t prof);
void ap2_led_get_status(void);
void ap2_led_next_profile(void); void ap2_led_next_profile(void);
void ap2_led_prev_profile(void); void ap2_led_prev_profile(void);
void ap2_led_next_intensity(void); void ap2_led_next_intensity(void);

2
keyboards/annepro2/protocol.h
View file

@ -36,7 +36,7 @@ enum {
CMD_LED_MASK_SET_MONO = 0x12, CMD_LED_MASK_SET_MONO = 0x12,
/* Reactive / status */ /* Reactive / status */
CMD_LED_GET_STATUS = 0x20, CMD_LED_GET_STATUS = 0x20, /* unused */
CMD_LED_KEY_BLINK = 0x21, CMD_LED_KEY_BLINK = 0x21,
CMD_LED_KEY_DOWN = 0x22, CMD_LED_KEY_DOWN = 0x22,
CMD_LED_KEY_UP = 0x23, /* TODO */ CMD_LED_KEY_UP = 0x23, /* TODO */