summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/alps64/matrix.c2
-rw-r--r--keyboards/clueboard/Makefile39
-rw-r--r--keyboards/ergodox_ez/matrix.c3
-rw-r--r--keyboards/hhkb/matrix.c11
-rw-r--r--keyboards/planck/rev3/config.h2
-rw-r--r--keyboards/sixkeyboard/matrix.c2
6 files changed, 55 insertions, 4 deletions
diff --git a/keyboards/alps64/matrix.c b/keyboards/alps64/matrix.c
index 805999d4a1..b3508850de 100644
--- a/keyboards/alps64/matrix.c
+++ b/keyboards/alps64/matrix.c
@@ -100,6 +100,8 @@ uint8_t matrix_scan(void)
}
}
+ matrix_scan_quantum();
+
return 1;
}
diff --git a/keyboards/clueboard/Makefile b/keyboards/clueboard/Makefile
index d6f4bfcae6..ccc01ea9a7 100644
--- a/keyboards/clueboard/Makefile
+++ b/keyboards/clueboard/Makefile
@@ -1,3 +1,42 @@
+#----------------------------------------------------------------------------
+# On command line:
+#
+# make all = Make software.
+#
+# make clean = Clean out built project files.
+#
+# make coff = Convert ELF to AVR COFF.
+#
+# make extcoff = Convert ELF to AVR Extended COFF.
+#
+# make program = Download the hex file to the device.
+# Please customize your programmer settings(PROGRAM_CMD)
+#
+# make teensy = Download the hex file to the device, using teensy_loader_cli.
+# (must have teensy_loader_cli installed).
+#
+# make dfu = Download the hex file to the device, using dfu-programmer (must
+# have dfu-programmer installed).
+#
+# make flip = Download the hex file to the device, using Atmel FLIP (must
+# have Atmel FLIP installed).
+#
+# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
+# (must have dfu-programmer installed).
+#
+# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
+# (must have Atmel FLIP installed).
+#
+# make debug = Start either simulavr or avarice as specified for debugging,
+# with avr-gdb or avr-insight as the front end for debugging.
+#
+# make filename.s = Just compile filename.c into the assembler code only.
+#
+# make filename.i = Create a preprocessed source file for use in submitting
+# bug reports to the GCC project.
+#
+# To rebuild project do "make clean" then "make all".
+#----------------------------------------------------------------------------
SUBPROJECT_DEFAULT = rev2
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c
index e0de06c349..b87fddbad7 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox_ez/matrix.c
@@ -187,8 +187,7 @@ uint8_t matrix_scan(void)
}
}
-
- matrix_scan_kb();
+ matrix_scan_quantum();
return 1;
}
diff --git a/keyboards/hhkb/matrix.c b/keyboards/hhkb/matrix.c
index 2dfb2f5e1f..666b6f595f 100644
--- a/keyboards/hhkb/matrix.c
+++ b/keyboards/hhkb/matrix.c
@@ -71,6 +71,14 @@ void matrix_init(void)
matrix_prev = _matrix1;
}
+__attribute__ ((weak))
+void matrix_scan_user(void) {
+}
+
+void matrix_scan_kb(void) {
+ matrix_scan_user();
+}
+
uint8_t matrix_scan(void)
{
uint8_t *tmp;
@@ -150,6 +158,9 @@ uint8_t matrix_scan(void)
KEY_POWER_OFF();
suspend_power_down();
}
+
+ matrix_scan_quantum();
+
return 1;
}
diff --git a/keyboards/planck/rev3/config.h b/keyboards/planck/rev3/config.h
index fa50a5622c..cc37874e83 100644
--- a/keyboards/planck/rev3/config.h
+++ b/keyboards/planck/rev3/config.h
@@ -5,4 +5,4 @@
#define DEVICE_VER 0x0003
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c
index c279986487..ed1b70e286 100644
--- a/keyboards/sixkeyboard/matrix.c
+++ b/keyboards/sixkeyboard/matrix.c
@@ -87,7 +87,7 @@ uint8_t matrix_scan(void)
matrix[0] = (PINC&(1<<7) ? 0 : (1<<0)) | (PINB&(1<<7) ? 0 : (1<<1)) | (PINB&(1<<5) ? 0 : (1<<2));
matrix[1] = (PIND&(1<<6) ? 0 : (1<<0)) | (PIND&(1<<1) ? 0 : (1<<1)) | (PIND&(1<<4) ? 0 : (1<<2));
- matrix_scan_kb();
+ matrix_scan_quantum();
return 1;
}