Skip to content

Commit 6b3fe5c

Browse files
author
jh
committed
Add configuration with neither LED nor button
Well, this is actually for 2 of my custom boards, but I could as well have unsoldered the LED and button from a blue pill…
1 parent 104902d commit 6b3fe5c

6 files changed

Lines changed: 28 additions & 3 deletions

File tree

Makefile

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CFLAGS += -Wredundant-decls -Wreturn-type -Wshadow -Wunused
3333
CFLAGS += -Wa,-adhlns=$(BUILDDIR)/$(subst $(suffix $<),.lst,$<)
3434
CFLAGS += $(patsubst %,-I%,$(INCDIRS))
3535

36-
# Aeembler Flags
36+
# Assembler Flags
3737
ASFLAGS = -Wa,-adhlns=$(BUILDDIR)/$(<:.s=.lst)#,--g$(DEBUG)
3838

3939
LDFLAGS = -nostartfiles -Wl,-Map=$(TARGET).map,--cref,--gc-sections
@@ -116,6 +116,7 @@ all: begin gccversion build sizeafter finished end
116116
maple-mini: begin clean gccversion build_maple-mini sizeafter finished copy_maple_mini end
117117
maple-rev3: begin clean gccversion build_maple-rev3 sizeafter finished copy_maple-rev3 end
118118
maple-rev5: begin clean gccversion build_maple-rev5 sizeafter finished copy_maple-rev5 end
119+
generic-none: begin clean gccversion build_generic-none sizeafter finished copy_generic-none end
119120
generic-pc13: begin clean gccversion build_generic-pc13 sizeafter finished copy_generic-pc13 end
120121
generic-pg15: begin clean gccversion build_generic-pg15 sizeafter finished copy_generic-pg15 end
121122
generic-pd2: begin clean gccversion build_generic-pd2 sizeafter finished copy_generic-pd2 end
@@ -175,6 +176,18 @@ copy_maple-rev5:
175176
@echo
176177

177178

179+
build_generic-none: TARGETFLAGS= -DTARGET_GENERIC_F103_NONE
180+
# Set the linker script
181+
build_generic-none: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
182+
build_generic-none: elf bin lss sym
183+
copy_generic-none:
184+
@echo
185+
@echo "Copying to binaries folder"
186+
@echo
187+
cp $(TARGET).bin bootloader_only_binaries/generic-none_bootloader.bin
188+
@echo
189+
190+
178191
build_generic-pc13: TARGETFLAGS= -DTARGET_GENERIC_F103_PC13
179192
# Set the linker script
180193
build_generic-pc13: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
6.78 KB
Binary file not shown.

config.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,9 @@
160160
#define BUTTON_PRESSED_STATE 1
161161

162162

163+
#elif defined TARGET_GENERIC_F103_NONE
164+
165+
163166
#elif defined TARGET_GENERIC_F103_PG15
164167

165168
#define LED_BANK GPIOG

hardware.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ void setupLEDAndButton (void) {
156156

157157
gpio_write_bit(BUTTON_BANK, BUTTON_PIN,1-BUTTON_PRESSED_STATE);// set pulldown resistor in case there is no button.
158158
#endif
159+
#if defined(LED_BANK) && defined(LED_PIN) && defined(LED_ON_STATE)
159160
SET_REG(GPIO_CR(LED_BANK,LED_PIN),(GET_REG(GPIO_CR(LED_BANK,LED_PIN)) & crMask(LED_PIN)) | CR_OUTPUT_PP << CR_SHITF(LED_PIN));
161+
#endif
160162
}
161163

162164
void setupFLASH() {

main.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,17 @@ int main()
5050
{
5151
case 0x01:
5252
no_user_jump = TRUE;
53+
#if defined(LED_BANK) && defined(LED_PIN) && defined(LED_ON_STATE)
5354
strobePin(LED_BANK, LED_PIN, STARTUP_BLINKS, BLINK_FAST,LED_ON_STATE);
55+
#endif
5456
break;
5557
case 0x02:
5658
dont_wait=TRUE;
5759
break;
5860
default:
61+
#if defined(LED_BANK) && defined(LED_PIN) && defined(LED_ON_STATE)
5962
strobePin(LED_BANK, LED_PIN, STARTUP_BLINKS, BLINK_FAST,LED_ON_STATE);
63+
#endif
6064
if (!checkUserCode(USER_CODE_FLASH0X8005000) && !checkUserCode(USER_CODE_FLASH0X8002000))
6165
{
6266
no_user_jump = TRUE;
@@ -74,9 +78,9 @@ int main()
7478

7579
while ((delay_count++ < BOOTLOADER_WAIT) || no_user_jump)
7680
{
77-
81+
#if defined(LED_BANK) && defined(LED_PIN) && defined(LED_ON_STATE)
7882
strobePin(LED_BANK, LED_PIN, 1, BLINK_SLOW,LED_ON_STATE);
79-
83+
#endif
8084
if (dfuUploadStarted())
8185
{
8286
dfuFinishUpload(); // systemHardReset from DFU once done
@@ -97,7 +101,9 @@ int main()
97101
else
98102
{
99103
// Nothing to execute in either Flash or RAM
104+
#if defined(LED_BANK) && defined(LED_PIN) && defined(LED_ON_STATE)
100105
strobePin(LED_BANK, LED_PIN, 5, BLINK_FAST,LED_ON_STATE);
106+
#endif
101107
systemHardReset();
102108
}
103109
}

make_all.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
make maple-mini
22
make maple-rev3
33
make maple-rev5
4+
make generic-none
45
make generic-pc13
56
make generic-pg15
67
make generic-pd2

0 commit comments

Comments
 (0)