Skip to content
Snippets Groups Projects
Commit 42b28396 authored by q3k's avatar q3k
Browse files

*: rename HW P6 to C23

Prototype 6 turned out to be the production board.

Also, retire p3/p4 builds.
parent b2e1eb84
No related branches found
No related tags found
No related merge requests found
...@@ -43,30 +43,12 @@ format: ...@@ -43,30 +43,12 @@ format:
- "bash tools/format.sh" - "bash tools/format.sh"
- "[ -z \"$(git status --porcelain)\" ] || (echo 'Differences found, please run tools/format.sh.' && git diff HEAD && exit 1)" - "[ -z \"$(git status --porcelain)\" ] || (echo 'Differences found, please run tools/format.sh.' && git diff HEAD && exit 1)"
build-p3: build:
stage: build stage: build
script: script:
- idf.py -g p3 build - idf.py -g c23 build
artifacts: artifacts:
expose_as: 'Proto 3 ELF' expose_as: 'C23 ELF'
paths: ['build/flow3r.elf']
expire_in: 5 hours
build-p4:
stage: build
script:
- idf.py -g p4 build
artifacts:
expose_as: 'Proto 4 ELF'
paths: ['build/flow3r.elf']
expire_in: 5 hours
build-p6:
stage: build
script:
- idf.py -g p6 build
artifacts:
expose_as: 'Proto 6 ELF'
paths: ['build/flow3r.elf'] paths: ['build/flow3r.elf']
expire_in: 5 hours expire_in: 5 hours
......
menu "Flow3r Config" menu "Flow3r Config"
choice FLOW3R_HW_GEN choice FLOW3R_HW_GEN
prompt "Badge23 Hardware Generation" prompt "Badge23 Hardware Generation"
default FLOW3R_HW_GEN_P4 default FLOW3R_HW_GEN_C23
config FLOW3R_HW_GEN_P3 config FLOW3R_HW_GEN_P3
help help
Prototype version 3, a.k.a. proto3 Prototype version 3, a.k.a. proto3
...@@ -16,12 +16,12 @@ menu "Flow3r Config" ...@@ -16,12 +16,12 @@ menu "Flow3r Config"
- Sticker with B4xx (xx being arbitrary digits) on the back - Sticker with B4xx (xx being arbitrary digits) on the back
select FLOW3R_ESP32S3 select FLOW3R_ESP32S3
bool "Prototype 4" bool "Prototype 4"
config FLOW3R_HW_GEN_P6 config FLOW3R_HW_GEN_C23
help help
Prototype version 6, a.k.a. proto6 As seen on CCCamp 2023.
- Sticker with B6xx (xx being arbitrary digits) on the back Previously known as prototype version 6, a.k.a. proto6.
select FLOW3R_ESP32S3 select FLOW3R_ESP32S3
bool "Prototype 6" bool "CCCamp 2023"
endchoice endchoice
config FLOW3R_ESP32S3 config FLOW3R_ESP32S3
......
...@@ -55,7 +55,7 @@ static const pad_mapping_t _map_bot[13] = { ...@@ -55,7 +55,7 @@ static const pad_mapping_t _map_bot[13] = {
static gpio_num_t _interrupt_gpio_top = GPIO_NUM_15; static gpio_num_t _interrupt_gpio_top = GPIO_NUM_15;
static gpio_num_t _interrupt_gpio_bot = GPIO_NUM_15; static gpio_num_t _interrupt_gpio_bot = GPIO_NUM_15;
static bool _interrupt_shared = true; static bool _interrupt_shared = true;
#elif defined(CONFIG_FLOW3R_HW_GEN_P4) || defined(CONFIG_FLOW3R_HW_GEN_P6) #elif defined(CONFIG_FLOW3R_HW_GEN_P4) || defined(CONFIG_FLOW3R_HW_GEN_C23)
static const pad_mapping_t _map_top[12] = { static const pad_mapping_t _map_top[12] = {
{ 0, petal_pad_ccw }, // 0 { 0, petal_pad_ccw }, // 0
{ 0, petal_pad_base }, // 1 { 0, petal_pad_base }, // 1
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
const char *flow3r_bsp_hw_name = "proto3"; const char *flow3r_bsp_hw_name = "proto3";
#elif defined(CONFIG_FLOW3R_HW_GEN_P4) #elif defined(CONFIG_FLOW3R_HW_GEN_P4)
const char *flow3r_bsp_hw_name = "proto4"; const char *flow3r_bsp_hw_name = "proto4";
#elif defined(CONFIG_FLOW3R_HW_GEN_P6) #elif defined(CONFIG_FLOW3R_HW_GEN_C23)
const char *flow3r_bsp_hw_name = "proto6"; const char *flow3r_bsp_hw_name = "camp23";
#else #else
#error "Badge23 Hardware Generation must be set!" #error "Badge23 Hardware Generation must be set!"
#endif #endif
...@@ -25,7 +25,7 @@ const flow3r_i2c_addressdef flow3r_i2c_addresses = { ...@@ -25,7 +25,7 @@ const flow3r_i2c_addressdef flow3r_i2c_addresses = {
.touch_bottom = 0x2d, .touch_bottom = 0x2d,
.portexp = { 0x6e, 0x6d }, .portexp = { 0x6e, 0x6d },
}; };
#elif defined(CONFIG_FLOW3R_HW_GEN_P6) #elif defined(CONFIG_FLOW3R_HW_GEN_C23)
const flow3r_i2c_addressdef flow3r_i2c_addresses = { const flow3r_i2c_addressdef flow3r_i2c_addresses = {
.codec = 0x10, .codec = 0x10,
.touch_top = 0x2c, .touch_top = 0x2c,
......
...@@ -96,7 +96,7 @@ const flow3r_bsp_spio_programmable_pins_t flow3r_bsp_spio_programmable_pins = { ...@@ -96,7 +96,7 @@ const flow3r_bsp_spio_programmable_pins_t flow3r_bsp_spio_programmable_pins = {
.badgelink_right_ring = 5, .badgelink_right_ring = 5,
}; };
#define PORTEXP_MAX7321S #define PORTEXP_MAX7321S
#elif defined(CONFIG_FLOW3R_HW_GEN_P6) #elif defined(CONFIG_FLOW3R_HW_GEN_C23)
static const flow3r_bsp_iodef_t iodef = { static const flow3r_bsp_iodef_t iodef = {
.tripos_left = .tripos_left =
{ {
......
...@@ -271,7 +271,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_input_thru_get_mute_obj, ...@@ -271,7 +271,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_input_thru_get_mute_obj,
STATIC mp_obj_t mp_codec_i2c_write(mp_obj_t reg_in, mp_obj_t data_in) { STATIC mp_obj_t mp_codec_i2c_write(mp_obj_t reg_in, mp_obj_t data_in) {
#if defined(CONFIG_FLOW3R_HW_GEN_P3) || defined(CONFIG_FLOW3R_HW_GEN_P4) || \ #if defined(CONFIG_FLOW3R_HW_GEN_P3) || defined(CONFIG_FLOW3R_HW_GEN_P4) || \
defined(CONFIG_FLOW3R_HW_GEN_P6) defined(CONFIG_FLOW3R_HW_GEN_C23)
uint8_t reg = mp_obj_get_int(reg_in); uint8_t reg = mp_obj_get_int(reg_in);
uint8_t data = mp_obj_get_int(data_in); uint8_t data = mp_obj_get_int(data_in);
flow3r_bsp_audio_register_poke(reg, data); flow3r_bsp_audio_register_poke(reg, data);
......
...@@ -16,7 +16,7 @@ def action_extensions(base_actions, project_path=os.getcwd()): ...@@ -16,7 +16,7 @@ def action_extensions(base_actions, project_path=os.getcwd()):
GENERATIONS = { GENERATIONS = {
'p3': ['proto3'], 'p3': ['proto3'],
'p4': ['proto4'], 'p4': ['proto4'],
'p6': ['proto6'], 'c23': ['proto6', 'camp23', 'cccamp23', 'cccamp2023', 'camp2023'],
} }
def generation_callback(ctx, global_args, tasks): def generation_callback(ctx, global_args, tasks):
...@@ -26,7 +26,7 @@ def action_extensions(base_actions, project_path=os.getcwd()): ...@@ -26,7 +26,7 @@ def action_extensions(base_actions, project_path=os.getcwd()):
""" """
generation = global_args.generation generation = global_args.generation
if generation is None: if generation is None:
generation = os.environ.get('BADGE_GENERATION', 'proto6') generation = os.environ.get('BADGE_GENERATION', 'camp23')
name = None name = None
if generation in GENERATIONS: if generation in GENERATIONS:
...@@ -62,7 +62,7 @@ def action_extensions(base_actions, project_path=os.getcwd()): ...@@ -62,7 +62,7 @@ def action_extensions(base_actions, project_path=os.getcwd()):
extensions = { extensions = {
'global_options': [{ 'global_options': [{
'names': ['-g', '--generation'], 'names': ['-g', '--generation'],
'help': 'Specify badge generation to build for (one of: proto1, proto3, proto4, proto6, proto6-spiral). Defaults to proto4.', 'help': 'Specify badge generation to build for (one of: proto1, proto3, proto4, camp23). Defaults to proto4.',
'scope': 'shared', 'scope': 'shared',
'multiple': False, 'multiple': False,
}], }],
......
...@@ -24,5 +24,5 @@ CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y ...@@ -24,5 +24,5 @@ CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
CONFIG_FATFS_LFN_HEAP=y CONFIG_FATFS_LFN_HEAP=y
CONFIG_FATFS_API_ENCODING_UTF_8=y CONFIG_FATFS_API_ENCODING_UTF_8=y
CONFIG_LOG_DEFAULT_LEVEL_INFO=y CONFIG_LOG_DEFAULT_LEVEL_INFO=y
CONFIG_FLOW3R_HW_GEN_P6=y CONFIG_FLOW3R_HW_GEN_C23=y
CONFIG_FLOW3R_CTX_FLAVOUR_SMOL=y CONFIG_FLOW3R_CTX_FLAVOUR_SMOL=y
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment