From 541f499969e46105417262164139184519ac36f8 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 1 Jan 2020 13:55:07 +0100 Subject: Updates after annotation class/row changes (singular/plural). --- decoder/test/onewire_link/ds18b20.output | 106 ++++++++++----------- .../test/onewire_link/ds1985_main_memory.output | 8 +- .../test/onewire_link/sockit_owm_onewire.output | 2 +- 3 files changed, 58 insertions(+), 58 deletions(-) (limited to 'decoder/test/onewire_link') diff --git a/decoder/test/onewire_link/ds18b20.output b/decoder/test/onewire_link/ds18b20.output index ecdeeae..a91b869 100644 --- a/decoder/test/onewire_link/ds18b20.output +++ b/decoder/test/onewire_link/ds18b20.output @@ -529,117 +529,117 @@ 121161-121221 onewire_link: bit: "Bit: 1" "1" 121228-121288 onewire_link: bit: "Bit: 1" "1" 121294-121354 onewire_link: bit: "Bit: 1" "1" -121361-121372 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -121372-121428 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -121428-121439 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -121439-121495 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +121361-121372 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +121372-121428 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +121428-121439 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +121439-121495 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 121495-121555 onewire_link: bit: "Bit: 1" "1" 121561-121621 onewire_link: bit: "Bit: 1" "1" 121628-121688 onewire_link: bit: "Bit: 1" "1" 174200-174260 onewire_link: bit: "Bit: 1" "1" 174266-174326 onewire_link: bit: "Bit: 1" "1" -174333-174344 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -174344-174400 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -174400-174411 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -174411-174467 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +174333-174344 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +174344-174400 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +174400-174411 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +174411-174467 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 174467-174527 onewire_link: bit: "Bit: 1" "1" 174534-174594 onewire_link: bit: "Bit: 1" "1" 174600-174660 onewire_link: bit: "Bit: 1" "1" -174667-174678 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +174667-174678 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 174678-174738 onewire_link: bit: "Bit: 1" "1" 228070-228130 onewire_link: bit: "Bit: 1" "1" -228137-228148 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -228148-228204 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +228137-228148 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +228148-228204 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 228204-228264 onewire_link: bit: "Bit: 1" "1" 228271-228331 onewire_link: bit: "Bit: 1" "1" 228337-228397 onewire_link: bit: "Bit: 1" "1" 228404-228464 onewire_link: bit: "Bit: 1" "1" -228471-228482 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -228482-228538 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +228471-228482 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +228482-228538 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 228538-228598 onewire_link: bit: "Bit: 1" "1" -281109-281120 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -281120-281176 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +281109-281120 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +281120-281176 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 281176-281236 onewire_link: bit: "Bit: 1" "1" 281243-281303 onewire_link: bit: "Bit: 1" "1" 281309-281369 onewire_link: bit: "Bit: 1" "1" -281376-281387 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -281387-281443 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -281443-281454 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -281454-281510 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +281376-281387 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +281387-281443 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +281443-281454 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +281454-281510 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 281510-281570 onewire_link: bit: "Bit: 1" "1" 281577-281637 onewire_link: bit: "Bit: 1" "1" 334044-334104 onewire_link: bit: "Bit: 1" "1" 334111-334171 onewire_link: bit: "Bit: 1" "1" 334177-334237 onewire_link: bit: "Bit: 1" "1" -334244-334255 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -334255-334311 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -334311-334322 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -334322-334378 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +334244-334255 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +334255-334311 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +334311-334322 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +334322-334378 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 334378-334438 onewire_link: bit: "Bit: 1" "1" 334445-334505 onewire_link: bit: "Bit: 1" "1" 334511-334571 onewire_link: bit: "Bit: 1" "1" 387082-387142 onewire_link: bit: "Bit: 1" "1" -387149-387160 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -387160-387216 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -387216-387227 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -387227-387283 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +387149-387160 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +387160-387216 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +387216-387227 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +387227-387283 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 387283-387343 onewire_link: bit: "Bit: 1" "1" 387350-387410 onewire_link: bit: "Bit: 1" "1" 387416-387476 onewire_link: bit: "Bit: 1" "1" -387483-387494 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -387494-387550 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -387550-387561 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +387483-387494 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +387494-387550 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +387550-387561 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 387561-387621 onewire_link: bit: "Bit: 1" "1" -440017-440028 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -440028-440084 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +440017-440028 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +440028-440084 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 440084-440144 onewire_link: bit: "Bit: 1" "1" 440151-440211 onewire_link: bit: "Bit: 1" "1" 440217-440277 onewire_link: bit: "Bit: 1" "1" 440284-440344 onewire_link: bit: "Bit: 1" "1" -440351-440362 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -440362-440418 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +440351-440362 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +440362-440418 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 440418-440478 onewire_link: bit: "Bit: 1" "1" 440485-440545 onewire_link: bit: "Bit: 1" "1" -493056-493067 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -493067-493123 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +493056-493067 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +493067-493123 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 493123-493183 onewire_link: bit: "Bit: 1" "1" 493189-493249 onewire_link: bit: "Bit: 1" "1" 493256-493316 onewire_link: bit: "Bit: 1" "1" -493323-493334 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -493334-493390 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +493323-493334 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +493334-493390 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 493390-493450 onewire_link: bit: "Bit: 1" "1" 493457-493517 onewire_link: bit: "Bit: 1" "1" 493523-493583 onewire_link: bit: "Bit: 1" "1" 546095-546155 onewire_link: bit: "Bit: 1" "1" 546161-546221 onewire_link: bit: "Bit: 1" "1" -546228-546239 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -546239-546295 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -546295-546306 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -546306-546362 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +546228-546239 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +546239-546295 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +546295-546306 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +546306-546362 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 546362-546422 onewire_link: bit: "Bit: 1" "1" 546428-546488 onewire_link: bit: "Bit: 1" "1" 546495-546555 onewire_link: bit: "Bit: 1" "1" -546562-546573 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +546562-546573 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 546573-546633 onewire_link: bit: "Bit: 1" "1" 599029-599089 onewire_link: bit: "Bit: 1" "1" -599096-599107 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -599107-599163 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +599096-599107 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +599107-599163 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 599163-599223 onewire_link: bit: "Bit: 1" "1" 599230-599290 onewire_link: bit: "Bit: 1" "1" 599296-599356 onewire_link: bit: "Bit: 1" "1" -599363-599374 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -599374-599430 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -599430-599441 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -599441-599497 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +599363-599374 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +599374-599430 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +599430-599441 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +599441-599497 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 599497-599557 onewire_link: bit: "Bit: 1" "1" -652068-652079 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -652079-652135 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +652068-652079 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +652079-652135 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 652135-652195 onewire_link: bit: "Bit: 1" "1" 652202-652262 onewire_link: bit: "Bit: 1" "1" 652268-652328 onewire_link: bit: "Bit: 1" "1" 652335-652395 onewire_link: bit: "Bit: 1" "1" -652402-652413 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" -652413-652469 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +652402-652413 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +652413-652469 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 652469-652529 onewire_link: bit: "Bit: 1" "1" 652536-652596 onewire_link: bit: "Bit: 1" "1" 705003-705063 onewire_link: bit: "Bit: 1" "1" diff --git a/decoder/test/onewire_link/ds1985_main_memory.output b/decoder/test/onewire_link/ds1985_main_memory.output index d6816f8..c44fcb3 100644 --- a/decoder/test/onewire_link/ds1985_main_memory.output +++ b/decoder/test/onewire_link/ds1985_main_memory.output @@ -1,5 +1,5 @@ -4263643-4263644 onewire_link: warnings: "Low signal not long enough" "Low too short" "LOW < 1.0" -4263643-4263645 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +4263643-4263644 onewire_link: warning: "Low signal not long enough" "Low too short" "LOW < 1.0" +4263643-4263645 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 4263645-4267758 onewire_link: reset: "Reset" "Rst" "R" 4267758-4271598 onewire_link: presence: "Presence: true" "Presence" "Pres" "P" 4374499-4374979 onewire_link: bit: "Bit: 0" "0" @@ -5960,8 +5960,8 @@ 12091609-12092089 onewire_link: bit: "Bit: 1" "1" 12092151-12092631 onewire_link: bit: "Bit: 1" "1" 12092692-12093172 onewire_link: bit: "Bit: 1" "1" -12093233-12093234 onewire_link: warnings: "Low signal not long enough" "Low too short" "LOW < 1.0" -12093233-12093235 onewire_link: warnings: "Time slot not long enough" "Slot too short" "SLOT < 60.0" +12093233-12093234 onewire_link: warning: "Low signal not long enough" "Low too short" "LOW < 1.0" +12093233-12093235 onewire_link: warning: "Time slot not long enough" "Slot too short" "SLOT < 60.0" 12093235-12093715 onewire_link: bit: "Bit: 1" "1" 12093776-12094256 onewire_link: bit: "Bit: 1" "1" 12094317-12094797 onewire_link: bit: "Bit: 1" "1" diff --git a/decoder/test/onewire_link/sockit_owm_onewire.output b/decoder/test/onewire_link/sockit_owm_onewire.output index 5419504..fa3f749 100644 --- a/decoder/test/onewire_link/sockit_owm_onewire.output +++ b/decoder/test/onewire_link/sockit_owm_onewire.output @@ -1,4 +1,4 @@ -4065-5166 onewire_link: warnings: "Erroneous signal" "Error" "Err" "E" +4065-5166 onewire_link: warning: "Erroneous signal" "Error" "Err" "E" 8256-8737 onewire_link: bit: "Bit: 0" "0" 10480-10961 onewire_link: bit: "Bit: 0" "0" 11486-11967 onewire_link: bit: "Bit: 0" "0" -- cgit v1.2.3-54-g00ecf