From 05103aeaf70378366441ab5d2bf19f81439b1735 Mon Sep 17 00:00:00 2001
From: BlubbFish <git@blubbfish.net>
Date: Sun, 6 Sep 2015 16:10:08 +0000
Subject: [PATCH] Automatic Cronjob Checkin: 20150906-181005

---
 Leuchtklotz/Leuchtklotz.atsuo                 | Bin 12800 -> 12800 bytes
 Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.elf | Bin 18349 -> 17849 bytes
 Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.hex |   2 +-
 Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.lss |  18 ++++----
 Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.map |  24 +++++------
 .../Leuchtklotz/Debug/Leuchtklotz.srec        |   2 +-
 Leuchtklotz/Leuchtklotz/Leuchtklotz.c         |  39 +++++++++++-------
 7 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/Leuchtklotz/Leuchtklotz.atsuo b/Leuchtklotz/Leuchtklotz.atsuo
index 23c99ebc8efff5b93ef2e08fd95405cb44058503..14e05d77f15b5ddf35802f6ed0645760a210711a 100644
GIT binary patch
delta 446
zcmZojX-L_S!@{O8abA_li^)YS*Es$|!Q_i9Dw7XzuuQIC_2Cg@U|<jeVvrn2V)GZ)
z02Ur5s0d7SatYV@$%k1CH<xf<VBrCYaw6*~5%6aONl*SF7{DVAl;K5^om?Vxfkyx+
zz=I+v>_6FA&~}rEGYc;xH&BKjMOMO}mr)uhB7!XXMdCa!qasj53Q2VH7fF8>kWrHx
z<c{#L0A)CkWlQAGL!4Hk7{H?dlo3Ueo%{tT$P5&aMHVbk3g8g~3dkc1eo+eHP(l*e
zT%vr1iGvMEWO9ib(0R&05k4f*%_Ztr*#xZ_fkIH=24sr>gIaBJgWf8^7e5}Eh^21R
Toz1p!PMe3v9{$bN`bU`nGpeh4

delta 462
zcmZojX-L_S!@_pq<iFgc=aY+Au5qw1FfjZFg2@+IR3;zbV3}OO>cb-f6cj>|*!+bx
zfQ1L7ObkhMatYUYUPc9=h%}Pu<`V7;EIdp=5l$3Q0e?nbMvxH#NWzo92nO)*0|j`I
z1xti3fGrb85ft|4WmE!+@F9tA{vzzpGWjrz;p7qte_jSQpcFHb^yDuR=Xn_vfg(~!
zqMN@+f;6cEHOXC=e1yedbBX+UMu>o70N7?xB;}L800jks0<y@0B}xH296$kiWWg^=
zAsjqN0-H;euP||dJPiWiATCh@x=0zQh8snl`c*bTO-7&)6xagULO=~_lN<C_2`*p9
Z)BOEG*76f`Z@BhPVE@Ip*;@Z7699Pdyfgp+

diff --git a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.elf b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.elf
index 9145c081dd4f4df114b6537a0c31132d74d1eddc..67d96f0b51c4c6048a066b588eb9072dc1df3d50 100644
GIT binary patch
delta 2896
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

delta 3630
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

diff --git a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.hex b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.hex
index 661333c..259762c 100644
--- a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.hex
+++ b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.hex
@@ -44,5 +44,5 @@
 :1002B000FBDE2C2F30E045E050E064E070E08FE0A2
 :1002C00090E0F2DE2C2F30E041E050E065E070E09D
 :1002D0008FE090E0E9DECF9108958FE387BB81BB8B
-:0E02E000B7DF40DF82E3BFDFFDCFF894FFCF32
+:0E02E000B7DF40DF84E6BFDFFDCFF894FFCF2D
 :00000001FF
diff --git a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.lss b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.lss
index ff82f26..ae6e2d1 100644
--- a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.lss
+++ b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.lss
@@ -15,19 +15,19 @@ Idx Name          Size      VMA       LMA       File off  Algn
                   CONTENTS, READONLY
   5 .debug_aranges 00000080  00000000  00000000  00000ac9  2**0
                   CONTENTS, READONLY, DEBUGGING
-  6 .debug_info   00001df9  00000000  00000000  00000b49  2**0
+  6 .debug_info   00001b2b  00000000  00000000  00000b49  2**0
                   CONTENTS, READONLY, DEBUGGING
-  7 .debug_abbrev 00000237  00000000  00000000  00002942  2**0
+  7 .debug_abbrev 00000246  00000000  00000000  00002674  2**0
                   CONTENTS, READONLY, DEBUGGING
-  8 .debug_line   000005a2  00000000  00000000  00002b79  2**0
+  8 .debug_line   00000554  00000000  00000000  000028ba  2**0
                   CONTENTS, READONLY, DEBUGGING
-  9 .debug_frame  000001a4  00000000  00000000  0000311c  2**2
+  9 .debug_frame  000001dc  00000000  00000000  00002e10  2**2
                   CONTENTS, READONLY, DEBUGGING
- 10 .debug_str    000001cf  00000000  00000000  000032c0  2**0
+ 10 .debug_str    000001cf  00000000  00000000  00002fec  2**0
                   CONTENTS, READONLY, DEBUGGING
- 11 .debug_loc    00000767  00000000  00000000  0000348f  2**0
+ 11 .debug_loc    00000847  00000000  00000000  000031bb  2**0
                   CONTENTS, READONLY, DEBUGGING
- 12 .debug_ranges 00000118  00000000  00000000  00003bf6  2**0
+ 12 .debug_ranges 00000118  00000000  00000000  00003a02  2**0
                   CONTENTS, READONLY, DEBUGGING
 
 Disassembly of section .text:
@@ -508,8 +508,8 @@ int main(void)
     {
 		//programWarnBlink();
 		//programColorFull();
-		programRainbow(50);
- 2e4:	82 e3       	ldi	r24, 0x32	; 50
+		programRainbow(100);
+ 2e4:	84 e6       	ldi	r24, 0x64	; 100
  2e6:	bf df       	rcall	.-130    	; 0x266 <programRainbow>
  2e8:	fd cf       	rjmp	.-6      	; 0x2e4 <main+0xa>
 
diff --git a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.map b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.map
index 17d13c3..8a855ec 100644
--- a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.map
+++ b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.map
@@ -14,9 +14,9 @@ Discarded input sections
  .text.programColorFull
                 0x00000000       0x7a Leuchtklotz.o
  .text.programWarnYellow
-                0x00000000       0x9a Leuchtklotz.o
+                0x00000000       0x86 Leuchtklotz.o
  .text.programCop
-                0x00000000      0x142 Leuchtklotz.o
+                0x00000000       0xa6 Leuchtklotz.o
  .text.programWarnBlink
                 0x00000000      0x136 Leuchtklotz.o
  .text.programHacker
@@ -377,31 +377,31 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8
 .debug_pubnames
  *(.debug_pubnames)
 
-.debug_info     0x00000000     0x1df9
+.debug_info     0x00000000     0x1b2b
  *(.debug_info)
- .debug_info    0x00000000     0x1df9 Leuchtklotz.o
+ .debug_info    0x00000000     0x1b2b Leuchtklotz.o
  *(.gnu.linkonce.wi.*)
 
-.debug_abbrev   0x00000000      0x237
+.debug_abbrev   0x00000000      0x246
  *(.debug_abbrev)
- .debug_abbrev  0x00000000      0x237 Leuchtklotz.o
+ .debug_abbrev  0x00000000      0x246 Leuchtklotz.o
 
-.debug_line     0x00000000      0x5a2
+.debug_line     0x00000000      0x554
  *(.debug_line)
- .debug_line    0x00000000      0x5a2 Leuchtklotz.o
+ .debug_line    0x00000000      0x554 Leuchtklotz.o
 
-.debug_frame    0x00000000      0x1a4
+.debug_frame    0x00000000      0x1dc
  *(.debug_frame)
- .debug_frame   0x00000000      0x1a4 Leuchtklotz.o
+ .debug_frame   0x00000000      0x1dc Leuchtklotz.o
 
 .debug_str      0x00000000      0x1cf
  *(.debug_str)
  .debug_str     0x00000000      0x1cf Leuchtklotz.o
                                 0x203 (size before relaxing)
 
-.debug_loc      0x00000000      0x767
+.debug_loc      0x00000000      0x847
  *(.debug_loc)
- .debug_loc     0x00000000      0x767 Leuchtklotz.o
+ .debug_loc     0x00000000      0x847 Leuchtklotz.o
 
 .debug_macinfo
  *(.debug_macinfo)
diff --git a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.srec b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.srec
index fe1199f..0906652 100644
--- a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.srec
+++ b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.srec
@@ -45,5 +45,5 @@ S11302A02C2F30E044E050E066E070E08FE090E016
 S11302B0FBDE2C2F30E045E050E064E070E08FE09E
 S11302C090E0F2DE2C2F30E041E050E065E070E099
 S11302D08FE090E0E9DECF9108958FE387BB81BB87
-S11102E0B7DF40DF82E3BFDFFDCFF894FFCF2E
+S11102E0B7DF40DF84E6BFDFFDCFF894FFCF29
 S9030000FC
diff --git a/Leuchtklotz/Leuchtklotz/Leuchtklotz.c b/Leuchtklotz/Leuchtklotz/Leuchtklotz.c
index a77e1ea..cbedb09 100644
--- a/Leuchtklotz/Leuchtklotz/Leuchtklotz.c
+++ b/Leuchtklotz/Leuchtklotz/Leuchtklotz.c
@@ -138,23 +138,32 @@ void programRainbow(uint8_t t)
 
 void programWarnYellow(void) 
 {
-		ledg(LED1,YELLOW);
-		_delay_ms(100);
-		ledg(LED1,BLACK);
-		ledg(LED2,YELLOW);
-		_delay_ms(100);
-		ledg(LED2,BLACK);
-		ledg(LED3,YELLOW);
-		_delay_ms(100);
-		ledg(LED3,BLACK);
-		ledg(LED4,YELLOW);
-		_delay_ms(100);
-		ledg(LED4,BLACK);
+	uint8_t t = 1;
+	for(uint8_t j=1;j<8;j++){
+		for(uint8_t i=0;i<4;i++) {
+			fade((1<<i),BLACK,j,t);
+			fade((1<<i),j,BLACK,t);
+		}		
+	}		
 }
 
 void programCop(void) 
 {
-		for (int i=0;i<80;i++)
+	_delay_ms(300);
+	for(uint8_t i=0;i<3;i++) {
+		ledg(LED4|LED3,RED);
+		_delay_ms(40);
+		ledg(LED4|LED3,BLACK);
+		_delay_ms(40);
+	}		
+	_delay_ms(300);
+	for(uint8_t i=0;i<3;i++) {
+		ledg(LED2|LED1,BLUE);
+		_delay_ms(40);
+		ledg(LED2|LED1,BLACK);
+		_delay_ms(40);
+	}
+		/*for (int i=0;i<80;i++)
 		{
 			rgbl(LED4, 0, 50, 200);
 		}
@@ -201,7 +210,7 @@ void programCop(void)
 		for (int i=0;i<80;i++)
 		{
 			rgbl(LED2, 0, 0, 0);
-		}
+		}*/
 }
 #define WAIT_WARN_BLINK 40
 void programWarnBlink(void) 
@@ -315,7 +324,7 @@ int main(void)
     {
 		//programWarnBlink();
 		//programColorFull();
-		programRainbow(50);
+		programRainbow(100);
 		//programWarnYellow();
 		//programCop();
 		//programHacker();