diff --git a/.clang-format b/.clang-format deleted file mode 100644 index 41e7b1a..0000000 --- a/.clang-format +++ /dev/null @@ -1,8 +0,0 @@ -BasedOnStyle: LLVM -IndentWidth: 4 # Use 4 spaces for indentation -TabWidth: 4 # Tab width is also 4 spaces -UseTab: Never # Always use spaces instead of tabs -ColumnLimit: 80 # Wrap lines after 80 characters -AllowShortLoopsOnASingleLine: true -AlwaysBreakTemplateDeclarations: true -BreakConstructorInitializers: BeforeComma diff --git a/.gitignore b/.gitignore index b8e4dc0..1b8f046 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,3 @@ ch32fun.h ch32fun.ld ch32v003hw.h ch32v003.ld -.cache -compile_commands.json diff --git a/Makefile b/Makefile index f90a85b..71ef99e 100644 --- a/Makefile +++ b/Makefile @@ -52,14 +52,14 @@ ch32%: @echo "Fetching $@" @curl $(CURL_FLAGS) $(BASE)/$@ -%.bin : %.elf - $(OBJCOPY) -O binary $< $@ +$(TARGET).bin : $(TARGET).elf + @$(OBJCOPY) -O binary $< $(TARGET).bin -%.lst : %.elf - $(OBJDUMP) -S $^ > $@ +$(TARGET).lst : $(TARGET).elf + @$(OBJDUMP) -S $^ > $(TARGET).lst -%.hex : %.elf - $(OBJCOPY) -O ihex $< $@ +$(TARGET).hex : $(TARGET).elf + @$(OBJCOPY) -O ihex $< $(TARGET).hex flash: $(TARGET).bin minichlink -w $(TARGET).bin flash -b diff --git a/blink.c b/blink.c index 4b37dc7..b44ceba 100644 --- a/blink.c +++ b/blink.c @@ -1,19 +1,35 @@ #include "ch32fun.h" +#include -#define LED_PIN PD6 +// use defines to make more meaningful names for our GPIO pins +#define PIN_1 PD0 +#define PIN_K PD4 +#define PIN_BOB PD6 +#define PIN_KEVIN PC0 -int main() { - SystemInit(); +int main() +{ + SystemInit(); - // Enable GPIOs - funGpioInitAll(); + // Enable GPIOs + funGpioInitAll(); + + funPinMode( PIN_1, GPIO_Speed_10MHz | GPIO_CNF_OUT_PP ); + funPinMode( PIN_K, GPIO_Speed_10MHz | GPIO_CNF_OUT_PP ); + funPinMode( PIN_BOB, GPIO_Speed_10MHz | GPIO_CNF_OUT_PP ); + funPinMode( PIN_KEVIN, GPIO_Speed_10MHz | GPIO_CNF_OUT_PP ); - funPinMode(LED_PIN, GPIO_Speed_10MHz | GPIO_CNF_OUT_PP); - - while (1) { - funDigitalWrite(LED_PIN, FUN_HIGH); - Delay_Ms(250); - funDigitalWrite(LED_PIN, FUN_LOW); - Delay_Ms(250); - } + while(1) + { + funDigitalWrite( PIN_1, FUN_HIGH ); + funDigitalWrite( PIN_K, FUN_HIGH ); + funDigitalWrite( PIN_BOB, FUN_HIGH ); + funDigitalWrite( PIN_KEVIN, FUN_HIGH ); + Delay_Ms( 250 ); + funDigitalWrite( PIN_1, FUN_LOW ); + funDigitalWrite( PIN_K, FUN_LOW ); + funDigitalWrite( PIN_BOB, FUN_LOW ); + funDigitalWrite( PIN_KEVIN, FUN_LOW ); + Delay_Ms( 250 ); + } }