diff options
| -rw-r--r-- | keyboards/infinity60/keymaps/jpetermans/keymap.c | 1 | ||||
| -rw-r--r-- | keyboards/infinity60/led_controller.c | 32 | ||||
| -rw-r--r-- | keyboards/infinity60/led_controller.h | 3 | ||||
| -rw-r--r-- | keyboards/infinity60/rules.mk | 2 | 
4 files changed, 10 insertions, 28 deletions
| diff --git a/keyboards/infinity60/keymaps/jpetermans/keymap.c b/keyboards/infinity60/keymaps/jpetermans/keymap.c index cc4633b1b4..59249ff728 100644 --- a/keyboards/infinity60/keymaps/jpetermans/keymap.c +++ b/keyboards/infinity60/keymaps/jpetermans/keymap.c @@ -247,7 +247,6 @@ bool process_record_user (uint16_t keycode, keyrecord_t *record) {  // Runs just one time when the keyboard initializes.  void matrix_init_user(void) { -    xprintf("init start");      led_controller_init(); diff --git a/keyboards/infinity60/led_controller.c b/keyboards/infinity60/led_controller.c index 5c177d26b0..21f95a9c12 100644 --- a/keyboards/infinity60/led_controller.c +++ b/keyboards/infinity60/led_controller.c @@ -135,7 +135,6 @@ msg_t is31_read_register(uint8_t page, uint8_t reg, uint8_t *result) {   * initialise the IS31 chip   * ======================== */  void is31_init(void) { -      xprintf("_is31_init\n");    // just to be sure that it's all zeroes    __builtin_memset(full_page,0,0xB4+1);    // zero function page, all registers (assuming full_page is all zeroes) @@ -200,41 +199,33 @@ static THD_FUNCTION(LEDthread, arg) {      msg_args[1] = (msg >> 16) & 0XFF;      msg_args[2] = (msg >> 24) & 0xFF; -      xprintf("msg_type: %d-%d-%d\n", msg_type, msg_args[0], msg_args[1]);      switch (msg_type){        case SET_FULL_ROW: -      xprintf("FULL ROW: %d-%d\n", msg_args[0], msg_args[1]);        //write full byte to pin address, msg_args[1] = pin #, msg_args[0] = 8 bits to write        //writes only to currently displayed page          write_led_byte(page_status, msg_args[1], msg_args[0]);          break;        case OFF_LED: -      xprintf("OFF: %d-%d\n", msg_args[0], msg_args[1]);        //on/off/toggle single led, msg_args[0] = row/col of led, msg_args[1] = page          set_led_bit(msg_args[1], control_register_word, msg_args[0], 0);          break;        case ON_LED: -      xprintf("ON: %d-%d\n", msg_args[0], msg_args[1]);          set_led_bit(msg_args[1], control_register_word, msg_args[0], 1);          break;        case TOGGLE_LED: -      xprintf("TOGGLE: %d-%d\n", msg_args[0], msg_args[1]);          set_led_bit(msg_args[1], control_register_word, msg_args[0], 2);          break;        case BLINK_OFF_LED: -      xprintf("B_on: %d-%d\n", msg_args[0], msg_args[1]);        //on/off/toggle single led, msg_args[0] = row/col of led          set_led_bit(msg_args[1], control_register_word, msg_args[0], 4);          break;        case BLINK_ON_LED: -      xprintf("B_off: %d-%d\n", msg_args[0], msg_args[1]);          set_led_bit(msg_args[1], control_register_word, msg_args[0], 5);          break;        case BLINK_TOGGLE_LED: -      xprintf("B_togg: %d-%d\n", msg_args[0], msg_args[1]);          set_led_bit(msg_args[1], control_register_word, msg_args[0], 6);          break; @@ -244,12 +235,10 @@ static THD_FUNCTION(LEDthread, arg) {          chThdSleepMilliseconds(5);          is31_read_register(0, 0x00, &temp);          is31_write_register(IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF); -      xprintf("TOGGLE_ALL: %d-%d\n", msg_args[0], msg_args[1]); -      xprintf("temp: %d\n", temp);          led_control_reg[0] = 0; -        //if first leds are already on, toggle frame 0 off +        //toggle led mask based on current state (temp)          if (temp==0 || page_status > 0) {            __builtin_memcpy(led_control_reg+1, all_on_leds_mask, 0x12);          } else { @@ -262,13 +251,14 @@ static THD_FUNCTION(LEDthread, arg) {            page_status=0; -          //maintain lock leds +          //maintain lock leds, reset to off and force recheck to blink of all leds toggled on +          numlock_status = 0; +          capslock_status = 0;            led_set(host_keyboard_leds());          }          break;        case TOGGLE_BACKLIGHT: -      xprintf("TOGGLE_BKLT: %d-%d\n", msg_args[0], msg_args[1]);          //msg_args[0] = on/off          //populate 9 byte rows to be written to each pin, first byte is register (pin) address @@ -287,12 +277,13 @@ static THD_FUNCTION(LEDthread, arg) {        case DISPLAY_PAGE:        //msg_args[0] = page to toggle on -      xprintf("DSPY_PG: %d-%d\n", msg_args[0], msg_args[1]);          if (page_status != msg_args[0]) {            is31_write_register(IS31_FUNCTIONREG, IS31_REG_PICTDISP, msg_args[0]);            page_status = msg_args[0]; -          //maintain lock leds +          //maintain lock leds, reset to off and force recheck for new page +          numlock_status = 0; +          capslock_status = 0;            led_set(host_keyboard_leds());          }          break; @@ -309,7 +300,6 @@ static THD_FUNCTION(LEDthread, arg) {          break;        case TOGGLE_NUM_LOCK: -      xprintf("NMLK: %d-%d\n", msg_args[0], msg_args[1]);        //msg_args[0] = 0 or 1, off/on          if (numlock_status != msg_args[0]) {            set_lock_leds(NUM_LOCK_LED_ADDRESS, msg_args[0], page_status); @@ -317,7 +307,6 @@ static THD_FUNCTION(LEDthread, arg) {          }          break;        case TOGGLE_CAPS_LOCK: -      xprintf("CPLK: %d-%d\n", msg_args[0], msg_args[1]);        //msg_args[0] = 0 or 1, off/on          if (capslock_status != msg_args[0]) {            set_lock_leds(CAPS_LOCK_LED_ADDRESS, msg_args[0], page_status); @@ -326,7 +315,6 @@ static THD_FUNCTION(LEDthread, arg) {          break;        case STEP_BRIGHTNESS: -      xprintf("Step: %d-%d\n", msg_args[0], msg_args[1]);        //led_args[0] = step up (1) or down (0)          switch (msg_args[0]) {            case 0: @@ -373,7 +361,6 @@ void set_led_bit (uint8_t page, uint8_t *led_control_word, uint8_t led_addr, uin    if (led_addr < 0 || led_addr > 87 || led_addr % 10 > 8) {      return;    } -      xprintf("_set action-led: %x-%d\n", action, led_addr);    blink_bit = action>>2;//check for blink bit    action &= ~(1<<2); //strip blink bit @@ -381,17 +368,14 @@ void set_led_bit (uint8_t page, uint8_t *led_control_word, uint8_t led_addr, uin    //led_addr tens column is pin#, ones column is bit position in 8-bit mask    control_reg_addr = ((led_addr / 10) % 10 - 1 ) * 0x02;// A-matrix is every other byte    control_reg_addr += blink_bit == 1 ? 0x12 : 0x00;//if blink_bit, shift 12 bytes to blink register -      xprintf("_set control address: %x\n", control_reg_addr);    is31_write_register(IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_ON);    chThdSleepMilliseconds(5);    is31_read_register(page, control_reg_addr, &temp);//maintain status of leds on this byte    is31_write_register(IS31_FUNCTIONREG, IS31_REG_SHUTDOWN, IS31_REG_SHUTDOWN_OFF); -      xprintf("_set temp_byte_mask: %x\n", temp);    column_bit = 1<<(led_addr % 10 - 1);    column_byte = temp; -      xprintf("_set col_byte_mask: %x\n", column_byte);    switch(action) {      case 0: @@ -451,7 +435,6 @@ void set_lock_leds(uint8_t led_addr, uint8_t led_action, uint8_t page) {        led_action |= (1<<2); //set blink bit      }    } -      xprintf("_lock action: %d\n", led_action);    set_led_bit(page,led_control_word,led_addr,led_action);  } @@ -462,7 +445,6 @@ void set_lock_leds(uint8_t led_addr, uint8_t led_action, uint8_t page) {  void led_controller_init(void) {    uint8_t i; -      xprintf("led_init\n");    /* initialise I2C */    /* I2C pins */    palSetPadMode(GPIOB, 0, PAL_MODE_ALTERNATIVE_2); // PTB0/I2C0/SCL diff --git a/keyboards/infinity60/led_controller.h b/keyboards/infinity60/led_controller.h index 457b21a925..eb6060f260 100644 --- a/keyboards/infinity60/led_controller.h +++ b/keyboards/infinity60/led_controller.h @@ -75,7 +75,8 @@ void led_controller_init(void);  // D2:D0 extinguish time (3.5ms*2^i)  #define IS31_REG_SHUTDOWN 0x0A -#define IS31_REG_SHUTDOWN_ON 0x1 +#define IS31_REG_SHUTDOWN_OFF 0x1 +#define IS31_REG_SHUTDOWN_ON 0x0  #define IS31_REG_AGCCTRL 0x0B  #define IS31_REG_ADCRATE 0x0C diff --git a/keyboards/infinity60/rules.mk b/keyboards/infinity60/rules.mk index f58bb26420..c19f62401d 100644 --- a/keyboards/infinity60/rules.mk +++ b/keyboards/infinity60/rules.mk @@ -56,7 +56,7 @@ OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000  # Build Options  #   comment out to disable the options.  # -BOOTMAGIC_ENABLE ?= yes	# Virtual DIP switch configuration +BOOTMAGIC_ENABLE ?= no	# Virtual DIP switch configuration  ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)  MOUSEKEY_ENABLE ?= yes	# Mouse keys  EXTRAKEY_ENABLE ?= yes	# Audio control and System control | 
