gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-06 16:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

test end. remove test code. Revert "dipsw test on helix/rev2/sc/back:five_rows"

Browse Source 
This reverts commit 4b13ebb996.
This commit is contained in:
mtei 2020-04-08 19:01:17 +09:00
parent 7bc8d033bc
commit 582cea6e1d
3 changed files with 0 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keyboards/helix/rev2/keymaps/five_rows/config.h
View File

@ -27,9 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* when TAPPING_TERM >= 500 same effect PERMISSIVE_HOLD. /* when TAPPING_TERM >= 500 same effect PERMISSIVE_HOLD.
see tmk_core/common/action_tapping.c */ see tmk_core/common/action_tapping.c */
//#define DIP_SWITCH_PINS { B5, B6 }
#define DIP_SWITCH_PINS { B5, B6, B5, B6 }
// place overrides here // place overrides here
// If you need more program area, try select and reduce rgblight modes to use. // If you need more program area, try select and reduce rgblight modes to use.

90
keyboards/helix/rev2/keymaps/five_rows/keymap.c
View File

@ -1,5 +1,4 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include <avr/pgmspace.h>
#include "bootloader.h" #include "bootloader.h"
#ifdef PROTOCOL_LUFA #ifdef PROTOCOL_LUFA
#include "lufa.h" #include "lufa.h"
@ -14,7 +13,6 @@
#ifdef CONSOLE_ENABLE #ifdef CONSOLE_ENABLE
#include <print.h> #include <print.h>
#endif #endif
#include "timer.h"
extern keymap_config_t keymap_config; extern keymap_config_t keymap_config;
@ -334,14 +332,8 @@ uint32_t default_layer_state_set_kb(uint32_t state) {
return state; return state;
} }
void dump_pbuf(void);
void update_base_layer(int base) void update_base_layer(int base)
{ {
uprintf("layer\n");
dump_pbuf();
dip_switch_read(true);
uprintf("call dip_switch_read(true)\n");
dump_pbuf();
if( current_default_layer != base ) { if( current_default_layer != base ) {
eeconfig_update_default_layer(1UL<<base); eeconfig_update_default_layer(1UL<<base);
default_layer_set(1UL<<base); default_layer_set(1UL<<base);
@ -480,16 +472,6 @@ void music_scale_user(void)
#endif #endif
#if 0
static uint16_t scancount = 0;
void matrix_scan_user(void) {
if( USB_DeviceState == DEVICE_STATE_Configured ) {
if( scancount < 10 )
uprintf("usb on scan=%d\n", scancount);
scancount += 1;
}
}
#endif
//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h //SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
#ifdef SSD1306OLED #ifdef SSD1306OLED
@ -613,75 +595,3 @@ void iota_gfx_task_user(void) {
} }
#endif #endif
typedef struct _pr {
const char * PROGMEM fmt;
uint8_t arg1;
uint8_t arg2;
uint16_t timer;
} printbuf_t;
uint8_t pbuf_count = 0;
bool pbuf_overflow = false;
printbuf_t pbuf[16] = {0};
void dump_pbuf(void) {
#ifdef CONSOLE_ENABLE
if( pbuf_count > 0 ) {
uprintf(" dump_pbuf %d\n", pbuf_count);
for( uint8_t i = 0; i < pbuf_count; i++ ) {
uprintf(" %06d : ", pbuf[i].timer);
__xprintf(pbuf[i].fmt, pbuf[i].arg1, pbuf[i].arg2);
}
pbuf_count = 0;
if( pbuf_overflow ) {
uprintf(" pbuf overflow \n");
pbuf_overflow = false;
}
}
#endif
}
void dip_switch_update_user(uint8_t index, bool active) {
if( pbuf_count < sizeof(pbuf)/sizeof(pbuf[0]) ) {
pbuf[pbuf_count].fmt = PSTR("dip_switch_update_user(%d,%d)\n");
pbuf[pbuf_count].arg1 = index;
pbuf[pbuf_count].arg2 = active;
pbuf[pbuf_count].timer = timer_read();
pbuf_count++;
} else {
pbuf_overflow = true;
}
}
void dip_switch_update_mask_user(uint32_t state) {
if( pbuf_count < sizeof(pbuf)/sizeof(pbuf[0]) ) {
pbuf[pbuf_count].fmt = PSTR("dip_switch_update_mask_user(0b%b)\n");
pbuf[pbuf_count].arg1 = state;
pbuf[pbuf_count].timer = timer_read();
pbuf_count++;
} else {
pbuf_overflow = true;
}
}
void keyboard_pre_init_user(void)
{
if( pbuf_count < sizeof(pbuf)/sizeof(pbuf[0]) ) {
pbuf[pbuf_count].fmt = PSTR("keyboard_pre_init_user()\n");
pbuf[pbuf_count].timer = timer_read();
pbuf_count++;
} else {
pbuf_overflow = true;
}
}
void keyboard_post_init_user(void)
{
if( pbuf_count < sizeof(pbuf)/sizeof(pbuf[0]) ) {
pbuf[pbuf_count].fmt = PSTR("keyboard_post_init_user()\n");
pbuf[pbuf_count].timer = timer_read();
pbuf_count++;
} else {
pbuf_overflow = true;
}
}

3
keyboards/helix/rev2/keymaps/five_rows/rules.mk
View File

@ -30,9 +30,6 @@ ifneq ($(strip $(HELIX)),)
endif endif
endif endif
CONSOLE_ENABLE = yes
DIP_SWITCH_ENABLE = yes
# convert Helix-specific options (that represent combinations of standard options) # convert Helix-specific options (that represent combinations of standard options)
# into QMK standard options. # into QMK standard options.
include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))