diff --git a/B15F.elf b/B15F.elf index 5b9b132..390edce 100644 Binary files a/B15F.elf and b/B15F.elf differ diff --git a/B15F.hex b/B15F.hex index f6ef084..c92ba99 100644 --- a/B15F.hex +++ b/B15F.hex @@ -1,145 +1,143 @@ :100000000C945D000C9487000C9487000C9487007E :100010000C9487000C9487000C9487000C94870044 -:100020000C9489000C9487000C9487000C94870032 +:100020000C9487000C9487000C9487000C94870034 :100030000C9487000C9487000C9487000C94870024 :100040000C9487000C9487000C9487000C94870014 :100050000C9487000C9487000C9487000C94870004 :100060000C9487000C9487000C9487000C948700F4 :100070000C9487000C9487000C9487000C948700E4 -:100080000C9487000C9487000C948700E600E8002D -:10009000EA00E100EC00EE00F000F200F400F600EF -:1000A000F80040043C0438041E04340430042C04DA -:1000B0002804240420041C04440411241FBECFEF90 -:1000C000D0E4DEBFCDBF11E0A0E0B1E0ECEEF8E09F +:100080000C9487000C9487000C948700E700E9002B +:10009000EB00E200ED00EF00F100F300F500F700E7 +:1000A000F9002D042A042704F103240421041E046A +:1000B0001B04180415043004330411241FBECFEFB1 +:1000C000D0E4DEBFCDBF11E0A0E0B1E0EAECF8E0A3 :1000D00000E00BBF02C007900D92A230B107D9F724 :1000E00021E0A2E0B1E001C01D92A431B207E1F726 -:1000F00010E0CDE5D0E004C02197FE010E946B0422 -:10010000CC35D107C9F70E94EB030C9474040C940E -:1001100000001F920F920FB60F9211240BB60F9290 -:100120008F93EF93FF93E0E6F0E08081806480831B -:10013000FF91EF918F910F900BBE0F900FBE0F901C -:100140001F90189580E4809360009EE088E10FB6D0 -:10015000F894A895809360000FBE90936000A895D6 -:1001600083E191E00E94FB0060E080E191E00E9469 -:100170003E016FEF80E191E00E945F0160E08DE061 -:1001800091E00E943E016FEF8DE091E00E945F01DF -:100190006FEF8AE091E00E945F0183E091E00E94AE -:1001A000340282E091E00E942C037894089582E06A -:1001B00091E00E94480390E0FC013197EB30F1059B -:1001C00008F00895EA5BFF4F0C946B040C946003F5 -:1001D0000C9471030C9472030C947F030C9492039F -:1001E0000C94A5030C94AE030C94B7030C94CA03AF -:1001F0000C94DD03089584B1806B84B926988AB18C -:100200008C618AB980E58CBD81E08DBD8BB1837E28 -:100210008BB95A9A5B9A5C9A08958BB1837E8BB99D -:100220008BB160FD10C090E0892B8BB98BB161FD63 -:1002300010C090E0892B8BB98BB162FD10C090E0AB -:10024000892B8BB9089594E0892B8BB98BB161FF11 -:10025000F0CF98E0892B8BB98BB162FFF0CF90E1A2 -:10026000892B8BB908956EBD0DB407FEFDCF8EB5F9 -:100270000895FC0171836083428308951F93CF9397 -:10028000DF93EC01162F6A81888199810E940D010C -:1002900060E4888199810E94330160E088819981BE -:1002A0000E943301612F888199810E94330167E0A8 -:1002B00088819981DF91CF911F910C940D011F933B -:1002C000CF93DF93EC01162F6A81888199810E9478 -:1002D0000D0160E4888199810E94330161E0888189 -:1002E00099810E943301612F888199810E94330195 -:1002F00067E088819981DF91CF911F910C940D0166 -:100300001F93CF93DF93EC01162F6A818881998127 -:100310000E940D0160E4888199810E94330162E1AD -:10032000888199810E943301612F888199810E947F -:10033000330167E088819981DF91CF911F910C94FF -:100340000D011F93CF93DF93EC01162F6A818881F3 -:1003500099810E940D0160E4888199810E94330196 -:1003600063E1888199810E943301612F888199819D -:100370000E94330167E088819981DF91CF911F91BD -:100380000C940D011F93CF93DF93EC016A81888158 -:1003900099810E940D0161E4888199810E94330155 -:1003A00062E1888199810E94330160E088819981AE -:1003B0000E943301182F67E0888199810E940D0106 -:1003C000812FDF91CF911F9108951F93CF93DF93DA -:1003D000EC016A81888199810E940D0161E4888124 -:1003E00099810E94330163E1888199810E943301E0 -:1003F00060E0888199810E943301182F67E088812D -:1004000099810E940D01812FDF91CF911F91089555 -:10041000FC01428308950F931F93CF93DF93EC0168 -:100420008B016A81888199810E940D01B8010024A5 -:10043000660F771F001C660F771F001C672F702D3B -:10044000888199810E943301602F660F660F888131 -:1004500099810E94330167E088819981DF91CF9172 -:100460001F910F910C940D0110927C0087E88093EE -:100470007A00089580917C00807E682B60937C00D8 -:1004800080917A00806480937A0083EA91E00197FA -:10049000F1F700C0000080917A0086FDFCCF8091CA -:1004A00078009091790008950F931F93CF93DF9375 -:1004B00061E080E191E00E948001C1E0D0E001E0D4 -:1004C00010E02FEF84E39CE0215080409040E1F762 -:1004D00000C00000B8010C2E01C0660F0A94EAF7B4 -:1004E00080E191E00E9480012196C930D10549F751 -:1004F000DF91CF911F910F9108950F931F93CF9389 -:10050000DF9361E08DE091E00E948001C1E0D0E0E6 -:1005100001E010E02FEF84E39CE021508040904008 -:10052000E1F700C00000B8010C2E01C0660F0A946C -:10053000EAF78DE091E00E9480012196C930D10553 -:1005400049F7DF91CF911F910F910895CF93DF93DA -:10055000C0E0D0E0BE0187E091E00E940B0287E896 -:1005600093E10197F1F700C000002196C11594E0D6 -:10057000D90781F72FE78AE196E02150804090402B -:10058000E1F700C0000060E070E087E091E0DF91FB -:10059000CF910C940B02CF93DF93C0E0D0E0BE016B -:1005A00084E091E00E940B0287E893E10197F1F764 -:1005B00000C000002196C11594E0D90781F72FE70C -:1005C0008AE196E0215080409040E1F700C00000B1 -:1005D00060E070E084E091E0DF91CF910C940B0239 -:1005E0000FB6F894A89580916000886180936000B0 -:1005F000109260000FBE60E083E091E00E943A023A -:10060000BC0187E091E00E940B0261E083E091E091 -:100610000E943A02BC0184E091E00E940B0280E15A -:1006200091E00E94E501682F80E191E00E94800145 -:100630008AE091E00E94E501682F8DE091E00E9440 -:100640008001D9CF0E9454020E947D020E94A6021E -:100650000E94CB020E94F00288E18093C10086E0F4 -:100660008093C2001092C5008FE18093C40008956A -:100670006093C6008091C00086FFFCCF0895609310 -:10068000C6007093C6008091C00086FFFCCF08951D -:100690008091C00087FFFCCF8091C60008958091B3 -:1006A000C00087FFFCCF2091C60030E09091C000D1 -:1006B00097FFFCCF8091C600A901582BCA0108956D -:1006C000CF9382E091E00E944803C82F6FEF82E051 -:1006D00091E00E9438036C2F82E091E0CF910C945E -:1006E0003803089582E091E00E944F03BC01660F39 -:1006F000771F680F791F82E091E00C943F0382E03E -:1007000091E00E944803682F80E191E00E948001FF -:1007100080910001811101C008956FEF82E091E0A6 -:100720000C94380382E091E00E944803682F8DE02A -:1007300091E00E94800180910001811101C0089523 -:100740006FEF82E091E00C94380380E191E00E9429 -:10075000E501682F82E091E00C9438038DE091E090 -:100760000E94E501682F82E091E00C94380382E05A -:1007700091E00E944F03BC0187E091E00E940B02D0 -:1007800080910001811101C008956FEF82E091E036 -:100790000C94380382E091E00E944F03BC0184E096 -:1007A00091E00E940B0280910001811101C0089527 -:1007B0006FEF82E091E00C94380382E091E00E94B8 -:1007C0004803682F83E091E00E943A02BC0182E076 -:1007D00091E00C943F030E94A200C3E0D0E06FEFD1 -:1007E00080E191E00E9480012FE78AE196E02150AC -:1007F00080409040E1F700C0000060E080E191E0BF -:100800000E9480012FE78AE196E0215080409040CD -:10081000E1F700C00000A895219709F782E091E078 -:100820000E94480390E0FC013197EB30F10530F471 -:10083000EF5AFF4F0C946B040E94DD03A895EECF96 -:100840000E94CA03A895EACF0E94B703A895E6CFF5 -:100850000E94AE03A895E2CF0E94A503A895DECF23 -:100860000E949203A895DACF0E947F03A895D6CF65 -:100870000E947203A895D2CF0E947103A895CECF93 -:100880000E946003A895CACF83E191E00E94FA001C -:1008900042E063E171E080E191E00E94390143E0D0 -:1008A00063E171E08DE091E00E94390145E063E190 -:1008B00071E08AE091E00E94390140E063E171E07B -:1008C00087E091E00E94080241E063E171E084E08A -:1008D00091E00C940802EE0FFF1F0024001C0BBED9 -:0C08E0000790F691E02D0994F894FFCFEA -:0208EC00010009 +:1000F00010E0CDE5D0E004C02197FE010E945A0433 +:10010000CC35D107C9F70E94EC030C9463040C941E +:100110000000109260000FB6F894A89580916000DE +:10012000886180936000109260000FBE83E191E0CF +:100130000E94FC0060E080E191E00E943F016FEFCF +:1001400080E191E00E94600160E08DE091E00E941A +:100150003F016FEF8DE091E00E9460016FEF8AE058 +:1001600091E00E94600183E091E00E94350282E00C +:1001700091E00E942D03789408950FB6F894A89505 +:1001800080916000886180936000109260000FBED3 +:1001900082E091E00E944903E82F98E088E10FB6E1 +:1001A000F894A895809360000FBE9093600080E45F +:1001B00080936000A8958E2F90E0FC013197EB3082 +:1001C000F10508F00895EA5BFF4F0C945A040C9473 +:1001D00061030C9472030C9473030C9480030C94CD +:1001E00093030C94A6030C94AF030C94B8030C94E3 +:1001F000CB030C94DE03089584B1806B84B92698F8 +:100200008AB18C618AB980E58CBD81E08DBD8BB1EE +:10021000837E8BB95A9A5B9A5C9A08958BB1837EE0 +:100220008BB98BB160FD10C090E0892B8BB98BB17D +:1002300061FD10C090E0892B8BB98BB162FD10C0BD +:1002400090E0892B8BB9089594E0892B8BB98BB101 +:1002500061FFF0CF98E0892B8BB98BB162FFF0CFB3 +:1002600090E1892B8BB908956EBD0DB407FEFDCFCB +:100270008EB50895FC0171836083428308951F93B6 +:10028000CF93DF93EC01162F6A81888199810E94B8 +:100290000E0160E4888199810E94340160E08881C8 +:1002A00099810E943401612F888199810E943401D3 +:1002B00067E088819981DF91CF911F910C940E01A5 +:1002C0001F93CF93DF93EC01162F6A818881998168 +:1002D0000E940E0160E4888199810E94340161E0EE +:1002E000888199810E943401612F888199810E94BF +:1002F000340167E088819981DF91CF911F910C943F +:100300000E011F93CF93DF93EC01162F6A81888132 +:1003100099810E940E0160E4888199810E943401D4 +:1003200062E1888199810E943401612F88819981DD +:100330000E94340167E088819981DF91CF911F91FC +:100340000C940E011F93CF93DF93EC01162F6A815B +:10035000888199810E940E0160E4888199810E94C0 +:10036000340163E1888199810E943401612F888181 +:1003700099810E94340167E088819981DF91CF9152 +:100380001F910C940E011F93CF93DF93EC016A81B0 +:10039000888199810E940E0161E4888199810E947F +:1003A000340162E1888199810E94340160E0888192 +:1003B00099810E943401182F67E0888199810E94F9 +:1003C0000E01812FDF91CF911F9108951F93CF933D +:1003D000DF93EC016A81888199810E940E0161E4BA +:1003E000888199810E94340163E1888199810E940A +:1003F000340160E0888199810E943401182F67E000 +:10040000888199810E940E01812FDF91CF911F91E8 +:100410000895FC01428308950F931F93CF93DF93B8 +:10042000EC018B016A81888199810E940E01B801DB +:100430000024660F771F001C660F771F001C672FB4 +:10044000702D888199810E943401602F660F660F9C +:10045000888199810E94340167E088819981DF91C8 +:10046000CF911F910F910C940E0110927C0087E8A0 +:1004700080937A00089580917C00807E682B609341 +:100480007C0080917A00806480937A0083EA91E016 +:100490000197F1F700C0000080917A0086FDFCCF43 +:1004A000809178009091790008950F931F93CF93D6 +:1004B000DF9361E080E191E00E948101C1E0D0E042 +:1004C00001E010E02FEF84E39CE021508040904059 +:1004D000E1F700C00000B8010C2E01C0660F0A94BD +:1004E000EAF780E191E00E9481012196C930D105AF +:1004F00049F7DF91CF911F910F9108950F931F93AB +:10050000CF93DF9361E08DE091E00E948101C1E033 +:10051000D0E001E010E02FEF84E39CE02150804028 +:100520009040E1F700C00000B8010C2E01C0660F3A +:100530000A94EAF78DE091E00E9481012196C9308A +:10054000D10549F7DF91CF911F910F910895CF9376 +:10055000DF93C0E0D0E0BE0187E091E00E940C0292 +:1005600087E893E10197F1F700C000002196C115DB +:1005700094E0D90781F72FE78AE196E02150804087 +:100580009040E1F700C0000060E070E087E091E09B +:10059000DF91CF910C940C02CF93DF93C0E0D0E0B9 +:1005A000BE0184E091E00E940C0287E893E101978C +:1005B000F1F700C000002196C11594E0D90781F73A +:1005C0002FE78AE196E0215080409040E1F700C09B +:1005D000000060E070E084E091E0DF91CF910C9446 +:1005E0000C020FB6F894A895809160008861809302 +:1005F0006000109260000FBE60E083E091E00E9416 +:100600003B02BC0187E091E00E940C0261E083E0C4 +:1006100091E00E943B02BC0184E091E00E940C0248 +:1006200080E191E00E94E601682F80E191E00E9464 +:1006300081018AE091E00E94E601682F8DE091E05F +:100640000E948101D9CF0E9455020E947E020E9421 +:10065000A7020E94CC020E94F10288E18093C100AF +:1006600086E08093C2001092C5008FE18093C400A1 +:1006700008956093C6008091C00086FFFCCF089566 +:100680006093C6007093C6008091C00086FFFCCFC7 +:1006900008958091C00087FFFCCF8091C600089527 +:1006A0008091C00087FFFCCF2091C60030E0909180 +:1006B000C00097FFFCCF8091C600A901582BCA014A +:1006C0000895CF9382E091E00E944903C82F6FEF15 +:1006D00082E091E00E9439036C2F82E091E0CF919B +:1006E0000C943903089582E091E00E945003BC010C +:1006F000660F771F680F791F82E091E00C9440032A +:1007000082E091E00E944903682F80E191E00E941D +:10071000810180910001811101C008956FEF82E095 +:1007200091E00C94390382E091E00E944903682F24 +:100730008DE091E00E94810180910001811101C052 +:1007400008956FEF82E091E00C94390380E191E02D +:100750000E94E601682F82E091E00C9439038DE05D +:1007600091E00E94E601682F82E091E00C94390349 +:1007700082E091E00E945003BC0187E091E00E947A +:100780000C0280910001811101C008956FEF82E099 +:1007900091E00C94390382E091E00E945003BC0187 +:1007A00084E091E00E940C0280910001811101C05F +:1007B00008956FEF82E091E00C94390382E091E0BC +:1007C0000E944903682F83E091E00E943B02BC0134 +:1007D00082E091E00C9440030E94890018E1D8E087 +:1007E000C0E40FB6F894A89580916000886180936A +:1007F0006000109260000FBE82E091E00E94490309 +:100800000FB6F894A895109360000FBED0936000C7 +:10081000C0936000A89590E0FC013197EB30F105A2 +:1008200000F7EF5AFF4F0C945A040E94CB03D9CF24 +:100830000E94B803D6CF0E94AF03D3CF0E94A60375 +:10084000D0CF0E949303CDCF0E948003CACF0E94D5 +:100850007303C7CF0E947203C4CF0E946103C1CF4C +:100860000E94DE03BECF83E191E00E94FB0042E0E4 +:1008700063E171E080E191E00E943A0143E063E1CD +:1008800071E08DE091E00E943A0145E063E171E0A2 +:100890008AE091E00E943A0140E063E171E087E084 +:1008A00091E00E94090241E063E171E084E091E09F +:1008B0000C940902EE0FFF1F0024001C0BBE0790D2 +:0A08C000F691E02D0994F894FFCFA3 +:0208CA0001002B :00000001FF diff --git a/main.cpp b/main.cpp index 0759438..c583d18 100644 --- a/main.cpp +++ b/main.cpp @@ -7,20 +7,19 @@ #include "requests.h" +#define WDT_TIMEOUT WDTO_15MS - +/* ISR(WDT_vect) { WDTCSR |= _BV(WDIE); -} +}*/ void initAll() { - // Konfiguriere WDT - WDTCSR = _BV(WDIE); - wdt_enable(WDTO_1S); - wdt_reset(); - //wdt_disable(); + // deaktiviere WDT, da er bei Neustart erhalten bleiben kann + WDTCSR = 0; + wdt_disable(); spi.init(); @@ -39,7 +38,15 @@ void initAll() void handleRequest() { + // stoppe WDT + wdt_disable(); + const uint8_t req = usart.readByte(); + + // starte WDT + wdt_enable(WDT_TIMEOUT); + WDTCSR = _BV(WDIE); + wdt_reset(); switch(req) { @@ -96,7 +103,9 @@ int main() initAll(); + // DEBUGGING, spaeter entfernen! + /* for(int i = 0; i < 3; i++) { beba0.writePortA(0xFF); @@ -104,12 +113,11 @@ int main() beba0.writePortA(0x00); _delay_ms(100); wdt_reset(); - } + }*/ while(1) { handleRequest(); - wdt_reset(); } return 0;