dcf77: adjust test expectation (PD emits more "invalid" annotations)

The dcf77 decoder recently started emitting "invalid bit timing" and
"Invalid DCF77 bit number" annotations, and does display bit positions
of the 59th and subsequent pulse within a minute.

diff --git a/decoder/test/dcf77/dcf77_120s.output b/decoder/test/dcf77/dcf77_120s.output
index 21e962e8846c96ddf16029368483c7dc402edc80..3f07ce59e103654a4ccb72c4331aca786133f257 100644 (file)
--- a/decoder/test/dcf77/dcf77_120s.output
+++ b/decoder/test/dcf77/dcf77_120s.output
@@ -4,6 +4,7 @@
 3149034-3335702 dcf77: unknown-bits: "Unknown bit 3: 1" "1"
 4141283-4329592 dcf77: unknown-bits: "Unknown bit 4: 1" "1"
 5143413-5318713 dcf77: unknown-bits: "Unknown bit 5: 1" "1"
 3149034-3335702 dcf77: unknown-bits: "Unknown bit 3: 1" "1"
 4141283-4329592 dcf77: unknown-bits: "Unknown bit 4: 1" "1"
 5143413-5318713 dcf77: unknown-bits: "Unknown bit 5: 1" "1"

+5341993-5369901 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 6149910-6240535 dcf77: unknown-bits: "Unknown bit 6: 0" "0"
 7142163-7228546 dcf77: unknown-bits: "Unknown bit 7: 0" "0"
 8133204-8329367 dcf77: unknown-bits: "Unknown bit 8: 1" "1"
 6149910-6240535 dcf77: unknown-bits: "Unknown bit 6: 0" "0"
 7142163-7228546 dcf77: unknown-bits: "Unknown bit 7: 0" "0"
 8133204-8329367 dcf77: unknown-bits: "Unknown bit 8: 1" "1"


@@ -11,6 +12,7 @@
 10150749-10234435 dcf77: unknown-bits: "Unknown bit 10: 0" "0"
 11144063-11350869 dcf77: unknown-bits: "Unknown bit 11: 1" "1"
 12142678-12231252 dcf77: unknown-bits: "Unknown bit 12: 0" "0"
 10150749-10234435 dcf77: unknown-bits: "Unknown bit 10: 0" "0"
 11144063-11350869 dcf77: unknown-bits: "Unknown bit 11: 1" "1"
 12142678-12231252 dcf77: unknown-bits: "Unknown bit 12: 0" "0"

+13158761-13158965 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 13159136-13250494 dcf77: unknown-bits: "Unknown bit 13: 0" "0"
 14139545-14335341 dcf77: unknown-bits: "Unknown bit 14: 1" "1"
 15133672-15279207 dcf77: unknown-bits: "Unknown bit 15: 0" "0"
 13159136-13250494 dcf77: unknown-bits: "Unknown bit 13: 0" "0"
 14139545-14335341 dcf77: unknown-bits: "Unknown bit 14: 1" "1"
 15133672-15279207 dcf77: unknown-bits: "Unknown bit 15: 0" "0"


@@ -20,6 +22,7 @@
 19135770-19248663 dcf77: unknown-bits: "Unknown bit 19: 0" "0"
 20136475-20336952 dcf77: unknown-bits: "Unknown bit 20: 1" "1"
 21137675-21255542 dcf77: unknown-bits: "Unknown bit 21: 0" "0"
 19135770-19248663 dcf77: unknown-bits: "Unknown bit 19: 0" "0"
 20136475-20336952 dcf77: unknown-bits: "Unknown bit 20: 1" "1"
 21137675-21255542 dcf77: unknown-bits: "Unknown bit 21: 0" "0"

+22142437-22142624 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 22142722-22248350 dcf77: unknown-bits: "Unknown bit 22: 0" "0"
 23131937-23338630 dcf77: unknown-bits: "Unknown bit 23: 1" "1"
 24165192-24242951 dcf77: unknown-bits: "Unknown bit 24: 0" "0"
 22142722-22248350 dcf77: unknown-bits: "Unknown bit 22: 0" "0"
 23131937-23338630 dcf77: unknown-bits: "Unknown bit 23: 1" "1"
 24165192-24242951 dcf77: unknown-bits: "Unknown bit 24: 0" "0"


@@ -41,6 +44,8 @@
 40150835-40277297 dcf77: raw-bits: "Bit 11: 0" "0"
 41151219-41255527 dcf77: raw-bits: "Bit 12: 0" "0"
 42150870-42265449 dcf77: raw-bits: "Bit 13: 0" "0"
 40150835-40277297 dcf77: raw-bits: "Bit 11: 0" "0"
 41151219-41255527 dcf77: raw-bits: "Bit 12: 0" "0"
 42150870-42265449 dcf77: raw-bits: "Bit 13: 0" "0"

+42296892-42297084 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"
+42297298-42322824 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 43162811-43253951 dcf77: raw-bits: "Bit 14: 0" "0"
 30150114-43253951 dcf77: special-bits: "Special bits: 00001101111110" "SB: 00001101111110"
 44153455-44254820 dcf77: raw-bits: "Bit 15: 0" "0"
 43162811-43253951 dcf77: raw-bits: "Bit 14: 0" "0"
 30150114-43253951 dcf77: special-bits: "Special bits: 00001101111110" "SB: 00001101111110"
 44153455-44254820 dcf77: raw-bits: "Bit 15: 0" "0"


@@ -49,6 +54,7 @@
 45161804-45248329 dcf77: summer-time: "Summer time announcement: not active" "Summer time: not active" "Summer time: no" "ST: no"
 46156609-46260970 dcf77: raw-bits: "Bit 17: 0" "0"
 46156609-46260970 dcf77: cest: "CEST: not in effect" "CEST: no"
 45161804-45248329 dcf77: summer-time: "Summer time announcement: not active" "Summer time: not active" "Summer time: no" "ST: no"
 46156609-46260970 dcf77: raw-bits: "Bit 17: 0" "0"
 46156609-46260970 dcf77: cest: "CEST: not in effect" "CEST: no"

+46988847-47015150 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 47159182-47359412 dcf77: raw-bits: "Bit 18: 1" "1"
 47159182-47359412 dcf77: cet: "CET: in effect" "CET: yes"
 48188927-48263649 dcf77: raw-bits: "Bit 19: 0" "0"
 47159182-47359412 dcf77: raw-bits: "Bit 18: 1" "1"
 47159182-47359412 dcf77: cet: "CET: in effect" "CET: yes"
 48188927-48263649 dcf77: raw-bits: "Bit 19: 0" "0"


@@ -63,8 +69,10 @@
 55168907-55253942 dcf77: raw-bits: "Bit 26: 0" "0"
 56165009-56358233 dcf77: raw-bits: "Bit 27: 1" "1"
 50161567-56358233 dcf77: minute: "Minutes: 49" "Min: 49"
 55168907-55253942 dcf77: raw-bits: "Bit 26: 0" "0"
 56165009-56358233 dcf77: raw-bits: "Bit 27: 1" "1"
 50161567-56358233 dcf77: minute: "Minutes: 49" "Min: 49"

+56989345-57011555 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 57149694-57369207 dcf77: raw-bits: "Bit 28: 1" "1"
 57149694-57369207 dcf77: minute-parity: "Minute parity: OK" "Min parity: OK"
 57149694-57369207 dcf77: raw-bits: "Bit 28: 1" "1"
 57149694-57369207 dcf77: minute-parity: "Minute parity: OK" "Min parity: OK"

+57583383-57600115 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 58188464-58353234 dcf77: raw-bits: "Bit 29: 1" "1"
 59168120-59370583 dcf77: raw-bits: "Bit 30: 1" "1"
 60167019-60254626 dcf77: raw-bits: "Bit 31: 0" "0"
 58188464-58353234 dcf77: raw-bits: "Bit 29: 1" "1"
 59168120-59370583 dcf77: raw-bits: "Bit 30: 1" "1"
 60167019-60254626 dcf77: raw-bits: "Bit 31: 0" "0"


@@ -98,20 +106,28 @@
 82194701-82288239 dcf77: raw-bits: "Bit 54: 0" "0"
 83173464-83376053 dcf77: raw-bits: "Bit 55: 1" "1"
 84177056-84272149 dcf77: raw-bits: "Bit 56: 0" "0"
 82194701-82288239 dcf77: raw-bits: "Bit 54: 0" "0"
 83173464-83376053 dcf77: raw-bits: "Bit 55: 1" "1"
 84177056-84272149 dcf77: raw-bits: "Bit 56: 0" "0"

+84771293-84806517 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"
+84828276-84846737 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 85160876-85272459 dcf77: raw-bits: "Bit 57: 0" "0"
 78186436-85272459 dcf77: year: "Year: 24"
 86170380-86279748 dcf77: raw-bits: "Bit 58: 0" "0"
 86170380-86279748 dcf77: date-parity: "Date parity: OK" "DP: OK"
 85160876-85272459 dcf77: raw-bits: "Bit 57: 0" "0"
 78186436-85272459 dcf77: year: "Year: 24"
 86170380-86279748 dcf77: raw-bits: "Bit 58: 0" "0"
 86170380-86279748 dcf77: date-parity: "Date parity: OK" "DP: OK"

+87164293-87296489 dcf77: raw-bits: "Bit 59: 0" "0"
+87164293-87296489 dcf77: warnings: "Invalid DCF77 bit: 59" "Invalid bit: 59" "Inv: 59"

 89164921-89283919 dcf77: raw-bits: "Bit 0: 0" "0"
 89164921-89283919 dcf77: start-of-minute: "Start of minute (always 0)" "Start of minute" "SoM"
 89164921-89283919 dcf77: raw-bits: "Bit 0: 0" "0"
 89164921-89283919 dcf77: start-of-minute: "Start of minute (always 0)" "Start of minute" "SoM"

+89574211-89597614 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 90184906-90292947 dcf77: raw-bits: "Bit 1: 0" "0"
 91187787-91295455 dcf77: raw-bits: "Bit 2: 0" "0"
 92191913-92382391 dcf77: raw-bits: "Bit 3: 1" "1"
 93182560-93375940 dcf77: raw-bits: "Bit 4: 1" "1"
 90184906-90292947 dcf77: raw-bits: "Bit 1: 0" "0"
 91187787-91295455 dcf77: raw-bits: "Bit 2: 0" "0"
 92191913-92382391 dcf77: raw-bits: "Bit 3: 1" "1"
 93182560-93375940 dcf77: raw-bits: "Bit 4: 1" "1"

+94049583-94067956 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 94181752-94302565 dcf77: raw-bits: "Bit 5: 0" "0"
 95170277-95284991 dcf77: raw-bits: "Bit 6: 0" "0"
 96189456-96378025 dcf77: raw-bits: "Bit 7: 1" "1"
 97177209-97377681 dcf77: raw-bits: "Bit 8: 1" "1"
 98167780-98382422 dcf77: raw-bits: "Bit 9: 1" "1"
 99186864-99287669 dcf77: raw-bits: "Bit 10: 0" "0"
 94181752-94302565 dcf77: raw-bits: "Bit 5: 0" "0"
 95170277-95284991 dcf77: raw-bits: "Bit 6: 0" "0"
 96189456-96378025 dcf77: raw-bits: "Bit 7: 1" "1"
 97177209-97377681 dcf77: raw-bits: "Bit 8: 1" "1"
 98167780-98382422 dcf77: raw-bits: "Bit 9: 1" "1"
 99186864-99287669 dcf77: raw-bits: "Bit 10: 0" "0"

+99374960-99400671 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"
+100090935-100128079 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 100178193-100383281 dcf77: raw-bits: "Bit 11: 1" "1"
 100178193-100383281 dcf77: raw-bits: "Bit 11: 1" "1"

diff --git a/decoder/test/dcf77/dcf77_480s.output b/decoder/test/dcf77/dcf77_480s.output
index 3833b190c175d8e48705d10d3552f2fa4da8d11c..dc4f9a92c36a043a247994bebc4efeec26967956 100644 (file)
--- a/decoder/test/dcf77/dcf77_480s.output
+++ b/decoder/test/dcf77/dcf77_480s.output
@@ -11,6 +11,7 @@
 43412996-44251865 dcf77: unknown-bits: "Unknown bit 10: 1" "1"
 51423132-51862491 dcf77: raw-bits: "Bit 0: 0" "0"
 51423132-51862491 dcf77: start-of-minute: "Start of minute (always 0)" "Start of minute" "SoM"
 43412996-44251865 dcf77: unknown-bits: "Unknown bit 10: 1" "1"
 51423132-51862491 dcf77: raw-bits: "Bit 0: 0" "0"
 51423132-51862491 dcf77: start-of-minute: "Start of minute (always 0)" "Start of minute" "SoM"

+55473560-55474303 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 55474957-55840087 dcf77: raw-bits: "Bit 1: 0" "0"
 59398818-60286631 dcf77: raw-bits: "Bit 2: 1" "1"
 63439979-63824318 dcf77: raw-bits: "Bit 3: 0" "0"
 55474957-55840087 dcf77: raw-bits: "Bit 1: 0" "0"
 59398818-60286631 dcf77: raw-bits: "Bit 2: 1" "1"
 63439979-63824318 dcf77: raw-bits: "Bit 3: 0" "0"


@@ -124,6 +125,7 @@
 375560787-399968440 dcf77: minute: "Minutes: 5" "Min: 5"
 403621160-403971653 dcf77: raw-bits: "Bit 28: 0" "0"
 403621160-403971653 dcf77: minute-parity: "Minute parity: OK" "Min parity: OK"
 375560787-399968440 dcf77: minute: "Minutes: 5" "Min: 5"
 403621160-403971653 dcf77: raw-bits: "Bit 28: 0" "0"
 403621160-403971653 dcf77: minute-parity: "Minute parity: OK" "Min parity: OK"

+407097115-407189139 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 407606483-407987323 dcf77: raw-bits: "Bit 29: 0" "0"
 411607088-412028348 dcf77: raw-bits: "Bit 30: 0" "0"
 415619209-416016805 dcf77: raw-bits: "Bit 31: 0" "0"
 407606483-407987323 dcf77: raw-bits: "Bit 29: 0" "0"
 411607088-412028348 dcf77: raw-bits: "Bit 30: 0" "0"
 415619209-416016805 dcf77: raw-bits: "Bit 31: 0" "0"


@@ -135,8 +137,10 @@
 428884439-429055901 dcf77: hour-parity: "Hour parity: OK"
 431640531-432010229 dcf77: raw-bits: "Bit 36: 0" "0"
 435599116-436142864 dcf77: raw-bits: "Bit 37: 0" "0"
 428884439-429055901 dcf77: hour-parity: "Hour parity: OK"
 431640531-432010229 dcf77: raw-bits: "Bit 36: 0" "0"
 435599116-436142864 dcf77: raw-bits: "Bit 37: 0" "0"

+439675848-439676578 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 439676991-440009011 dcf77: raw-bits: "Bit 38: 0" "0"
 443627505-444031934 dcf77: raw-bits: "Bit 39: 0" "0"
 439676991-440009011 dcf77: raw-bits: "Bit 38: 0" "0"
 443627505-444031934 dcf77: raw-bits: "Bit 39: 0" "0"

+446011744-446100720 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 447621737-448134482 dcf77: raw-bits: "Bit 40: 0" "0"
 451681593-452387819 dcf77: raw-bits: "Bit 41: 1" "1"
 431640531-452387819 dcf77: day: "Day: 20"
 447621737-448134482 dcf77: raw-bits: "Bit 40: 0" "0"
 451681593-452387819 dcf77: raw-bits: "Bit 41: 1" "1"
 431640531-452387819 dcf77: day: "Day: 20"


@@ -161,6 +165,8 @@
 487601145-516063273 dcf77: year: "Year: 24"
 519682223-520062378 dcf77: raw-bits: "Bit 58: 0" "0"
 519682223-520062378 dcf77: date-parity: "Date parity: INVALID!" "DP: INVALID!"
 487601145-516063273 dcf77: year: "Year: 24"
 519682223-520062378 dcf77: raw-bits: "Bit 58: 0" "0"
 519682223-520062378 dcf77: date-parity: "Date parity: INVALID!" "DP: INVALID!"

+523669762-524507216 dcf77: raw-bits: "Bit 59: 1" "1"
+523669762-524507216 dcf77: warnings: "Invalid DCF77 bit: 59" "Invalid bit: 59" "Inv: 59"

 531688637-532074328 dcf77: raw-bits: "Bit 0: 0" "0"
 531688637-532074328 dcf77: start-of-minute: "Start of minute (always 0)" "Start of minute" "SoM"
 535740658-536106970 dcf77: raw-bits: "Bit 1: 0" "0"
 531688637-532074328 dcf77: raw-bits: "Bit 0: 0" "0"
 531688637-532074328 dcf77: start-of-minute: "Start of minute (always 0)" "Start of minute" "SoM"
 535740658-536106970 dcf77: raw-bits: "Bit 1: 0" "0"


@@ -174,6 +180,7 @@
 567652920-568071041 dcf77: raw-bits: "Bit 9: 0" "0"
 571696119-572508034 dcf77: raw-bits: "Bit 10: 1" "1"
 575730422-576508328 dcf77: raw-bits: "Bit 11: 1" "1"
 567652920-568071041 dcf77: raw-bits: "Bit 9: 0" "0"
 571696119-572508034 dcf77: raw-bits: "Bit 10: 1" "1"
 575730422-576508328 dcf77: raw-bits: "Bit 11: 1" "1"

+578027317-578108236 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 579700357-580098369 dcf77: raw-bits: "Bit 12: 0" "0"
 583670687-584154780 dcf77: raw-bits: "Bit 13: 0" "0"
 587664417-588126467 dcf77: raw-bits: "Bit 14: 0" "0"
 579700357-580098369 dcf77: raw-bits: "Bit 12: 0" "0"
 583670687-584154780 dcf77: raw-bits: "Bit 13: 0" "0"
 587664417-588126467 dcf77: raw-bits: "Bit 14: 0" "0"


@@ -188,6 +195,7 @@
 603761814-604466474 dcf77: cet: "CET: in effect" "CET: yes"
 605053313-605227920 dcf77: raw-bits: "Bit 19: 0" "0"
 605053313-605227920 dcf77: leap-second: "Leap second announcement: not active" "Leap second: not active" "Leap second: no" "LS: no"
 603761814-604466474 dcf77: cet: "CET: in effect" "CET: yes"
 605053313-605227920 dcf77: raw-bits: "Bit 19: 0" "0"
 605053313-605227920 dcf77: leap-second: "Leap second announcement: not active" "Leap second: not active" "Leap second: no" "LS: no"

+607757188-607757924 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 607758361-608146567 dcf77: raw-bits: "Bit 20: 0" "0"
 607758361-608146567 dcf77: warnings: "Start of encoded time != 1" "SoeT != 1"
 611729910-612570425 dcf77: raw-bits: "Bit 21: 1" "1"
 607758361-608146567 dcf77: raw-bits: "Bit 20: 0" "0"
 607758361-608146567 dcf77: warnings: "Start of encoded time != 1" "SoeT != 1"
 611729910-612570425 dcf77: raw-bits: "Bit 21: 1" "1"


@@ -205,6 +213,7 @@
 647713120-648090092 dcf77: raw-bits: "Bit 31: 0" "0"
 651704125-652101514 dcf77: raw-bits: "Bit 32: 0" "0"
 655717729-656198821 dcf77: raw-bits: "Bit 33: 0" "0"
 647713120-648090092 dcf77: raw-bits: "Bit 31: 0" "0"
 651704125-652101514 dcf77: raw-bits: "Bit 32: 0" "0"
 655717729-656198821 dcf77: raw-bits: "Bit 33: 0" "0"

+656307789-656382447 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 659827696-660169786 dcf77: raw-bits: "Bit 34: 0" "0"
 639732765-660169786 dcf77: hour: "Hours: 0"
 663816502-664215535 dcf77: raw-bits: "Bit 35: 0" "0"
 659827696-660169786 dcf77: raw-bits: "Bit 34: 0" "0"
 639732765-660169786 dcf77: hour: "Hours: 0"
 663816502-664215535 dcf77: raw-bits: "Bit 35: 0" "0"


@@ -212,6 +221,7 @@
 667777248-668144651 dcf77: raw-bits: "Bit 36: 0" "0"
 671711307-672238837 dcf77: raw-bits: "Bit 37: 0" "0"
 675760442-676215005 dcf77: raw-bits: "Bit 38: 0" "0"
 667777248-668144651 dcf77: raw-bits: "Bit 36: 0" "0"
 671711307-672238837 dcf77: raw-bits: "Bit 37: 0" "0"
 675760442-676215005 dcf77: raw-bits: "Bit 38: 0" "0"

+679433154-679547479 dcf77: warnings: "Invalid bit timing" "Inv timing" "Inv"

 679791909-680137099 dcf77: raw-bits: "Bit 39: 0" "0"
 683722471-684174600 dcf77: raw-bits: "Bit 40: 0" "0"
 687750263-688171220 dcf77: raw-bits: "Bit 41: 0" "0"
 679791909-680137099 dcf77: raw-bits: "Bit 39: 0" "0"
 683722471-684174600 dcf77: raw-bits: "Bit 40: 0" "0"
 687750263-688171220 dcf77: raw-bits: "Bit 41: 0" "0"