xwhatsit through hole: two bugfixes

diff --git a/keyboards/xwhatsit/ibm/3276_3278/through_hole/config.h b/keyboards/xwhatsit/ibm/3276_3278/through_hole/config.h
index 1f95598..9d82ca5 100644 (file)
--- a/keyboards/xwhatsit/ibm/3276_3278/through_hole/config.h
+++ b/keyboards/xwhatsit/ibm/3276_3278/through_hole/config.h
@@ -252,7 +252,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define BOOTMAGIC_LITE_COLUMN 0
 
 //#define CONTROLLER_IS_XWHATSIT_MODEL_F_OR_WCASS_MODEL_F
-#define CONTROLLER_IS_XWHATSIT_BEAMSPRING_REV_4
+//#define CONTROLLER_IS_XWHATSIT_BEAMSPRING_REV_4
+#define CONTROLLER_IS_THROUGHT_HOLE_BEAMSPRING
 
 #define CAPSENSE_KEYBOARD_SETTLE_TIME_US 8
 #define CAPSENSE_DAC_SETTLE_TIME_US 8

diff --git a/keyboards/xwhatsit/matrix.c b/keyboards/xwhatsit/matrix.c
index d670c6e..5e594fe 100644 (file)
--- a/keyboards/xwhatsit/matrix.c
+++ b/keyboards/xwhatsit/matrix.c
@@ -761,9 +761,10 @@ void matrix_print_stats(void)
 #endif
 
 void matrix_scan_raw(matrix_row_t current_matrix[]) {
-    uint8_t col, row, cal;
+    uint8_t col, row;
     memset(current_matrix, 0, sizeof(matrix_row_t) * MATRIX_ROWS);
     #if CAPSENSE_CAL_ENABLED
+    uint8_t cal;
     for (cal=0;cal<CAPSENSE_CAL_BINS;cal++) {
         dac_write_threshold(cal_thresholds[cal]);
         for (col=0;col<MATRIX_COLS;col++) {