altos: Fix up stm-flash output file name. Use discovery LED pins

Include the AltOS version in the file name, just like any other AltOS
program.

Switch the LEDs to the discovery board as we're using
that. Eventually, we'll stop using LEDs entirely.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/stm-flash/Makefile b/src/stm-flash/Makefile
index e4a2f3217fca050aa2c324f32d4f211b7e446fa4..46bc61af4786ba13381fa3a5f5bb6b1514a16ea3 100644 (file)
--- a/src/stm-flash/Makefile
+++ b/src/stm-flash/Makefile
@@ -35,7 +35,7 @@ IDPRODUCT=0x000a
 
 CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os
 
-PROG=stm-flash
+PROG=stm-flash-$(VERSION).elf
 
 SRC=$(ALTOS_SRC) ao_stm_flash.c
 OBJ=$(SRC:.c=.o)

diff --git a/src/stm-flash/ao_pins.h b/src/stm-flash/ao_pins.h
index 382ef3531a4372b867b2d17b666d66c159daedb0..048fc8282ad0d077c9dbb6c75a49664b680f9b8f 100644 (file)
--- a/src/stm-flash/ao_pins.h
+++ b/src/stm-flash/ao_pins.h
@@ -51,9 +51,9 @@
 #define PACKET_HAS_SLAVE       0
 
 #define LED_PORT_ENABLE                STM_RCC_AHBENR_GPIOCEN
-#define LED_PORT               (&stm_gpioc)
-#define LED_PIN_RED            8
-#define LED_PIN_GREEN          9
+#define LED_PORT               (&stm_gpiob)
+#define LED_PIN_RED            6
+#define LED_PIN_GREEN          7
 #define AO_LED_RED             (1 << LED_PIN_RED)
 #define AO_LED_GREEN           (1 << LED_PIN_GREEN)