diff --git a/components/badge23/captouch.c b/components/badge23/captouch.c index 976c18a7f9a9381c1aedcdc3056dc446901fa7d7..96082e60ac2605e6f3130ce47d06c7374304e064 100644 --- a/components/badge23/captouch.c +++ b/components/badge23/captouch.c @@ -24,8 +24,6 @@ static const uint8_t top_map[] = {0, 0, 0, 2, 2, 2, 6, 6, 6, 4, 4, 4}; static const uint8_t top_stages = 12; static const uint8_t bot_map[] = {1, 1, 3, 3, 5, 7, 7, 9, 9, 8, 8, 8}; static const uint8_t bot_stages = 12; -static const uint8_t top_segment_map[] = {1,3,2,2,3,1,1,3,2,1,3,2}; //PETAL_PAD_* -static const uint8_t bot_segment_map[] = {3,0,3,0,0,0,3,0,3,1,2,3}; //PETAL_PAD_* static const uint8_t bot_stage_config[] = {0,1,2,3,5,6,7,8,9,10,11,12}; #define DEFAULT_THRES_TOP 8000 #define DEFAULT_THRES_BOT 12000 @@ -50,9 +48,13 @@ static const uint8_t bot_stage_config[] = {0,1,2,3,4,5,6,7,8,9,10,11}; #if defined(CONFIG_BADGE23_HW_GEN_P4) #define AD7147_ADDR_TOP 0b101100 #define AD7147_ADDR_BOT 0b101101 +static const uint8_t top_segment_map[] = {1,3,2,2,3,1,1,3,2,1,3,2}; //PETAL_PAD_* +static const uint8_t bot_segment_map[] = {3,0,3,0,0,0,3,0,3,1,2,3}; //PETAL_PAD_* #elif defined(CONFIG_BADGE23_HW_GEN_P3) #define AD7147_ADDR_TOP 0b101101 #define AD7147_ADDR_BOT 0b101100 +static const uint8_t top_segment_map[] = {0,1,2, 2,1,0, 0,1,2, 2,1,0}; //PETAL_PAD_* +static const uint8_t bot_segment_map[] = {3,0,3,0,0,0,3,0,3, 0,2,1}; //PETAL_PAD_* #endif static const char *TAG = "captouch";