p6: initial support. mostly working, shoulder button layout bork'd, easy fix tho

components/badge23/Kconfig

@@ -28,5 +28,10 @@ menu "Badge23 Config"
                 Visual identifiers:
                   - Sticker with B5xx (xx being arbitrary digits) on the back
             bool "Prototype 5 / ADI-less"
+        config BADGE23_HW_GEN_P6
+            help
+                Prototype version 6, a.k.a. proto6
+                  - Sticker with B6xx (xx being arbitrary digits) on the back
+            bool "Prototype 5 / ADI-less"
     endchoice
 endmenu

components/badge23/audio.c

@@ -60,7 +60,7 @@ float audio_speaker_get_maximum_volume_dB(){ return speaker_maximum_volume_user_
 uint8_t audio_headphones_get_mute(){ return headphones_mute ? 1 : 0; }
 uint8_t audio_speaker_get_mute(){ return speaker_mute ? 1 : 0; }
 
-#if defined(CONFIG_BADGE23_HW_GEN_P3) || defined(CONFIG_BADGE23_HW_GEN_P4)
+#if defined(CONFIG_BADGE23_HW_GEN_P3) || defined(CONFIG_BADGE23_HW_GEN_P4) || defined(CONFIG_BADGE23_HW_GEN_P6)
 
 static uint8_t max98091_i2c_read(const uint8_t reg)
 {

components/badge23/captouch.c

@@ -20,7 +20,7 @@
 
 #define AFE_INCR_CAP 1000
 
-#if defined(CONFIG_BADGE23_HW_GEN_P3) || defined(CONFIG_BADGE23_HW_GEN_P4)
+#if defined(CONFIG_BADGE23_HW_GEN_P3) || defined(CONFIG_BADGE23_HW_GEN_P4) || defined(CONFIG_BADGE23_HW_GEN_P6)
 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};
@@ -51,6 +51,11 @@ static const uint8_t bot_stage_config[] = {0,1,2,3,4,5,6,7,8,9,10,11};
 #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_P6)
+#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

components/badge23/espan.c

@@ -23,7 +23,7 @@ static const char *TAG = "espan";
 #define I2C_MASTER_TX_BUF_DISABLE   0                          /*!< I2C master doesn't need buffer */
 #define I2C_MASTER_RX_BUF_DISABLE   0                          /*!< I2C master doesn't need buffer */
 
-#if defined(CONFIG_BADGE23_HW_GEN_P3) || defined(CONFIG_BADGE23_HW_GEN_P4)
+#if defined(CONFIG_BADGE23_HW_GEN_P3) || defined(CONFIG_BADGE23_HW_GEN_P4) || defined(CONFIG_BADGE23_HW_GEN_P6)
 #define CONFIG_I2C_MASTER_SDA 2
 #define CONFIG_I2C_MASTER_SCL 1
 

components/badge23/spio.c

@@ -28,12 +28,13 @@
 #define BADGE_LINK_LINE_OUT_TIP_ENABLE_PIN 5
 #define BADGE_LINK_LINE_OUT_RING_ENABLE_PIN 6
 #define BADGE_LINK_LINE_IN_TIP_ENABLE_PIN 3
-
 #define BADGE_LINK_LINE_IN_RING_ENABLE_PIN 4
+
 #define LEFT_BUTTON_RIGHT (0+8)
 #define RIGHT_BUTTON_LEFT (4+8)
 #define RIGHT_BUTTON_MID (7+8)
 #define RIGHT_BUTTON_RIGHT (5+8)
+
 #endif
 
 static int8_t leftbutton = 0;

components/badge23_hwconfig/badge23_hwconfig.c

@@ -8,6 +8,8 @@ const char *badge23_hw_name = "proto3";
 const char *badge23_hw_name = "proto4";
 #elif defined(CONFIG_BADGE23_HW_GEN_ADILESS)
 const char *badge23_hw_name = "adiless";
+#elif defined(CONFIG_BADGE23_HW_GEN_P6)
+const char *badge23_hw_name = "proto6";
 #else
 #error "Badge23 Hardware Generation must be set!"
 #endif

components/gc9a01/gc9a01.h

@@ -26,7 +26,7 @@
 #define GC9A01_PIN_NUM_RST 38
 #define GC9A01_BUFFER_MODE 1
 
-#elif defined(CONFIG_BADGE23_HW_GEN_P3) || defined(CONFIG_BADGE23_HW_GEN_P4)
+#elif defined(CONFIG_BADGE23_HW_GEN_P3) || defined(CONFIG_BADGE23_HW_GEN_P4) || defined(CONFIG_BADGE23_HW_GEN_P6)
 #define USE_SPI3_HOST 1
 #define GC9A01_SPI_HOST 2
 #define GC9A01_PIN_NUM_SCK 41

idf_ext.py

@@ -18,6 +18,7 @@ def action_extensions(base_actions, project_path=os.getcwd()):
         'p3': ['proto3'],
         'p4': ['proto4'],
         'p5': ['adi-less'],
+        'p6': ['proto6'],
     }
 
     def generation_callback(ctx, global_args, tasks):

sdkconfig.p6

+CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y
+CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
+CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="micropython/ports/esp32/partitions-8MiB.csv"
+CONFIG_COMPILER_OPTIMIZATION_PERF=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_MAX_CONNECTIONS=4
+CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=y
+CONFIG_PM_ENABLE=y
+CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
+# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
+# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
+# CONFIG_ESP32_WIFI_IRAM_OPT is not set
+# CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set
+CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=2
+CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP=y
+CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y
+CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
+CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
+CONFIG_LWIP_PPP_SUPPORT=y
+CONFIG_LWIP_PPP_PAP_SUPPORT=y
+CONFIG_LWIP_PPP_CHAP_SUPPORT=y
+CONFIG_BADGE23_HW_GEN_P6=y