Remerge 0.16.x' into firmware21

keyboards/ergodox_ez/config.h

@@ -200,6 +200,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+
 //#define DEBUG_MATRIX_SCAN_RATE

keyboards/ergodox_ez/matrix.c

@@ -76,7 +76,7 @@ void matrix_init_custom(void) {
 // Reads and stores a row, returning
 // whether a change occurred.
 static inline bool store_raw_matrix_row(uint8_t index) {
-    matrix_row_t temp = read_cols(index);
+    matrix_row_t temp = 0x3F & read_cols(index);
     if (raw_matrix[index] != temp) {
         raw_matrix[index] = temp;
         return true;

keyboards/ergodox_ez/rules.mk

@@ -36,3 +36,5 @@ MOUSE_SHARED_EP = no
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
+
+MOUSE_SHARED_EP = no