diff --git a/Firmware/CoverUI/yfc500/ButtonDebouncer.cpp b/Firmware/CoverUI/YardForce/ButtonDebouncer.cpp similarity index 100% rename from Firmware/CoverUI/yfc500/ButtonDebouncer.cpp rename to Firmware/CoverUI/YardForce/ButtonDebouncer.cpp diff --git a/Firmware/CoverUI/yfc500/ButtonDebouncer.h b/Firmware/CoverUI/YardForce/ButtonDebouncer.h similarity index 100% rename from Firmware/CoverUI/yfc500/ButtonDebouncer.h rename to Firmware/CoverUI/YardForce/ButtonDebouncer.h diff --git a/Firmware/CoverUI/yfc500/Buttons.cpp b/Firmware/CoverUI/YardForce/Buttons.cpp similarity index 100% rename from Firmware/CoverUI/yfc500/Buttons.cpp rename to Firmware/CoverUI/YardForce/Buttons.cpp diff --git a/Firmware/CoverUI/yfc500/Buttons.h b/Firmware/CoverUI/YardForce/Buttons.h similarity index 100% rename from Firmware/CoverUI/yfc500/Buttons.h rename to Firmware/CoverUI/YardForce/Buttons.h diff --git a/Firmware/CoverUI/yfc500/Emergency.hpp b/Firmware/CoverUI/YardForce/Emergency.hpp similarity index 100% rename from Firmware/CoverUI/yfc500/Emergency.hpp rename to Firmware/CoverUI/YardForce/Emergency.hpp diff --git a/Firmware/CoverUI/yfc500/LEDcontrol.cpp b/Firmware/CoverUI/YardForce/LEDcontrol.cpp similarity index 100% rename from Firmware/CoverUI/yfc500/LEDcontrol.cpp rename to Firmware/CoverUI/YardForce/LEDcontrol.cpp diff --git a/Firmware/CoverUI/yfc500/LEDcontrol.h b/Firmware/CoverUI/YardForce/LEDcontrol.h similarity index 100% rename from Firmware/CoverUI/yfc500/LEDcontrol.h rename to Firmware/CoverUI/YardForce/LEDcontrol.h diff --git a/Firmware/CoverUI/yfc500/README.md b/Firmware/CoverUI/YardForce/README.md similarity index 100% rename from Firmware/CoverUI/yfc500/README.md rename to Firmware/CoverUI/YardForce/README.md diff --git a/Firmware/CoverUI/yfc500/Rain.hpp b/Firmware/CoverUI/YardForce/Rain.hpp similarity index 100% rename from Firmware/CoverUI/yfc500/Rain.hpp rename to Firmware/CoverUI/YardForce/Rain.hpp diff --git a/Firmware/CoverUI/yfc500/backup/Stock-Firmware-C500B-RM-ECOW-V1.3.1-20210809-GD32F330R8T6.bin b/Firmware/CoverUI/YardForce/backup/Stock-Firmware-C500B-RM-ECOW-V1.3.1-20210809-GD32F330R8T6.bin similarity index 100% rename from Firmware/CoverUI/yfc500/backup/Stock-Firmware-C500B-RM-ECOW-V1.3.1-20210809-GD32F330R8T6.bin rename to Firmware/CoverUI/YardForce/backup/Stock-Firmware-C500B-RM-ECOW-V1.3.1-20210809-GD32F330R8T6.bin diff --git a/Firmware/CoverUI/yfc500/bin/README.md b/Firmware/CoverUI/YardForce/bin/README.md similarity index 100% rename from Firmware/CoverUI/yfc500/bin/README.md rename to Firmware/CoverUI/YardForce/bin/README.md diff --git a/Firmware/CoverUI/yfc500/bin/firmware_100_GD32.bin b/Firmware/CoverUI/YardForce/bin/firmware_100_GD32.bin similarity index 100% rename from Firmware/CoverUI/yfc500/bin/firmware_100_GD32.bin rename to Firmware/CoverUI/YardForce/bin/firmware_100_GD32.bin diff --git a/Firmware/CoverUI/yfc500/bin/firmware_100_GD32_HALL.bin b/Firmware/CoverUI/YardForce/bin/firmware_100_GD32_HALL.bin similarity index 100% rename from Firmware/CoverUI/yfc500/bin/firmware_100_GD32_HALL.bin rename to Firmware/CoverUI/YardForce/bin/firmware_100_GD32_HALL.bin diff --git a/Firmware/CoverUI/yfc500/bin/firmware_100_GD32_RAIN.bin b/Firmware/CoverUI/YardForce/bin/firmware_100_GD32_RAIN.bin similarity index 100% rename from Firmware/CoverUI/yfc500/bin/firmware_100_GD32_RAIN.bin rename to Firmware/CoverUI/YardForce/bin/firmware_100_GD32_RAIN.bin diff --git a/Firmware/CoverUI/yfc500/bin/firmware_100_GD32_RAIN_HALL.bin b/Firmware/CoverUI/YardForce/bin/firmware_100_GD32_RAIN_HALL.bin similarity index 100% rename from Firmware/CoverUI/yfc500/bin/firmware_100_GD32_RAIN_HALL.bin rename to Firmware/CoverUI/YardForce/bin/firmware_100_GD32_RAIN_HALL.bin diff --git a/Firmware/CoverUI/yfc500/bin/firmware_100_STM32.bin b/Firmware/CoverUI/YardForce/bin/firmware_100_STM32.bin similarity index 100% rename from Firmware/CoverUI/yfc500/bin/firmware_100_STM32.bin rename to Firmware/CoverUI/YardForce/bin/firmware_100_STM32.bin diff --git a/Firmware/CoverUI/yfc500/bin/firmware_100_STM32_HALL.bin b/Firmware/CoverUI/YardForce/bin/firmware_100_STM32_HALL.bin similarity index 100% rename from Firmware/CoverUI/yfc500/bin/firmware_100_STM32_HALL.bin rename to Firmware/CoverUI/YardForce/bin/firmware_100_STM32_HALL.bin diff --git a/Firmware/CoverUI/yfc500/bin/firmware_100_STM32_RAIN.bin b/Firmware/CoverUI/YardForce/bin/firmware_100_STM32_RAIN.bin similarity index 100% rename from Firmware/CoverUI/yfc500/bin/firmware_100_STM32_RAIN.bin rename to Firmware/CoverUI/YardForce/bin/firmware_100_STM32_RAIN.bin diff --git a/Firmware/CoverUI/yfc500/bin/firmware_100_STM32_RAIN_HALL.bin b/Firmware/CoverUI/YardForce/bin/firmware_100_STM32_RAIN_HALL.bin similarity index 100% rename from Firmware/CoverUI/yfc500/bin/firmware_100_STM32_RAIN_HALL.bin rename to Firmware/CoverUI/YardForce/bin/firmware_100_STM32_RAIN_HALL.bin diff --git a/Firmware/CoverUI/yfc500/hwtimer.hpp b/Firmware/CoverUI/YardForce/hwtimer.hpp similarity index 100% rename from Firmware/CoverUI/yfc500/hwtimer.hpp rename to Firmware/CoverUI/YardForce/hwtimer.hpp diff --git a/Firmware/CoverUI/yfc500/images/IMG_Cable.jpg b/Firmware/CoverUI/YardForce/images/IMG_Cable.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Cable.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Cable.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Overview.jpg b/Firmware/CoverUI/YardForce/images/IMG_Overview.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Overview.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Overview.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_PCB_Changes.jpg b/Firmware/CoverUI/YardForce/images/IMG_PCB_Changes.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_PCB_Changes.jpg rename to Firmware/CoverUI/YardForce/images/IMG_PCB_Changes.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_PCB_Changes_500B.jpg b/Firmware/CoverUI/YardForce/images/IMG_PCB_Changes_500B.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_PCB_Changes_500B.jpg rename to Firmware/CoverUI/YardForce/images/IMG_PCB_Changes_500B.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Picoprobe-open1.jpg b/Firmware/CoverUI/YardForce/images/IMG_Picoprobe-open1.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Picoprobe-open1.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Picoprobe-open1.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Picoprobe-open2.jpg b/Firmware/CoverUI/YardForce/images/IMG_Picoprobe-open2.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Picoprobe-open2.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Picoprobe-open2.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Picoprobe.jpg b/Firmware/CoverUI/YardForce/images/IMG_Picoprobe.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Picoprobe.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Picoprobe.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_ST-Link-V2-Clone.jpg b/Firmware/CoverUI/YardForce/images/IMG_ST-Link-V2-Clone.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_ST-Link-V2-Clone.jpg rename to Firmware/CoverUI/YardForce/images/IMG_ST-Link-V2-Clone.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-detail2.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-detail2.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-detail2.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-detail2.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-detail2_500B.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-detail2_500B.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-detail2_500B.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-detail2_500B.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-detail3.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-detail3.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-detail3.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-detail3.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-detail3_500B.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-detail3_500B.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-detail3_500B.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-detail3_500B.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-detail4.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-detail4.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-detail4.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-detail4.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-nice.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-nice.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-nice.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-nice.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-overview-hall.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-overview-hall.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-overview-hall.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-overview-hall.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-overview-hall_500B.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-overview-hall_500B.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-overview-hall_500B.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-overview-hall_500B.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-overview.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-overview.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-overview.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-overview.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-overview_500B.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-overview_500B.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-overview_500B.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-overview_500B.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-rain1.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-rain1.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-rain1.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-rain1.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-rain1_500B.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-rain1_500B.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables-rain1_500B.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables-rain1_500B.jpg diff --git a/Firmware/CoverUI/yfc500/images/IMG_Stock-Cables_500B.jpg b/Firmware/CoverUI/YardForce/images/IMG_Stock-Cables_500B.jpg similarity index 100% rename from Firmware/CoverUI/yfc500/images/IMG_Stock-Cables_500B.jpg rename to Firmware/CoverUI/YardForce/images/IMG_Stock-Cables_500B.jpg diff --git a/Firmware/CoverUI/yfc500/main.hpp b/Firmware/CoverUI/YardForce/main.hpp similarity index 100% rename from Firmware/CoverUI/yfc500/main.hpp rename to Firmware/CoverUI/YardForce/main.hpp diff --git a/Firmware/CoverUI/yfc500/util/picoprobe-stm.cfg b/Firmware/CoverUI/YardForce/util/picoprobe-stm.cfg similarity index 100% rename from Firmware/CoverUI/yfc500/util/picoprobe-stm.cfg rename to Firmware/CoverUI/YardForce/util/picoprobe-stm.cfg diff --git a/Firmware/CoverUI/yfc500/util/stlink-gd.cfg b/Firmware/CoverUI/YardForce/util/stlink-gd.cfg similarity index 100% rename from Firmware/CoverUI/yfc500/util/stlink-gd.cfg rename to Firmware/CoverUI/YardForce/util/stlink-gd.cfg diff --git a/Firmware/CoverUI/yfc500/util/stlink-stm.cfg b/Firmware/CoverUI/YardForce/util/stlink-stm.cfg similarity index 100% rename from Firmware/CoverUI/yfc500/util/stlink-stm.cfg rename to Firmware/CoverUI/YardForce/util/stlink-stm.cfg diff --git a/Firmware/CoverUI/main.cpp b/Firmware/CoverUI/main.cpp index 492810f..1aa1167 100644 --- a/Firmware/CoverUI/main.cpp +++ b/Firmware/CoverUI/main.cpp @@ -4,7 +4,7 @@ #include #ifdef HW_YFC500 // Stock "YardForce Classic 500" HardWare -#include "yfc500/main.hpp" +#include "YardForce/main.hpp" #else // OM's Pico based HardWare #include "pico/stdlib.h" #include "hardware/pio.h" @@ -338,7 +338,7 @@ void core1() } } -#ifndef HW_YFC500 // HW_Pico (HW_YFC500 is arduino based. See setup() & loop() in yfc500/main.hpp) +#ifndef HW_YFC500 // HW_Pico (HW_YFC500 is arduino based. See setup() & loop() in YardForce/main.hpp) int main(void) { uint32_t last_led_update = 0; diff --git a/Firmware/CoverUI/platformio.ini b/Firmware/CoverUI/platformio.ini index 8e840d8..20f5cb7 100644 --- a/Firmware/CoverUI/platformio.ini +++ b/Firmware/CoverUI/platformio.ini @@ -40,7 +40,7 @@ build_src_filter = - - - - - + - build_flags = -DHW_YFC500 @@ -59,14 +59,14 @@ build_flags = upload_flags = -f - yfc500/util/stlink-stm.cfg + YardForce/util/stlink-stm.cfg upload_command = openocd $UPLOAD_FLAGS -c "init; reset halt; stm32f0x unlock 0; reset run" -c "program {$SOURCE} verify reset; shutdown;" debug_build_flags = -O0 -g -ggdb2 debug_server = openocd -f - yfc500/util/stlink-stm.cfg + YardForce/util/stlink-stm.cfg -c reset_config none separate @@ -81,14 +81,14 @@ build_flags = upload_flags = -f - yfc500/util/stlink-stm.cfg + YardForce/util/stlink-stm.cfg upload_command = openocd $UPLOAD_FLAGS -c "init; reset halt; stm32f0x unlock 0; reset run" -c "program {$SOURCE} verify reset; shutdown;" debug_build_flags = -O0 -g -ggdb2 debug_server = openocd -f - yfc500/util/stlink-stm.cfg + YardForce/util/stlink-stm.cfg -c reset_config none separate @@ -104,14 +104,14 @@ build_flags = upload_flags = -f - yfc500/util/stlink-stm.cfg + YardForce/util/stlink-stm.cfg upload_command = openocd $UPLOAD_FLAGS -c "init; reset halt; stm32f0x unlock 0; reset run" -c "program {$SOURCE} verify reset; shutdown;" debug_build_flags = -O0 -g -ggdb2 debug_server = openocd -f - yfc500/util/stlink-stm.cfg + YardForce/util/stlink-stm.cfg -c reset_config none separate @@ -126,14 +126,14 @@ build_flags = upload_flags = -f - yfc500/util/stlink-stm.cfg + YardForce/util/stlink-stm.cfg upload_command = openocd $UPLOAD_FLAGS -c "init; reset halt; stm32f0x unlock 0; reset run" -c "program {$SOURCE} verify reset; shutdown;" debug_build_flags = -O0 -g -ggdb2 debug_server = openocd -f - yfc500/util/stlink-stm.cfg + YardForce/util/stlink-stm.cfg -c reset_config none separate @@ -154,7 +154,7 @@ platform_packages = platformio/tool-openocd@^2.1100.211028 upload_protocol = cmsis-dap upload_flags = -f - yfc500/util/picoprobe-stm.cfg + YardForce/util/picoprobe-stm.cfg upload_command = openocd $UPLOAD_FLAGS -c "init; reset halt; stm32f0x unlock 0; reset run" -c "program {$SOURCE} verify reset; shutdown;" @@ -164,7 +164,7 @@ debug_build_flags = -O0 -g -ggdb2 debug_server = openocd -f - yfc500/util/picoprobe-stm.cfg + YardForce/util/picoprobe-stm.cfg -c reset_config none separate @@ -186,14 +186,14 @@ build_flags = upload_flags = -f - yfc500/util/stlink-gd.cfg + YardForce/util/stlink-gd.cfg upload_command = openocd $UPLOAD_FLAGS -c "init; reset halt; stm32f3x unlock 0; reset run" -c "program {$SOURCE} verify reset; shutdown;" debug_build_flags = -O0 -g -ggdb2 debug_server = openocd -f - yfc500/util/stlink-gd.cfg + YardForce/util/stlink-gd.cfg -c reset_config none separate @@ -212,14 +212,14 @@ build_flags = upload_flags = -f - yfc500/util/stlink-gd.cfg + YardForce/util/stlink-gd.cfg upload_command = openocd $UPLOAD_FLAGS -c "init; reset halt; stm32f3x unlock 0; reset run" -c "program {$SOURCE} verify reset; shutdown;" debug_build_flags = -O0 -g -ggdb2 debug_server = openocd -f - yfc500/util/stlink-gd.cfg + YardForce/util/stlink-gd.cfg -c reset_config none separate @@ -239,14 +239,14 @@ build_flags = upload_flags = -f - yfc500/util/stlink-gd.cfg + YardForce/util/stlink-gd.cfg upload_command = openocd $UPLOAD_FLAGS -c "init; reset halt; stm32f3x unlock 0; reset run" -c "program {$SOURCE} verify reset; shutdown;" debug_build_flags = -O0 -g -ggdb2 debug_server = openocd -f - yfc500/util/stlink-gd.cfg + YardForce/util/stlink-gd.cfg -c reset_config none separate @@ -265,13 +265,13 @@ build_flags = upload_flags = -f - yfc500/util/stlink-gd.cfg + YardForce/util/stlink-gd.cfg upload_command = openocd $UPLOAD_FLAGS -c "init; reset halt; stm32f3x unlock 0; reset run" -c "program {$SOURCE} verify reset; shutdown;" debug_build_flags = -O0 -g -ggdb2 debug_server = openocd -f - yfc500/util/stlink-gd.cfg + YardForce/util/stlink-gd.cfg -c reset_config none separate \ No newline at end of file