Added debouncing

Author: Galzai

README.md

@@ -18,7 +18,6 @@ Please refer to the [MK32 Wiki page](https://github.com/Galzai/MK32/wiki) for in
 
 ## To-do:
 - Plugin API support (in progress).
-- Proper debouncing (Temporerly using delays).
 - More than 2 pads (currently supports 2 pads).
 - Connection switching.
 - Modify keymap via webserver (in progress) .

components/r_encoder/r_encoder.c

@@ -164,10 +164,9 @@ void r_encoder_setup(void){
 #endif
 
 }
-
 //Check encoder state, currently defined for Vol +/= and mute
 uint8_t r_encoder_state(void){
-	uint8_t EncoderState=0x00;
+	uint8_t EncoderState = 0x00;
 	int16_t EncoderCount;
 	pcnt_get_counter_value(PCNT_UNIT_0, &EncoderCount);
 	if(EncoderCount>PastEncoderCount){

main/keyboard_config.h

@@ -22,6 +22,8 @@
 #define SPLIT_MASTER	 // undefine if keyboard is not split and master
 //#define SLAVE	 // undefine if keyboard is master
 
+#define DEBOUNCE 5 //debounce time in ms
+
 //Define matrix
 #define KEYPADS 2 // intended in order to create a Multiple keypad split boards
 #define MATRIX_ROWS 4

main/matrix.c

@@ -37,13 +37,22 @@ const gpio_num_t MATRIX_COLS_PINS[]={GPIO_NUM_13,GPIO_NUM_14,GPIO_NUM_15,GPIO_NU
 
 // matrix states
 uint8_t MATRIX_STATE[MATRIX_ROWS][MATRIX_COLS]={0};
+uint8_t PREV_MATRIX_STATE[MATRIX_ROWS][MATRIX_COLS]={0};
 uint8_t SLAVE_MATRIX_STATE[MATRIX_ROWS][MATRIX_COLS]={0};
 
+
+uint32_t lastDebounceTime = 0;
+
 uint8_t (*matrix_states[])[MATRIX_ROWS][MATRIX_COLS]={
 		 &MATRIX_STATE,
 		 &SLAVE_MATRIX_STATE,
 };
 
+//used for debouncing
+static uint32_t millis() {
+    return esp_timer_get_time() / 1000;
+}
+
 // deinitializing rtc matrix pins on  deep sleep wake up
 void rtc_matrix_deinit(void){
 
@@ -147,7 +156,8 @@ void matrix_setup(void){
 #endif
 }
 
-
+uint8_t curState = 0;
+uint32_t DEBOUNCE_MATRIX[MATRIX_ROWS][MATRIX_COLS]={0};
 // Scanning the matrix for input
 void scan_matrix(void){
 #ifdef COL2ROW
@@ -156,11 +166,20 @@ void scan_matrix(void){
 		gpio_set_level(MATRIX_COLS_PINS[col], 1);
 		for(uint8_t row=0; row <MATRIX_ROWS; row++){
 
-			MATRIX_STATE[row][col]=gpio_get_level(MATRIX_ROWS_PINS[row]) ;
-		}
-		gpio_set_level(MATRIX_COLS_PINS[col], 0);
+			curState = gpio_get_level(MATRIX_ROWS_PINS[row]) ;
+			if( PREV_MATRIX_STATE[row][col] != curState){
+				DEBOUNCE_MATRIX[row][col] = millis();
+			}
+			PREV_MATRIX_STATE[row][col] = curState;
+			if( (millis() - DEBOUNCE_MATRIX[row][col])  > DEBOUNCE){
 
+				if( MATRIX_STATE[row][col] != curState){
+					MATRIX_STATE[row][col] = curState ;
+				}
 
+			}
+		}
+		gpio_set_level(MATRIX_COLS_PINS[col], 0);
 	}
 
 
@@ -171,13 +190,26 @@ void scan_matrix(void){
 		gpio_set_level(MATRIX_ROWS_PINS[row], 0);
 
 		for(uint8_t col=0; col <MATRIX_COLS; col++){
-			MATRIX_STATE[row][col]=gpio_get_level(MATRIX_COLS_PINS[col]) ;
+
+			curState = gpio_get_level(MATRIX_ROWS_PINS[row]) ;
+			if( PREV_MATRIX_STATE[row][col] != curState){
+				DEBOUNCE_MATRIX[row][col] = millis();
+			}
+			PREV_MATRIX_STATE[row][col] = curState;
+			if( (millis() - DEBOUNCE_MATRIX[row][col])  > DEBOUNCE){
+
+				if( MATRIX_STATE[row][col] != curState){
+					MATRIX_STATE[row][col] = curState ;
+				}
+
+			}
 		}
 		gpio_set_level(MATRIX_ROWS_PINS[row], 0);
 	}
 #endif
 
 
+
 }
 
 #endif

main/mk32_main.cpp

@@ -123,7 +123,7 @@ extern "C" void key_reports(void *pvParameters)
 				DEEP_SLEEP = false;
 				memcpy(past_report,report_state, sizeof past_report );
 				xQueueSend(keyboard_q,(void*)&report_state, (TickType_t) 0);
-				vTaskDelay(15/portTICK_PERIOD_MS);
+				//vTaskDelay(5/portTICK_PERIOD_MS);
 			}
 
 	}
@@ -174,7 +174,7 @@ extern "C" void slave_scan(void *pvParameters){
 			memcpy(&PAST_MATRIX, &MATRIX_STATE, sizeof MATRIX_STATE );
 
 			xQueueSend(espnow_matrix_send_q,(void*)&MATRIX_STATE, (TickType_t) 0);
-			vTaskDelay(15/portTICK_PERIOD_MS);
+			//vTaskDelay(5/portTICK_PERIOD_MS);
 		}
 	}
 }