From 57eab14802c69d570184fab89ad0cd81c1ab6f49 Mon Sep 17 00:00:00 2001 From: Michael Wiebusch Date: Mon, 16 Dec 2013 10:40:57 +0100 Subject: [PATCH] mmh ... update ... --- firmware/Makefile | 3 ++- firmware/src/main.c | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index 779f88a..061ea43 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -35,7 +35,8 @@ clean: rm -f $(PROGRAM).info_symbol program: all - stm32flash -w main.bin -b 115200 /dev/ttyUSB0 +# stm32flash -w main.bin -b 115200 /dev/ttyUSB0 + st-flash write main.bin 0x8000000 swd: all vsprog -cstm32_hd -ms -oe -owf -I main.hex diff --git a/firmware/src/main.c b/firmware/src/main.c index 75c144f..be7d17c 100644 --- a/firmware/src/main.c +++ b/firmware/src/main.c @@ -275,9 +275,9 @@ void init_CB_GPIO_Outputs(void) { CB_GPIO_Out_Init(ENAD1); CB_GPIO_Out_Init(ENAA1); // CB_GPIO_Out_Init(OVCD_C0); //input! -// CB_GPIO_Out_Init(OVCA_C0); -// CB_GPIO_Out_Init(OVCD_C1); -// CB_GPIO_Out_Init(OVCA_C1); +// CB_GPIO_Out_Init(OVCA_C0); //input! +// CB_GPIO_Out_Init(OVCD_C1); //input! +// CB_GPIO_Out_Init(OVCA_C1); //input! CB_GPIO_Out_Init(MUXADDR0); CB_GPIO_Out_Init(MUXADDR1); CB_GPIO_Out_Init(ZEROCALIB); @@ -302,10 +302,10 @@ void init_CB_GPIO_Outputs(void) { CB_GPIO_Out_Hi(ENAA0); CB_GPIO_Out_Hi(ENAD1); CB_GPIO_Out_Hi(ENAA1); -// CB_GPIO_Out_Lo(OVCD_C0); // input! -// CB_GPIO_Out_Lo(OVCA_C0); -// CB_GPIO_Out_Lo(OVCD_C1); -// CB_GPIO_Out_Lo(OVCA_C1); +// CB_GPIO_Out_Lo(OVCD_C0); //input! +// CB_GPIO_Out_Lo(OVCA_C0); //input! +// CB_GPIO_Out_Lo(OVCD_C1); //input! +// CB_GPIO_Out_Lo(OVCA_C1); //input! CB_GPIO_Out_Lo(MUXADDR0); CB_GPIO_Out_Lo(MUXADDR1); CB_GPIO_Out_Lo(ZEROCALIB); -- 2.43.0