From cc3a619f924071eedd6776a44630dfa640842707 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Mon, 4 Mar 2019 16:39:39 +0000 Subject: [PATCH] - switch on power on leaving Error state git-svn-id: http://moon:8086/svn/projects/HendiControl@57 fda53097-d464-4ada-af97-ba876c37ca34 --- Control/firmware/uart_echo/main.c | 1 + .../uart_echo/uart_echo.componentinfo.xml | 16 ++++++++-------- Control/firmware/uart_echo/uart_echo.cproj | 12 ++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Control/firmware/uart_echo/main.c b/Control/firmware/uart_echo/main.c index ea121ca..a738256 100755 --- a/Control/firmware/uart_echo/main.c +++ b/Control/firmware/uart_echo/main.c @@ -236,6 +236,7 @@ int main(void) { if (state == StateError) { + setSwitch(SwitchOn); state_next = StateNormal; } } diff --git a/Control/firmware/uart_echo/uart_echo.componentinfo.xml b/Control/firmware/uart_echo/uart_echo.componentinfo.xml index 0685a82..b002db6 100755 --- a/Control/firmware/uart_echo/uart_echo.componentinfo.xml +++ b/Control/firmware/uart_echo/uart_echo.componentinfo.xml @@ -10,12 +10,12 @@ Atmel 1.2.0 - C:/Program Files (x86)\Atmel\Studio\7.0\Packs + D:/Program Files (x86)\Atmel\Studio\7.0\Packs - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include + D:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.150\include include C @@ -26,7 +26,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\include\avr\iom328p.h + D:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.150\include\avr\iom328p.h header C @@ -37,7 +37,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\templates\main.c + D:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.150\templates\main.c template source C Exe @@ -48,7 +48,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\templates\main.cpp + D:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.150\templates\main.cpp template source C Exe @@ -59,7 +59,7 @@ - C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p + D:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATmega_DFP\1.2.150\gcc\dev\atmega328p libraryPrefix GCC @@ -71,8 +71,8 @@ ATmega_DFP - C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.209/Atmel.ATmega_DFP.pdsc - 1.2.209 + D:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATmega_DFP/1.2.150/Atmel.ATmega_DFP.pdsc + 1.2.150 true ATmega328P diff --git a/Control/firmware/uart_echo/uart_echo.cproj b/Control/firmware/uart_echo/uart_echo.cproj index 9c25656..7253569 100755 --- a/Control/firmware/uart_echo/uart_echo.cproj +++ b/Control/firmware/uart_echo/uart_echo.cproj @@ -84,7 +84,7 @@ - -mmcu=atmega328p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" + -mmcu=atmega328p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.150\gcc\dev\atmega328p" True True True @@ -100,7 +100,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\include + %24(PackRepoDir)\atmel\ATmega_DFP\1.2.150\include Optimize for size (-Os) @@ -115,7 +115,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\include + %24(PackRepoDir)\atmel\ATmega_DFP\1.2.150\include @@ -124,7 +124,7 @@ - -mmcu=atmega328p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\gcc\dev\atmega328p" + -mmcu=atmega328p -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.2.150\gcc\dev\atmega328p" True True True @@ -140,7 +140,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\include + %24(PackRepoDir)\atmel\ATmega_DFP\1.2.150\include Optimize debugging experience (-Og) @@ -155,7 +155,7 @@ - %24(PackRepoDir)\atmel\ATmega_DFP\1.2.209\include + %24(PackRepoDir)\atmel\ATmega_DFP\1.2.150\include Default (-Wa,-g)