aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/jj4x4/jj4x4.c
diff options
context:
space:
mode:
authorzvecr <git@zvecr.com>2019-04-08 19:35:47 +0100
committerDrashna Jaelre <drashna@live.com>2019-04-08 11:35:47 -0700
commitda9bb590551e4e40552f301852074dffccd2c29d (patch)
tree5d8fd5838f6e2060b7cf66619b40a8f8d5533413 /keyboards/jj4x4/jj4x4.c
parent15d7c5f0bdfff97d5d7af6d474cc57d66b6bba94 (diff)
downloadfirmware-da9bb590551e4e40552f301852074dffccd2c29d.tar.gz
firmware-da9bb590551e4e40552f301852074dffccd2c29d.tar.bz2
firmware-da9bb590551e4e40552f301852074dffccd2c29d.zip
[Keyboard] Refactor jj4x4 to current standards (#5567)
* Refactor 4x4 in line with current ps2avrgb template * Add backlight pwm bodge till #4324 lands * Disable bootmagic lite as it seems to not work on atmega32a/bootloadHID
Diffstat (limited to 'keyboards/jj4x4/jj4x4.c')
-rw-r--r--keyboards/jj4x4/jj4x4.c61
1 files changed, 10 insertions, 51 deletions
diff --git a/keyboards/jj4x4/jj4x4.c b/keyboards/jj4x4/jj4x4.c
index 6fbff7afb..265508b2d 100644
--- a/keyboards/jj4x4/jj4x4.c
+++ b/keyboards/jj4x4/jj4x4.c
@@ -18,53 +18,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "jj4x4.h"
-#include <avr/pgmspace.h>
-
-#include "action_layer.h"
-#include "quantum.h"
+#ifdef RGBLIGHT_ENABLE
-#include "i2c.h"
+#include <string.h>
+#include "i2c_master.h"
+#include "rgblight.h"
-#include "backlight.h"
-#include "backlight_custom.h"
+extern rgblight_config_t rgblight_config;
-// for keyboard subdirectory level init functions
-// @Override
void matrix_init_kb(void) {
+ i2c_init();
// call user level keymaps, if any
matrix_init_user();
}
-
-#ifdef BACKLIGHT_ENABLE
-/// Overrides functions in `quantum.c`
-void backlight_init_ports(void) {
- b_led_init_ports();
-}
-
-void backlight_task(void) {
- b_led_task();
-}
-
-void backlight_set(uint8_t level) {
- b_led_set(level);
-}
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-extern rgblight_config_t rgblight_config;
-
// custom RGB driver
void rgblight_set(void) {
if (!rgblight_config.enable) {
- for (uint8_t i=0; i<RGBLED_NUM; i++) {
- led[i].r = 0;
- led[i].g = 0;
- led[i].b = 0;
- }
+ memset(led, 0, 3 * RGBLED_NUM);
}
- i2c_init();
- i2c_send(0xb0, (uint8_t*)led, 3 * RGBLED_NUM);
+ i2c_transmit(0xb0, (uint8_t*)led, 3 * RGBLED_NUM, 100);
}
bool rgb_init = false;
@@ -72,26 +45,12 @@ bool rgb_init = false;
void matrix_scan_kb(void) {
// if LEDs were previously on before poweroff, turn them back on
if (rgb_init == false && rgblight_config.enable) {
- i2c_init();
- i2c_send(0xb0, (uint8_t*)led, 3 * RGBLED_NUM);
+ i2c_transmit(0xb0, (uint8_t*)led, 3 * RGBLED_NUM, 100);
rgb_init = true;
}
rgblight_task();
-#else
-void matrix_scan_kb(void) {
-#endif
matrix_scan_user();
- /* Nothing else for now. */
-}
-
-__attribute__((weak)) // overridable
-void matrix_init_user(void) {
-
}
-
-__attribute__((weak)) // overridable
-void matrix_scan_user(void) {
-
-}
+#endif