Update to version 2.5

Kruemelbahn · Sep 21, 2024 · 886b1fa · 886b1fa
1 parent 5988766
commit 886b1fa
Show file tree

Hide file tree

Showing 8 changed files with 321 additions and 308 deletions.
diff --git a/Dispa.ino b/Dispa.ino
@@ -104,7 +104,7 @@ discrete In/Outs used for functionalities:
 HeartBeat oHeartbeat;
 
 //========================================================
-#define SW_VERSION F("2.4")
+#define SW_VERSION F("2.5")
 #define SW_YEAR    F("2024")
 
 #include <LocoNet.h>  // used to include ln_opc.h
@@ -254,10 +254,10 @@ static void SlotManager(uint8_t adr, uint8_t adr2)
 
 static void disp_put()
 {
-  uint16_t ui16Low(zahl / 128);
-  uint16_t ui16High(zahl - (ui16Low * 128));
-	SlotTabelle[2].ucADR = ui16High;
-	SlotTabelle[2].ucADR2 = ui16Low;
+  uint16_t ui16High(zahl / 128);
+  uint16_t ui16Low(zahl - (ui16High * 128));
+	SlotTabelle[2].ucADR = ui16Low;
+	SlotTabelle[2].ucADR2 = ui16High;
 	SlotTabelle[2].ucSPD = EMERGENCY_STOP;
 }
 

diff --git a/Documentation/Dispa.pdf b/Documentation/Dispa.pdf
diff --git a/Hexfiles/Dispa.lcd.ino.hex b/Hexfiles/Dispa.lcd.ino.hex
@@ -6,7 +6,7 @@
 :100050000C94BA010C94BA010C94BA010C94BA0134
 :100060000C94EF100C94BA014E65753A20006D6542
 :100070006C736F6674002863294B7200323032341F
-:1000800000202F2000322E340044495350412000DC
+:1000800000202F2000322E350044495350412000DB
 :1000900041546D656761333238500041546D656776
 :1000A000613136380041546D65676138380041541C
 :1000B0006D6567613800535620332C343A30780030
@@ -48,12 +48,12 @@
 :1002F00000250028002B0004040404040404040264
 :1003000002020202020303030303030102040810B2
 :10031000204080010204081020010204081020007F
-:10032000D313EF1C11241FBECFEFD8E0DEBFCDBF2B
+:10032000D313F41C11241FBECFEFD8E0DEBFCDBF26
 :1003300026E0AAEBB1E001C01D92A73DB207E1F7AC
-:1003400011E0A0E0B1E0ECEFFAE302C005900D92FD
+:1003400011E0A0E0B1E0E6E0FBE302C005900D9211
 :10035000AA3BB107D9F711E0C1E9D1E004C0219768
-:10036000FE010E942D1DC039D107C9F70E94F0146B
-:100370000C94711D0C940000CF93DF93FC0129E1D4
+:10036000FE010E94321DC039D107C9F70E94F01466
+:100370000C94761D0C940000CF93DF93FC0129E1CF
 :100380008EE241E050E033E071E09081907690366B
 :10039000D1F4918190937A05A0917A05A1501092A1
 :1003A00079059FEF609179056A1790F4C0917905FE
@@ -246,7 +246,7 @@
 :100F50001C92089510928D0210928E0210928F02B0
 :100F600010929002E1E9F2E0119283E0ED3BF80784
 :100F7000D9F7EDEBF3E08EEC93E011928E179F071B
-:100F8000E1F7089580918B0290918C02EEECF3E0F2
+:100F8000E1F7089580918A0290918B02EEECF3E0F4
 :100F90009C012F773327238B880F892F881F990B6C
 :100FA0009195878B81E0848B0895CF93DF93EC013B
 :100FB00060E08E810E94A90261E08E810E94A902F8
@@ -316,7 +316,7 @@
 :1013B000AF92BF920F931F93CF93DF93CDB7DEB75A
 :1013C000A1970FB6F894DEBF0FBECDBF19A2423071
 :1013D00008F44AE08E010F5D1F4F842E912CB12C32
-:1013E000A12CA50194010E940B1DE62FB901CA0191
+:1013E000A12CA50194010E94101DE62FB901CA018C
 :1013F000EA3044F5E05DD801EE938D01232B242BD8
 :10140000252B79F790E080E0109769F0FD010190BD
 :101410000020E9F73197AF014A1B5B0BBD0188EB58
@@ -342,7 +342,7 @@
 :1015500080E30E945209CA30D10518F480E30E944A
 :101560005209BE0190E080E04AE0DF91CF910C94F7
 :10157000D60944E061E085E00E94880961E085E0E9
-:101580000E94260980918B0290918C020E949B0AF6
+:101580000E94260980918A0290918B020E949B0AF8
 :101590000C94C207009769F0FC0101900020E9F764
 :1015A0003197AF01481B590BBC0188EB96E00C94B6
 :1015B0000A0490E080E00895CF92DF92EF92FF92CC
@@ -394,8 +394,8 @@
 :10189000621AF894F6014081F8018081841708F0FB
 :1018A00044C0F42FF81B8F2FF60180837894F80141
 :1018B00060814617E8F5712C50E06B817C81CB018B
-:1018C000860D971D0E94331DF80160814B815C815C
-:1018D000460F511DBA01A3018B819C810E94331DCB
+:1018C000860D971D0E94381DF80160814B815C8157
+:1018D000460F511DBA01A3018B819C810E94381DC6
 :1018E000F7018081F8019081891BF7018083F8015D
 :1018F0001082F70190819F5F9083F8018081392FDA
 :10190000381B97FF02C0F7011082F2012081F40119
@@ -728,15 +728,15 @@
 :102D700073E080E090E00E94D4030E94890E8FE00F
 :102D80000E94DC0A882341F30E949C0B8091D104AD
 :102D9000811102C00E948F0B0AE0F02EDE01119615
-:102DA0003D018DE7482E82E0582E0E9444030E9488
+:102DA0004D018DE7682E82E0782E0E9444030E9438
 :102DB000890E8091D104882309F485C0809159023D
 :102DC000882309F480C01091510280915002181795
 :102DD000B9F060E082E00E942609143618F480E21F
 :102DE0000E9452091A3018F480E20E9452096AE0E7
 :102DF00070E0812F0E94240A80915102809350023A
-:102E0000BCE48B2EB2E09B2E18E4212E12E0312E72
-:102E100003E0D12CF40181914F01D1011D911D01DD
-:102E2000811709F44BC0D1101FC060E080E00E9400
+:102E0000BCE4CB2EB2E0DB2E18E4A12E12E0B12EF2
+:102E100003E0512CF60181916F01D5011D915D01F7
+:102E2000811709F44BC051101FC060E080E00E9480
 :102E30002609B12FB072EB2E8CE315FF80E20E94C1
 :102E4000520960E086E00E94260980E2E11001C09C
 :102E50008EE30E94520960E08FE00E9426098CE711
@@ -745,14 +745,14 @@
 :102E8000800F0E9426098CE711FF8EE20E945209F2
 :102E900063E08FEF800F0E9426098CE712FF8EE21D
 :102EA0000E94520963E0802F0E9426098CE713FFDD
-:102EB0008EE20E945209F40131971083D3940C5F83
-:102EC000E4E0DE12A7CF809158028111F0C0912C6E
-:102ED00000E090FC75C196FC75C197FE14C080910E
-:102EE000D104811193C1033609F06EC110928A0298
-:102EF00010928C0210928B020E94C20747E061E0A0
+:102EB0008EE20E945209F6013197108353940C5F01
+:102EC000E4E05E12A7CF809158028111F0C0D12CAE
+:102ED00000E0D0FC75C1D6FC75C1D7FE14C080914E
+:102EE000D104811193C1033609F06EC110928C0296
+:102EF00010928B0210928A020E94C20747E061E0A2
 :102F000085E00E9488098091D104811157C3809186
 :102F1000D004813009F080C30E9438036093CC0450
-:102F20007093CD048093CE049093CF0450E8E52EA7
+:102F20007093CD048093CE049093CF0440E8E42EB8
 :102F30000091CA041091CB040115110509F060C37A
 :102F40000E9444030E94790D68EE73E080E090E0F7
 :102F50000E94D4030E94890E0E9438030091CC0481
@@ -776,29 +776,29 @@
 :10307000E29FF0011124E07818968C9118978F77D1
 :10308000E82B1A968C911A9790E8899F9001112449
 :103090001B968C918F77820FE03308F09BCFF0E086
-:1030A000E65AFD4F808396CF0E94730A6FCE8090C0
-:1030B000560290905702D0908806E0908906F4015D
-:1030C000EE0FFF1FEF5BFE4F608171818D2D9E2DF6
-:1030D0000E94850709E311E0312C212C61E08D2D40
+:1030A000E65AFD4F808396CF0E94730A6FCEC09080
+:1030B0005602D09057025090880640908906F6013B
+:1030C000EE0FFF1FEF5BFE4F60817181852D942D08
+:1030D0000E94850709E311E0B12CA12C61E0852D48
 :1030E0000E94310610925302809352028CE796E0C0
 :1030F0000E940F07D8014D915D918D0120912A0604
 :1031000030912B06822793278417950799F485E041
-:10311000889DF001899DF00D1124EB5DFE4FE20DBD
-:10312000F31D8081082E000C990B9093550280931B
-:103130005402CDCEBFEF2B1A3B0AE4E02E16310429
+:103110008C9DF0018D9DF00D1124EB5DFE4FEA0DAD
+:10312000FB1D8081082E000C990B90935502809313
+:103130005402CDCEBFEFAB1ABB0AE4E0AE16B10429
 :1031400069F600915402109155020115110599F08C
 :103150001092550210925402002309F4B8CE0332A3
-:1031600009F10A3251F10053E0E89E2E0A30E8F0EE
-:1031700060E8962E19C06FEF70E08D2D9E2D0E9495
-:103180008507FFEF8F1A9F0A24E08216910429F029
-:1031900090925702809256029ACE10925702109245
-:1031A000560295CE9924939400E045E162E080E0D8
-:1031B0000E9488091092D0048CCE70E4972EF4CF30
+:1031600009F10A3251F1005370E8D72E0A30E8F025
+:1031700050E8D52E19C06FEF70E0852D942D0E9478
+:103180008507FFEFCF1ADF0A24E0C216D10429F029
+:10319000D0925702C09256029ACE109257021092C5
+:1031A000560295CEDD24D39400E045E162E080E054
+:1031B0000E9488091092D0048CCE60E4D62EF4CF01
 :1031C00002E68DCE03E68BCE023619F40E94830B05
-:1031D0009ACE80918A0210E0882371F0843080F4C6
-:1031E00040918B0250918C02F49E9001F59E300D1F
-:1031F0001124020F132F111D10938C0200938B02C8
-:103200008F5F80938A020E94B90A7DCE033619F43B
+:1031D0009ACE80918C0210E0882371F0843080F4C4
+:1031E00040918A0250918B02F49E9001F59E300D21
+:1031F0001124020F132F111D10938B0200938A02CA
+:103200008F5F80938C020E94B90A7DCE033619F439
 :103210000E949C0B78CE013019F40E94730A73CE81
 :103220000230E9F4109259020E94280960E080E01F
 :103230000E94260985E091E00E94360980915F0294
@@ -832,7 +832,7 @@
 :1033F00080E00E94260981E891E016FD78CF80E701
 :1034000091E075CF88E092E0F0CF87EF91E0EDCFCB
 :103410008AEE91E0EACFE12FEF70F0E0EE5EF54E3C
-:103420000C942D1D221A251A281A281A2B1AF7195E
+:103420000C94321D221A251A281A281A2B1AF71959
 :103430002E1AF719F719F719F719F719F719F719D4
 :10344000311A221A89ED91E0D0CF88EC91E0CDCFEE
 :1034500088EB91E0CACF8BEA91E0C7CF81EA91E097
@@ -857,101 +857,102 @@
 :103580000E94360960E08FE00E94260980916C025B
 :1035900081111CC080E30E94520961E080E00E941A
 :1035A00026090DE612E0F80181918F01811110C00A
-:1035B00080E30E94520940165106A9F780E090E08E
+:1035B00080E30E94520960167106A9F780E090E04E
 :1035C000892B09F4F2CB0E940000EFCB81E3E3CF1B
 :1035D00081E3EFCF023691F781E0809359020E9498
 :1035E000280960E080E00E9426098BE992E00E94B1
 :1035F000360961E080E00E9426098AE892E077CEF1
 :1036000045E163E080E00E94880986EB92E00E9439
-:103610005009C8010E94540A8090CA049090CB04BB
-:103620008114910409F44BC08091D004813009F0D9
-:1036300046C082E08093D0040091E503192D002359
-:10364000D9F0E090E103EE20B9F0E091000126E02E
-:10365000E29FF0011124E75BFE4F45E5A42EC080F8
-:1036600028E0492D682D85E00E94D80C6AEF70E0B3
-:1036700080E090E00E94D4032DEB222E23E0322E36
-:1036800032E1D32ED1018D911D018823A1F001E0FB
-:10369000813009F400E00195A12CC12CE12C2D2DE5
-:1036A000412F682D81E00E94D80C6AEF70E080E025
-:1036B00090E00E94D403D394B3E2DB12E3CF809175
-:1036C000D004843010F01092D00489E996E00E9472
-:1036D000AC04892B09F472CF0E94AA0701E912E019
-:1036E000912C812C89E996E00E94C2048A309105D0
-:1036F000A1F08D30910589F09C01205231092036CE
-:10370000310580F7EFEF8E1A9E0AD8018D938D0157
-:10371000BBE28B16B1E09B0629F71092BC0364EA6A
-:1037200071E081E992E00E944E1D009721F08A58D5
-:1037300092408093900268EA71E081E992E00E94F1
-:103740004E1D009721F08858924080938F026CEABA
-:1037500071E081E992E00E944E1D12E001E00097C5
-:1037600009F440C09C012D5F3F4FF901E159F2403F
-:1037700090E081E08E0FF0E0EF56FD4F40814D3339
-:1037800009F59131F8F4E82FF0E0EF56FD4F408154
-:10379000042E000C550B4033510559F4E92FF0E08D
-:1037A000E354FC4F00836CEA71E0C9010E944E1D96
-:1037B000D6CF41335105B9F7E92FF0E0E354FC4F80
-:1037C0001083F1CF642F042E000C770B6053710926
-:1037D0006A30710528F49F9D400D1124942F905359
-:1037E000E82FC7CF60EB71E081E992E00E944E1DA7
-:1037F000009721F08B58924080938E0264EB71E029
-:1038000081E992E00E944E1D009721F08A58924073
-:1038100080938D02E0918D02EE2341F081E08E0FC6
-:1038200080938D02F0E0EF56FD4F1082E0918E0202
-:10383000EE2341F081E08E0F80938E02F0E0EF5690
-:10384000FD4F108280E0E82FF0E0E815F90544F420
-:10385000EF56FD4F9081963209F410828F5FF3CFBF
-:1038600000918E02002309F4A7C010E00F561D4FEF
-:1038700020908D02222009F4A2C0312CF101EF56D4
-:10388000FD4F1F0140E160E080E00E9488092114A3
-:10389000310439F0D1018C91882319F0C1010E94C3
-:1038A000CA0A0115110591F0F8018081882371F091
-:1038B0002114310441F0D1018C91882321F088EB4F
-:1038C00091E00E94CA0AC8010E94CA0AE0918F02D0
-:1038D000EE2341F141E04E0F40938F02F0E0EF56AE
-:1038E000FD4F1082A42FB0E0AF56BD4FFD010190F7
-:1038F0000020E9F73197EA1BFB0BE0938A0290E086
-:1039000080E0242F30E02815390534F42F563D4F40
-:10391000F9015081511156C090938C0280938B0213
-:103920000E94B90AE0919002EE2309F441C081E0BF
-:103930008E0F80939002F0E0EF56FD4F1082082F1B
-:1039400010E00F561D4F0115110561F1D8018C9142
-:10395000882341F189E4882E81E0982E312C95E06E
-:10396000E92EF3012E2D11922A95E9F7F30181E05A
-:1039700090E0D401A80FB91F2C91203209F420E067
-:103980002193019686309105A1F7B301C8010E94E9
-:10399000451D892B49F0339486E0880E911C96E0F2
-:1039A0003912DFCF30900001309200010E94530B9A
-:1039B00081E08093D00402CE10E000E059CF312C9A
-:1039C000212C60CFF89E9001F99E300D1124C90181
-:1039D000C097850F911D57FD9A954F5F92CF83E851
-:1039E00091E090939A068093990680914502909178
-:1039F00046028959964071F4E091AC06F091AD060B
-:103A000090818091AE068095892380831092460232
-:103A1000109245020895A1E21A2EAA1BBB1BFD01BC
-:103A20000DC0AA1FBB1FEE1FFF1FA217B307E4079D
-:103A3000F50720F0A21BB30BE40BF50B661F771FF5
-:103A4000881F991F1A9469F76095709580959095D5
-:103A50009B01AC01BD01CF010895EE0FFF1F059042
-:103A6000F491E02D09946817790768F4FB01DC01F3
-:103A7000E40FF51FA40FB51F02C002900E92415033
-:103A80005040D8F708950C94681DFB01DC018D911E
-:103A9000019080190110D9F3990B0895FB01519100
-:103AA0005523A9F0BF01DC014D9145174111E1F704
-:103AB00059F4CD010190002049F04D91401541117C
-:103AC000C9F3FB014111EFCF81E090E00197089528
-:103AD000FB01DC0102C001900D9241505040D8F72B
-:103AE000089511E0C1E9D1E004C0FE010E942D1D3E
-:0C3AF0002196C239D107C9F7F894FFCF26
-:103AFC000139020304050608090A0B0C0D0E0F1000
-:103B0C001112131415161718191A1B1C1D1E1F2021
-:103B1C0021222B2CFF313233410034353642003711
-:103B2C00383943002A302344001000200040008024
-:103B3C0000FE00FD00FB00F70007313238410004A5
-:103B4C003238412000033132382000003238202036
-:103B5C00000231342020000132384D2000000000DA
-:103B6C00005607290798074F0422070F0700070084
-:103B7C0000000050040A0498074F04AC04C2043738
-:103B8C00040000000030090A049807E3042E003FEB
-:103B9C00202020006F2E73006F2E61006F2E6600A8
-:0A3BAC006F2E6E006F2E6F003D00BB
+:103610005009C8010E94540A6091CA047091CB04F9
+:103620006115710509F44CC08091D004813009F016
+:1036300047C082E08093D004E090E103E091000174
+:1036400026E0E29FF0011124E75BFE4F8081B72E58
+:10365000D62EEE2009F4AEC00091E503002309F454
+:10366000A9C035E5A32EC82E28E0472F85E00E948B
+:10367000D80C6AEF70E080E090E00E94D4032DEB5C
+:10368000422E23E0522E12E1D2018D912D0188238A
+:10369000A1F001E0813009F400E00195A12CC12CDA
+:1036A000E12C212F4B2D6D2D81E00E94D80C6AEF6B
+:1036B00070E080E090E00E94D4031F5F133221F796
+:1036C0008091D004843010F01092D00489E996E003
+:1036D0000E94AC04892B09F471CF0E94AA0701E96A
+:1036E00012E0D12CC12C89E996E00E94C2048A30F4
+:1036F0009105A1F08D30910589F09C01205231098E
+:103700002036310580F7BFEFCB1ADB0AF801819331
+:103710008F01FBE2CF16F1E0DF0629F71092BC0320
+:1037200064EA71E081E992E00E94531D009721F064
+:103730008A5892408093900268EA71E081E992E0B1
+:103740000E94531D009721F08858924080938F0269
+:103750006CEA71E081E992E00E94531D12E001E001
+:10376000009709F448C09C012D5F3F4FF901E159D2
+:10377000F24090E081E08E0FF0E0EF56FD4F408187
+:103780004D3349F5913138F5E82FF0E0EF56FD4F14
+:103790004081042E000C550B4033510599F4E92F5C
+:1037A000F0E0E354FC4F00836CEA71E0C9010E9431
+:1037B000531DD6CFA12CC12CE12C082F2AE0472F76
+:1037C00081E055CF4133510579F7E92FF0E0E3541B
+:1037D000FC4F1083E9CF642F042E000C770B60534D
+:1037E00071096A30710528F49F9D400D1124942FB2
+:1037F0009053E82FBFCF60EB71E081E992E00E9427
+:10380000531D009721F08B58924080938E0264EBF9
+:1038100071E081E992E00E94531D009721F08A58DF
+:10382000924080938D02E0918D02EE2341F081E081
+:103830008E0F80938D02F0E0EF56FD4F1082E091E5
+:103840008E02EE2341F081E08E0F80938E02F0E035
+:10385000EF56FD4F108280E0E82FF0E0EC15FD05FB
+:1038600044F4EF56FD4F9081963209F410828F5F39
+:10387000F3CF00918E02002309F451C010E00F56DF
+:103880001D4FA0908D02AA2009F44CC0B12CC50197
+:103890008F569D4F5C0140E160E080E00E94880906
+:1038A000A114B10439F0D5018C91882319F0C50118
+:1038B0000E94CA0A0115110591F0F8018081882340
+:1038C00071F0A114B10441F0D5018C91882321F04D
+:1038D00088EB91E00E94CA0AC8010E94CA0AA0911E
+:1038E0008F02AA23B9F1E1E0EA0FE0938F02B0E082
+:1038F000AF56BD4F1C924E2F80E0242F30E02C1588
+:103900003D059CF42F563D4FD9019C91992369F0B8
+:103910008F9D900D1124892F80534F5FEECF10E0C3
+:1039200000E0AFCFB12CA12CB6CF882399F0F0E006
+:10393000EF56FD4FDF010D900020E9F71197AE1B08
+:10394000BF0BA0938C0290E090938B0280938A022D
+:103950000E94B90AE0919002EE2309F441C081E08F
+:103960008E0F80939002F0E0EF56FD4F1082082FEB
+:1039700010E00F561D4F0115110561F1F80180810E
+:10398000882341F189E4C82E81E0D82EB12C95E03E
+:10399000E92ED401EE2D1D92EA95E9F7F40181E0BC
+:1039A00090E0D601A80FB91F2C91203209F420E035
+:1039B0002193019686309105A1F7B401C8010E94B8
+:1039C0004A1D892B49F0B394F6E0CF0ED11C26E0B6
+:1039D000B212DFCFB0900001B09200010E94530BF1
+:1039E00081E08093D004EACD83E891E090939A0639
+:1039F000809399068091450290914602895996409C
+:103A000071F4E091AC06F091AD0690818091AE0624
+:103A10008095892380831092460210924502089572
+:103A2000A1E21A2EAA1BBB1BFD010DC0AA1FBB1FC2
+:103A3000EE1FFF1FA217B307E407F50720F0A21B34
+:103A4000B30BE40BF50B661F771F881F991F1A94A1
+:103A500069F760957095809590959B01AC01BD01CB
+:103A6000CF010895EE0FFF1F0590F491E02D09940A
+:103A70006817790768F4FB01DC01E40FF51FA40F58
+:103A8000B51F02C002900E9241505040D8F70895E1
+:103A90000C946D1DFB01DC018D91019080190110CA
+:103AA000D9F3990B0895FB0151915523A9F0BF015A
+:103AB000DC014D9145174111E1F759F4CD01019019
+:103AC000002049F04D9140154111C9F3FB0141110E
+:103AD000EFCF81E090E001970895FB01DC0102C087
+:103AE00001900D9241505040D8F7089511E0C1E97E
+:103AF000D1E004C0FE010E94321D2196C239D107D7
+:063B0000C9F7F894FFCFA5
+:103B06000139020304050608090A0B0C0D0E0F10F5
+:103B16001112131415161718191A1B1C1D1E1F2017
+:103B260021222B2CFF313233410034353642003707
+:103B3600383943002A30234400100020004000801A
+:103B460000FE00FD00FB00F700073132384100049B
+:103B5600323841200003313238200000323820202C
+:103B6600000231342020000132384D2000000000D0
+:103B7600005607290798074F0422070F070007007A
+:103B860000000050040A0498074F04AC04C204372E
+:103B9600040000000030090A049807E3042E003FE1
+:103BA600202020006F2E73006F2E61006F2E66009E
+:0A3BB6006F2E6E006F2E6F003D00B1
 :00000001FF