watchdog zuverlaessig

B15F.hex

@@ -1,165 +1,166 @@
-:100000000C9461000C948B000C948B000C948B006E
+:100000000C945F000C9489000C9489000C94890076
-:100010000C948B000C948B000C948B000C948B0034
+:100010000C9489000C9489000C9489000C9489003C
-:100020000C948D000C948B000C948B000C948B0022
+:100020000C9489000C9489000C9489000C9489002C
-:100030000C948B000C948B000C948B000C948B0014
+:100030000C9489000C9489000C9489000C9489001C
-:100040000C948B000C948B000C948B000C948B0004
+:100040000C9489000C9489000C9489000C9489000C
-:100050000C948B000C948B000C948B000C948B00F4
+:100050000C9489000C9489000C9489000C948900FC
-:100060000C948B000C948B000C948B000C948B00E4
+:100060000C9489000C9489000C9489000C948900EC
-:100070000C948B000C948B000C948B000C948B00D4
+:100070000C9489000C9489000C9489000C948900DC
-:100080000C948B000C948B000C948B00E000EB0024
+:100080000C9489000C9489000C948900E900EB0021
-:10009000ED00EF00DA00F100F300F500F700F900E1
+:10009000ED00E400EF00F100F300F500F700F900D7
-:1000A000FB00FD00FF00CA04C704C404C1049B0494
+:1000A000FB00FD00D804D504D2049B04CF04CC048B
-:1000B000BE04BB04B804B504B204AF04AC04A90484
+:1000B000C904C604C304C004BD04DB04DE04112467
-:1000C000D50411241FBECFEFD0E4DEBFCDBF11E0B9
+:1000C0001FBECFEFD0E4DEBFCDBF11E0A0E0B1E0B6
-:1000D000A0E0B1E0EEE0FAE000E00BBF02C0079064
+:1000D000E0E2FAE000E00BBF02C007900D92A2320E
-:1000E0000D92A432B107D9F721E0A4E2B1E001C03A
+:1000E000B107D9F721E0A2E2B1E001C01D92A4332B
-:1000F0001D92A633B207E1F710E0C1E6D0E004C0DC
+:1000F000B207E1F710E0CFE5D0E004C02197FE01A0
-:100100002197FE010E94FC04C036D107C9F70E9466
+:100100000E940505CE35D107C9F70E9497040C94CB
-:1001100099040C9405050C9400001F920F920FB6E1
+:100110000E050C94000083E391E00E94000160E072
-:100120000F9211248F9388E4809360008F910F9039
+:1001200080E391E00E9443016FEF80E391E00E9441
-:100130000FBE0F901F90189585E391E00E94020179
+:10013000640160E08DE291E00E9443016FEF8DE287
-:1001400060E082E391E00E9445016FEF82E391E07D
+:1001400091E00E9464016FEF8AE291E00E946401F5
-:100150000E94660160E08FE291E00E9445016FEF2E
+:1001500083E291E00E943B0282E291E00E9433033D
-:100160008FE291E00E9466016FEF8CE291E00E94C5
+:10016000789484B7877F84BF109260000FB6F894AC
-:10017000660185E291E00E943D0284E291E00E94E6
+:10017000A895809160008861809360001092600073
-:100180003503789498E088E10FB6F894A8958093A9
+:100180000FBE08950FB6F894A8958091600088611D
-:1001900060000FBE9093600088E480936000A89593
+:1001900080936000109260000FBE82E291E00E94A6
-:1001A000089584E291E00E946D03A89590E08D305F
+:1001A0006B03E82F98E088E10FB6F894A895809348
-:1001B000910508F00895FC01EA5BFF4F0C94FC04E4
+:1001B00060000FBE90936000A8958E2F90E0FC0128
-:1001C0008091C00087FFF6CF8091C6008091C0006B
+:1001C0003197EC30F10508F00895EA5BFF4F0C948D
-:1001D00087FDFACF08950C9485030C9496030C9434
+:1001D00005050C9483030C9494030C94B8030C94BD
-:1001E000BA030C94C7030C94DA030C94ED030C943B
+:1001E000C5030C94D8030C94EB030C94F4030C9407
-:1001F000F6030C94FF030C9412040C9425040C9445
+:1001F000FD030C9410040C9423040C943104089512
-:100200003304089584B1806B84B926988AB18C61D7
+:1002000084B1806B84B926988AB18C618AB980E503
-:100210008AB980E58CBD81E08DBD8BB1837E8BB9C1
+:100210008CBD81E08DBD8BB1837E8BB95A9A5B9A80
-:100220005A9A5B9A5C9A08958BB1837E8BB98BB195
+:100220005C9A08958BB1837E8BB98BB160FD10C051
-:1002300060FD10C090E0892B8BB98BB161FD10C0BF
+:1002300090E0892B8BB98BB161FD10C090E0892BC8
-:1002400090E0892B8BB98BB162FD10C090E0892BB7
+:100240008BB98BB162FD10C090E0892B8BB90895FA
-:100250008BB9089594E0892B8BB98BB161FFF0CFF6
+:1002500094E0892B8BB98BB161FFF0CF98E0892BAB
-:1002600098E0892B8BB98BB162FFF0CF90E1892B9D
+:100260008BB98BB162FFF0CF90E1892B8BB90895E8
-:100270008BB908956EBD0DB407FEFDCF8EB5089500
+:100270006EBD0DB407FEFDCF8EB50895FC017183F0
-:10028000FC0171836083428308951F93CF93DF93B2
+:100280006083428308951F93CF93DF93EC01162F71
-:10029000EC01162F6A81888199810E94140160E423
+:100290006A81888199810E94120160E48881998134
-:1002A000888199810E943A0160E0888199810E9449
+:1002A0000E94380160E0888199810E943801612FA5
-:1002B0003A01612F888199810E943A0167E0888123
+:1002B000888199810E94380167E088819981DF9166
-:1002C0009981DF91CF911F910C9414011F93CF93CB
+:1002C000CF911F910C9412011F93CF93DF93EC01F8
-:1002D000DF93EC01162F6A81888199810E941401B5
+:1002D000162F6A81888199810E94120160E48881C9
-:1002E00060E4888199810E943A0161E08881998166
+:1002E00099810E94380161E0888199810E943801DA
-:1002F0000E943A01612F888199810E943A0167E04A
+:1002F000612F888199810E94380167E08881998106
-:1003000088819981DF91CF911F910C9414011F93E3
+:10030000DF91CF911F910C9412011F93CF93DF9334
-:10031000CF93DF93EC01162F6A81888199810E9427
+:10031000EC01162F6A81888199810E94120160E4A4
-:10032000140160E4888199810E943A0162E1888128
+:10032000888199810E94380162E1888199810E94C7
-:1003300099810E943A01612F888199810E943A0136
+:100330003801612F888199810E94380167E08881A6
-:1003400067E088819981DF91CF911F910C9414010E
+:100340009981DF91CF911F910C9412011F93CF934C
-:100350001F93CF93DF93EC01162F6A8188819981D7
+:10035000DF93EC01162F6A81888199810E94120136
-:100360000E94140160E4888199810E943A0163E14E
+:1003600060E4888199810E94380163E188819981E4
-:10037000888199810E943A01612F888199810E9428
+:100370000E943801612F888199810E94380167E0CD
-:100380003A0167E088819981DF91CF911F910C94A8
+:1003800088819981DF91CF911F910C9412011F9365
-:1003900014011F93CF93DF93EC016A8188819981C7
+:10039000CF93DF93EC016A81888199810E941201D9
-:1003A0000E94140161E4888199810E943A0162E10E
+:1003A00061E4888199810E94380162E188819981A4
-:1003B000888199810E943A0160E0888199810E9438
+:1003B0000E94380160E0888199810E943801182FDD
-:1003C0003A01182F67E0888199810E941401812FDA
+:1003C00067E0888199810E941201812FDF91CF918E
-:1003D000DF91CF911F9108951F93CF93DF93EC018D
+:1003D0001F9108951F93CF93DF93EC016A81888169
-:1003E0006A81888199810E94140161E488819981E0
+:1003E00099810E94120161E4888199810E943801FB
-:1003F0000E943A0163E1888199810E943A0160E09C
+:1003F00063E1888199810E94380160E08881998158
-:10040000888199810E943A01182F67E0888199813B
+:100400000E943801182F67E0888199810E941201AB
-:100410000E941401812FDF91CF911F910895FC015B
+:10041000812FDF91CF911F910895FC01718360833B
-:1004200071836083428308950F931F93CF93DF936B
+:10042000428308950F931F93CF93DF93EC018B01C9
-:10043000EC018B016A81888199810E941401B801C5
+:100430006A81888199810E941201B8010024660FA7
-:100440000024660F771F001C660F771F001C672FA4
+:10044000771F001C660F771F001C672F702D888197
-:10045000702D888199810E943A01602F660F660F86
+:1004500099810E943801602F660F660F888199810B
-:10046000888199810E943A0167E088819981DF91B2
+:100460000E94380167E088819981DF91CF911F91C7
-:10047000CF911F910F910C94140110927C0087E88A
+:100470000F910C94120110927C0087E880937A000F
-:1004800080937A00089580917C00807E682B609331
+:10048000089580917C00807E682B60937C00809131
-:100490007C0080917A00806480937A0083EA91E006
+:100490007A00806480937A0083EA91E00197F1F713
-:1004A0000197F1F700C0000080917A0086FDFCCF33
+:1004A00000C0000080917A0086FDFCCF809178002A
-:1004B000809178009091790008950F931F93CF93C6
+:1004B0009091790008950F931F93CF93DF9361E09C
-:1004C000DF9361E082E391E00E948701C1E0D0E028
+:1004C00080E391E00E948501C1E0D0E001E010E00E
-:1004D00001E010E02FEF84E39CE021508040904049
+:1004D0002FEF84E39CE0215080409040E1F700C082
-:1004E000E1F700C00000B8010C2E01C0660F0A94AD
+:1004E0000000B8010C2E01C0660F0A94EAF780E301
-:1004F000EAF782E391E00E9487012196C930D10595
+:1004F00091E00E9485012196C930D10549F7DF912D
-:1005000049F7DF91CF911F910F9108950F931F939A
+:10050000CF911F910F9108950F931F93CF93DF9376
-:10051000CF93DF9361E08FE291E00E948701C1E019
+:1005100061E08DE291E00E948501C1E0D0E001E060
-:10052000D0E001E010E02FEF84E39CE02150804018
+:1005200010E02FEF84E39CE0215080409040E1F701
-:100530009040E1F700C00000B8010C2E01C0660F2A
+:1005300000C00000B8010C2E01C0660F0A94EAF753
-:100540000A94EAF78FE291E00E9487012196C93070
+:100540008DE291E00E9485012196C930D10549F7DD
-:10055000D10549F7DF91CF911F910F910895CF9366
+:10055000DF91CF911F910F910895CF93DF93C0E06A
-:10056000DF93C0E0D0E0BE0189E291E00E94140276
+:10056000D0E0BE0187E291E00E94120287E893E1A9
-:1005700087E893E10197F1F700C000002196C115CB
+:100570000197F1F700C000002196C11594E0D9075A
-:1005800094E0D90781F72FE78AE196E02150804077
+:1005800081F72FE78AE196E0215080409040E1F723
-:100590009040E1F700C0000060E070E089E291E087
+:1005900000C0000060E070E087E291E0DF91CF9161
-:1005A000DF91CF910C941402CF93DF93C0E0D0E0A1
+:1005A0000C941202CF93DF93C0E0D0E0BE0184E24E
-:1005B000BE0186E291E00E94140287E893E1019770
+:1005B00091E00E94120287E893E10197F1F700C0F1
-:1005C000F1F700C000002196C11594E0D90781F72A
+:1005C00000002196C11594E0D90781F72FE78AE151
-:1005D0002FE78AE196E0215080409040E1F700C08B
+:1005D00096E0215080409040E1F700C0000060E0CC
-:1005E000000060E070E086E291E0DF91CF910C9432
+:1005E00070E084E291E0DF91CF910C9412020FB69B
-:1005F00014020FB6F894A8958091600088618093EA
+:1005F000F894A895809160008861809360001092C3
-:100600006000109260000FBE60E085E291E00E9401
+:1006000060000FBE60E083E291E00E944102BC0105
-:100610004302BC0189E291E00E94140261E085E29C
+:1006100087E291E00E94120261E083E291E00E9491
-:1006200091E00E944302BC0186E291E00E94140224
+:100620004102BC0184E291E00E94120280E391E069
-:1006300082E391E00E94EC01682F82E391E00E9446
+:100630000E94EA01682F80E391E00E9485018AE22E
-:1006400087018CE291E00E94EC01682F8FE291E03B
+:1006400091E00E94EA01682F8DE291E00E9485010D
-:100650000E948701D9CF0E945D020E9486020E94FB
+:10065000D9CF0E945B020E9484020E94AD020E94D8
-:10066000AF020E94D4020E94F90282E08093C0008F
+:10066000D2020E94F70282E08093C00088E180936A
-:1006700088E18093C10086E08093C2001092C5009B
+:10067000C10086E08093C2001092C50080E48093A0
-:1006800084E18093C40008958091C00085FFFCCF71
+:10068000C40008958091C00085FFFCCF6093C60030
-:100690006093C60008958091C00085FFFCCF6093F1
+:1006900008958091C00085FFFCCF6093C6008091D3
-:1006A000C6008091C00085FFFCCF7093C6000895FE
+:1006A000C00085FFFCCF7093C60008958091C00004
-:1006B0008091C00085FFFCCF4093C6009FEF940F50
+:1006B00085FFFCCF4093C6009FEF940F442351F079
-:1006C000442351F0FB0121918091C00085FFFCCFB4
+:1006C000FB0121918091C00085FFFCCF2093C600E3
-:1006D0002093C6009150B8F708958091C00087FF1D
+:1006D0009150B8F708958091C00087FFFCCF8091BA
-:1006E000FCCF8091C60008958091C00087FFFCCFA9
+:1006E000C60008958091C00087FFFCCF2091C6000E
-:1006F0002091C60030E09091C00097FFFCCF809120
+:1006F00030E09091C00097FFFCCF8091C600A90127
-:10070000C600A901582BCA010895CF9384E291E055
+:10070000582BCA010895CF9382E291E00E946B03B7
-:100710000E946D03C82F6FEF84E291E00E944403B2
+:10071000C82F6FEF82E291E00E9442036C2F82E2C9
-:100720006C2F84E291E0CF910C94440363E084E267
+:1007200091E0CF910C94420363E082E291E00E9459
-:1007300091E00E9444034CE067E171E084E291E0C3
+:1007300042034CE066E171E082E291E00E945603E0
-:100740000E94580349E06EE071E084E291E00E946B
+:1007400049E06DE071E082E291E00E9456034CE0E6
-:1007500058034CE062E071E084E291E00E945803AB
+:1007500061E071E082E291E00E9456038091000125
-:1007600080910001811101C008956FEF84E291E052
+:10076000811101C008956FEF82E291E00C94420381
-:100770000C94440384E291E00E947403BC01660F70
+:1007700082E291E00E947203BC01660F771F680F4E
-:10078000771F680F791F84E291E00C944B0384E299
+:10078000791F82E291E00C94490382E291E00E9499
-:1007900091E00E946D03682F82E391E00E9487013F
+:100790006B03682F80E391E00E9485018091000146
-:1007A00080910001811101C008956FEF84E291E012
+:1007A000811101C008956FEF82E291E00C94420341
-:1007B0000C94440384E291E00E946D03682F8FE261
+:1007B00082E291E00E946B03682F8DE291E00E943B
-:1007C00091E00E94870180910001811101C008958C
+:1007C000850180910001811101C008956FEF82E2DF
-:1007D0006FEF84E291E00C94440382E391E00E9485
+:1007D00091E00C94420380E391E00E94EA01682FCB
-:1007E000EC01682F84E291E00C9444038FE291E0E5
+:1007E00082E291E00C9442038DE291E00E94EA01E2
-:1007F0000E94EC01682F84E291E00C94440384E2AF
+:1007F000682F82E291E00C94420382E291E00E9431
-:1008000091E00E947403BC0189E291E00E9414020D
+:100800007203BC0187E291E00E9412028091000114
-:1008100080910001811101C008956FEF84E291E0A1
+:10081000811101C008956FEF82E291E00C944203D0
-:100820000C94440384E291E00E947403BC0186E2CC
+:1008200082E291E00E947203BC0184E291E00E94A6
-:1008300091E00E94140280910001811101C008958D
+:10083000120280910001811101C008956FEF82E2E0
-:100840006FEF84E291E00C94440384E291E00E9413
+:1008400091E00C94420382E291E00E946B03682FD6
-:100850006D03682F85E291E00E944302BC0184E2AF
+:1008500083E291E00E944102BC0182E291E00C94AB
-:1008600091E00C944B038F929F92AF92BF92CF92E4
+:1008600049038F929F92AF92BF92CF92DF92EF9205
-:10087000DF92EF92FF920F931F93CF93DF9384E267
+:10087000FF920F931F93CF93DF9382E291E00E9448
-:1008800091E00E946D03882E84E291E00E946D0346
+:100880006B03882E82E291E00E946B03982E82E235
-:10089000982E84E291E00E947403EC0184E291E0DE
+:1008900091E00E947203EC0182E291E00E947203F7
-:1008A0000E9474035C0184E291E00E9474038C0155
+:1008A0005C0182E291E00E9472038C016FEF82E2B0
-:1008B0006FEF84E291E00E944403A09E6001A19E3C
+:1008B00091E00E944203A09E6001A19ED00CB09ED8
-:1008C000D00CB09ED00C1124CC15DD0509F1BE0171
+:1008C000D00C1124CC15DD050CF5BE0187E291E0BA
-:1008D00089E291E00E941402A895682D85E291E0DA
+:1008D0000E941202A895682D83E291E00E944102D5
-:1008E0000E9443027C01692D85E291E00E9443024F
+:1008E0007C01692D83E291E00E9441028C01B701F5
-:1008F0008C01B70184E291E00E944B03B80184E2CD
+:1008F00082E291E00E944903B80182E291E00E9405
-:1009000091E00E944B03CA0DDB1DCC16DD06F9F603
+:100900004903CA0DDB1DCC15DD05FCF26FEF82E259
-:100910006FEF84E291E0DF91CF911F910F91FF90F3
+:1009100091E0DF91CF911F910F91FF90EF90DF90C9
-:10092000EF90DF90CF90BF90AF909F908F900C94FE
+:10092000CF90BF90AF909F908F900C9442030E9405
-:1009300044030E949C0084E291E00E946D03A8950C
+:100930008B00D8E1C8E00FB6F894A89580916000CC
-:1009400090E08D309105B8F7FC01ED5AFF4F0C9403
+:10094000886180936000109260000FBE82E291E0A7
-:10095000FC040E943304EFCF0E942504ECCF0E94D8
+:100950000E946B030FB6F894A895D09360000FBE69
-:100960001204E9CF0E94FF03E6CF0E94F603E3CF13
+:10096000C0936000A89590E0FC013197EC30F10550
-:100970000E94ED03E0CF0E94DA03DDCF0E94C7039F
+:1009700010F7EE5AFF4F0C9405050E942304DBCFBD
-:10098000DACF0E94BA03D7CF0E949603D4CF0E9439
+:100980000E941004D8CF0E94FD03D5CF0E94F4032B
-:100990008503D1CF8091C00087FFCDCF8091C60065
+:10099000D2CF0E94EB03CFCF0E94D803CCCF0E94CE
-:1009A0008091C00087FDFACFC6CF85E391E00E9419
+:1009A000C503C9CF0E94B803C6CF0E949403C3CF2A
-:1009B000010142E065E371E082E391E00E944001C1
+:1009B0000E948303C0CF0E943104BDCF83E391E046
-:1009C00043E065E371E08FE291E00E94400145E081
+:1009C0000E94FF0042E063E371E080E391E00E9457
-:1009D00065E371E08CE291E00E94400140E065E354
+:1009D0003E0143E063E371E08DE291E00E943E015D
-:1009E00071E089E291E00E940F0241E065E371E06D
+:1009E00045E063E371E08AE291E00E943E0140E06D
-:1009F00086E291E00C940F02EE0FFF1F0024001C12
+:1009F00063E371E087E291E00E940D0241E063E36E
-:0E0A00000BBE0790F691E02D0994F894FFCFFD
+:100A000071E084E291E00C940D02EE0FFF1F0024D0
-:100A0E000100626F617264696E666F2E6800313527
+:100A1000001C0BBE0790F691E02D0994F894FFCFCF
-:100A1E003A33393A3534004D617220323720323054
+:100A200001626F617264696E666F2E680031333ADD
-:040A2E00313900005A
+:100A300033323A3037004D61722032382032303153
+:020A400039007B
 :00000001FF

main.cpp

@@ -8,13 +8,6 @@
 
 
 #define WDT_TIMEOUT WDTO_15MS
-const uint8_t CDUMMY __attribute__((used)) = 0;
-
-
-ISR(WDT_vect)
-{
-	WDTCSR = _BV(WDIE) | _BV(WDE);
-}
 
 void initAll()
 {
@@ -32,27 +25,25 @@ void initAll()
 	// aktiviere Interrupts
 	sei();
 	
-	// starte WDT
+	// deaktiviere WDT VOLLSTAENDIG
-	wdt_enable(WDT_TIMEOUT);
+	MCUSR &= ~_BV(WDRF);
-	WDTCSR = _BV(WDIE) | _BV(WDE);
+	WDTCSR = 0;
-	wdt_reset();
+	wdt_disable();
 }
 
 void handleRequest()
 {	
-	const uint8_t req = usart.readByte();	
+	wdt_disable();
-	wdt_reset();
 
+	const uint8_t req = usart.readByte();
+
+	// starte WDT
+	wdt_enable(WDT_TIMEOUT);
+	wdt_reset();
+	
 	switch(req)
 	{
 		case RQ_DISC:
-			{
-				// sinnlose Abfrage, damit Compiler nicht nervt
-				uint8_t dummy = 0xFF;
-				if(dummy)
-					// leere Puffer
-					while(UCSR0A & (1<<RXC0)) dummy = UDR0;
-			}
 			break;
 
 		case RQ_TEST:
@@ -109,6 +100,12 @@ int main()
 
 	initAll();
 
+	/*
+	// Reset anzeigen
+	beba0.writePortA(0xFF);
+	_delay_ms(100);
+	beba0.writePortA(0x00);*/
+
 	while(1)
 	{
 		handleRequest();

requests.cpp

@@ -87,12 +87,12 @@ void rqAdcDacStroke()
 	int16_t start = static_cast<int16_t>(usart.readInt());
 	int16_t delta = static_cast<int16_t>(usart.readInt());
 	int16_t count = static_cast<int16_t>(usart.readInt());
-	
+
 	usart.writeByte(USART::MSG_OK);
 	
 	count *= delta;
 	
-	for(int16_t i = start; i != count; i += delta)
+	for(int16_t i = start; i < count; i += delta)
 	{
 		dac0.setValue(i);
 		wdt_reset();

usart.cpp

@@ -19,21 +19,23 @@ void USART::writeByte(uint8_t b)
 {
 	while (!(UCSR0A & (1<<UDRE0)));
 	UDR0 = b;
-	
+
-	//while(!(UCSR0A & _BV(TXC0)));
+	// while(!(UCSR0A & _BV(TXC0)));
 }
 
 
 void USART::writeInt(uint16_t v)
 {
+
+
 	while (!(UCSR0A & (1<<UDRE0)));
 	UDR0 = v & 0xFF;
 	
 	v >>= 8;
 	while (!(UCSR0A & (1<<UDRE0)));
 	UDR0 = v & 0xFF;
-	
+
-	//while(!(UCSR0A & _BV(TXC0)));
+	// while(!(UCSR0A & _BV(TXC0)));
 }
 
 void USART::writeStr(const char* str, uint8_t len)

usart.h

@@ -5,7 +5,7 @@
 #include <util/delay.h>
 #include <stdint.h>
 
-constexpr uint32_t BAUDRATE = 115200; // 38400
+constexpr uint32_t BAUDRATE = 38400; // 38400
 
 class USART
 {