Fix LED configuration for PS2AVRGB boards (#7989)

* Fix LED configuration for PS2AVRGB boards

* Undo backlight on state changes
This commit is contained in:
fauxpark 2020-01-24 14:24:10 +11:00 committed by James Young
parent fe50883c15
commit b568999769
38 changed files with 71 additions and 102 deletions

View File

@ -24,12 +24,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -39,6 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_PIN D4 #define BACKLIGHT_PIN D4
#define BACKLIGHT_LEVELS 3 #define BACKLIGHT_LEVELS 3
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_ANIMATIONS
#define NO_UART 1 #define NO_UART 1

View File

@ -24,12 +24,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -39,6 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_PIN D4 #define BACKLIGHT_PIN D4
#define BACKLIGHT_LEVELS 3 #define BACKLIGHT_LEVELS 3
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_ANIMATIONS
#define NO_UART 1 #define NO_UART 1

View File

@ -41,4 +41,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_PIN D4 #define BACKLIGHT_PIN D4
#define BACKLIGHT_LEVELS 3 #define BACKLIGHT_LEVELS 3

View File

@ -24,14 +24,12 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D0);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D0, !led_state.num_lock); writePin(D0, led_state.num_lock);
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -39,4 +39,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_PIN D4 #define BACKLIGHT_PIN D4
#define BACKLIGHT_LEVELS 3 #define BACKLIGHT_LEVELS 3
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_ANIMATIONS

View File

@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -41,6 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_PIN D4 #define BACKLIGHT_PIN D4
#define BACKLIGHT_LEVELS 3 #define BACKLIGHT_LEVELS 3
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_ANIMATIONS
#define NO_UART 1 #define NO_UART 1

View File

@ -25,16 +25,13 @@ void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
setPinOutput(D1); setPinOutput(D1);
setPinOutput(D6); setPinOutput(D6);
writePinHigh(D0);
writePinHigh(D1);
writePinHigh(D6);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D0, !led_state.num_lock); writePin(D0, led_state.num_lock);
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
writePin(D6, !led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;
} }

View File

@ -39,4 +39,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_PIN D4 #define BACKLIGHT_PIN D4
#define BACKLIGHT_LEVELS 3 #define BACKLIGHT_LEVELS 3
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_ANIMATIONS

View File

@ -25,13 +25,12 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D0);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D0, led_state.num_lock);
writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -40,6 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_PIN D4 #define BACKLIGHT_PIN D4
#define BACKLIGHT_LEVELS 3 #define BACKLIGHT_LEVELS 3
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_ANIMATIONS
#define NO_UART 1 #define NO_UART 1

View File

@ -24,14 +24,12 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
setPinOutput(D6); setPinOutput(D6);
writePinHigh(D1);
writePinHigh(D6);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
writePin(D6, !led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;
} }

View File

@ -33,3 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 5 #define RGBLED_NUM 5
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_ANIMATIONS
#define BACKLIGHT_PIN D4
#define BACKLIGHT_LEVELS 3

View File

@ -27,16 +27,13 @@ void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
setPinOutput(D1); setPinOutput(D1);
setPinOutput(D6); setPinOutput(D6);
writePinHigh(D0);
writePinHigh(D1);
writePinHigh(D6);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D0, !led_state.num_lock); writePin(D0, led_state.num_lock);
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
writePin(D6, !led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;
} }

View File

@ -16,10 +16,21 @@
#include "j80.h" #include "j80.h"
void keyboard_pre_init_kb(void) {
led_init_ports();
keyboard_pre_init_user();
}
void led_init_ports(void) {
setPinOutput(D0);
setPinOutput(D1);
setPinOutput(D6);
}
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, led_state.caps_lock);
writePin(D0, led_state.num_lock); writePin(D0, led_state.num_lock);
writePin(D1, led_state.caps_lock);
writePin(D6, led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;

View File

@ -24,12 +24,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
writePinHigh(D0);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D0, !led_state.num_lock); writePin(D0, led_state.num_lock);
} }
return true; return true;
} }

View File

@ -25,14 +25,12 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D0);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D0, !led_state.num_lock); writePin(D0, led_state.num_lock);
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -26,16 +26,13 @@ void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
setPinOutput(D1); setPinOutput(D1);
setPinOutput(D6); setPinOutput(D6);
writePinHigh(D0);
writePinHigh(D1);
writePinHigh(D6);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D0, !led_state.num_lock); writePin(D0, led_state.num_lock);
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
writePin(D6, !led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;
} }

View File

@ -24,12 +24,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -27,14 +27,12 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
setPinOutput(D6); setPinOutput(D6);
writePinHigh(D1);
writePinHigh(D6);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
writePin(D6, !led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;
} }

View File

@ -24,14 +24,12 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
setPinOutput(D6); setPinOutput(D6);
writePinHigh(D1);
writePinHigh(D6);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
writePin(D6, !led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;
} }

View File

@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -26,16 +26,13 @@ void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
setPinOutput(D1); setPinOutput(D1);
setPinOutput(D6); setPinOutput(D6);
writePinHigh(D0);
writePinHigh(D1);
writePinHigh(D6);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D0, !led_state.num_lock); writePin(D0, led_state.num_lock);
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
writePin(D6, !led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;
} }

View File

@ -24,14 +24,12 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
setPinOutput(D6); setPinOutput(D6);
writePinHigh(D1);
writePinHigh(D6);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
writePin(D6, !led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;
} }

View File

@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -25,16 +25,13 @@ void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
setPinOutput(D1); setPinOutput(D1);
setPinOutput(D6); setPinOutput(D6);
writePinHigh(D0);
writePinHigh(D1);
writePinHigh(D6);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D0, !led_state.num_lock); writePin(D0, led_state.num_lock);
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
writePin(D6, !led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;
} }

View File

@ -26,16 +26,13 @@ void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
setPinOutput(D1); setPinOutput(D1);
setPinOutput(D6); setPinOutput(D6);
writePinHigh(D0);
writePinHigh(D1);
writePinHigh(D6);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D0, !led_state.num_lock); writePin(D0, led_state.num_lock);
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
writePin(D6, !led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;
} }

View File

@ -26,16 +26,13 @@ void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
setPinOutput(D1); setPinOutput(D1);
setPinOutput(D6); setPinOutput(D6);
writePinHigh(D0);
writePinHigh(D1);
writePinHigh(D6);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D0, !led_state.num_lock); writePin(D0, led_state.num_lock);
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
writePin(D6, !led_state.scroll_lock); writePin(D6, led_state.scroll_lock);
} }
return true; return true;
} }

View File

@ -24,12 +24,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -26,14 +26,12 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D0);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D0, !led_state.num_lock); writePin(D0, led_state.num_lock);
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -23,12 +23,11 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D1); setPinOutput(D1);
writePinHigh(D1);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) { if (led_update_user(led_state)) {
writePin(D1, !led_state.caps_lock); writePin(D1, led_state.caps_lock);
} }
return true; return true;
} }

View File

@ -25,7 +25,6 @@ void keyboard_pre_init_kb(void) {
void led_init_ports(void) { void led_init_ports(void) {
setPinOutput(D0); setPinOutput(D0);
writePinHigh(D0);
} }
bool led_update_kb(led_t led_state) { bool led_update_kb(led_t led_state) {