added tweaks to filter

main/keypad.h

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #ifndef _KEYPAD_H
 #define _KEYPAD_H
 
@@ -21,28 +20,4 @@ typedef enum
 void keypad_start(void);
 QueueHandle_t keypad_getQueue(void);
 
-=======
-#ifndef _KEYPAD_H
-#define _KEYPAD_H
-
-#include "freertos/FreeRTOS.h"
-#include "freertos/queue.h"
-
-typedef enum 
-{
-    KEY0 = 	(1 << 0),
-    KEY1 = 	(1 << 1),
-} keycode_t;
-
-
-#define KEY_SHORT_PRESS	0
-#define KEY_LONG_PRESS	4
-
-#define KEY_UP      KEY0
-#define KEY_DOWN    KEY1
-
-void keypad_start(void);
-QueueHandle_t keypad_getQueue(void);
-
->>>>>>> 4feb4c0a98bddb1f2a172ea4b195ce31ba18d442
 #endif