diff options
-rw-r--r-- | decoders/onewire_link/__init__.py | 2 | ||||
-rw-r--r-- | decoders/onewire_network/__init__.py | 2 | ||||
-rw-r--r-- | decoders/onewire_network/onewire_network.py | 18 | ||||
-rw-r--r-- | decoders/onewire_transport/__init__.py | 2 | ||||
-rw-r--r-- | decoders/onewire_transport/onewire_transport.py | 22 |
5 files changed, 33 insertions, 13 deletions
diff --git a/decoders/onewire_link/__init__.py b/decoders/onewire_link/__init__.py index c2e38d3..5c7251d 100644 --- a/decoders/onewire_link/__init__.py +++ b/decoders/onewire_link/__init__.py @@ -26,7 +26,7 @@ ground) between a single master and one or multiple slaves. The protocol is layered. - Link layer (reset, presence detection, reading/writing bits) - Network layer (skip/search/match device ROM addresses) -- Transport layer (transfer data between 1-Wire master and device) +- Transport layer (transport data between 1-Wire master and device) Link layer diff --git a/decoders/onewire_network/__init__.py b/decoders/onewire_network/__init__.py index 56a5eb5..9b6e510 100644 --- a/decoders/onewire_network/__init__.py +++ b/decoders/onewire_network/__init__.py @@ -26,7 +26,7 @@ ground) between a single master and one or multiple slaves. The protocol is layered. - Link layer (reset, presence detection, reading/writing bits) - Network layer (skip/search/match device ROM addresses) -- Transport layer (transfer data between 1-Wire master and device) +- Transport layer (transport data between 1-Wire master and device) Network layer diff --git a/decoders/onewire_network/onewire_network.py b/decoders/onewire_network/onewire_network.py index 18e9525..9e641fd 100644 --- a/decoders/onewire_network/onewire_network.py +++ b/decoders/onewire_network/onewire_network.py @@ -23,14 +23,16 @@ import sigrokdecode as srd # a dictionary of ROM commands and their names, next state -command = {0x33: ["READ ROM" , "GET ROM" ], - 0x0f: ["CONDITIONAL READ ROM" , "GET ROM" ], - 0xcc: ["SKIP ROM" , "TRANSPORT" ], - 0x55: ["MATCH ROM" , "GET ROM" ], - 0xf0: ["SEARCH ROM" , "SEARCH ROM"], - 0xec: ["CONDITIONAL SEARCH ROM", "SEARCH ROM"], - 0x3c: ["OVERDRIVE SKIP ROM" , "TRANSPORT" ], - 0x6d: ["OVERDRIVE MATCH ROM" , "GET ROM" ]} +command = { + 0x33: ["READ ROM" , "GET ROM" ], + 0x0f: ["CONDITIONAL READ ROM" , "GET ROM" ], + 0xcc: ["SKIP ROM" , "TRANSPORT" ], + 0x55: ["MATCH ROM" , "GET ROM" ], + 0xf0: ["SEARCH ROM" , "SEARCH ROM"], + 0xec: ["CONDITIONAL SEARCH ROM", "SEARCH ROM"], + 0x3c: ["OVERDRIVE SKIP ROM" , "TRANSPORT" ], + 0x6d: ["OVERDRIVE MATCH ROM" , "GET ROM" ] +} class Decoder(srd.Decoder): api_version = 1 diff --git a/decoders/onewire_transport/__init__.py b/decoders/onewire_transport/__init__.py index 3b9577e..df4db00 100644 --- a/decoders/onewire_transport/__init__.py +++ b/decoders/onewire_transport/__init__.py @@ -26,7 +26,7 @@ ground) between a single master and one or multiple slaves. The protocol is layered. - Link layer (reset, presence detection, reading/writing bits) - Network layer (skip/search/match device ROM addresses) -- Transport layer (transfer data between 1-Wire master and device) +- Transport layer (transport data between 1-Wire master and device) Transport layer diff --git a/decoders/onewire_transport/onewire_transport.py b/decoders/onewire_transport/onewire_transport.py index 67f5193..5481bd7 100644 --- a/decoders/onewire_transport/onewire_transport.py +++ b/decoders/onewire_transport/onewire_transport.py @@ -23,8 +23,26 @@ import sigrokdecode as srd # a dictionary of FUNCTION commands and their names -command = {0x44: "TEMPERATURE CONVERSION", - 0xbe: "READ SCRATCHPAD"} +command = { + # scratchpad + 0x4e: "WRITE SCRATCHPAD", + 0xbe: "READ SCRATCHPAD", + 0x48: "COPY SCRATCHPAD", + # thermometer + 0x44: "CONVERT TEMPERATURE", + 0xb4: "READ POWER MODE", + 0xb8: "RECALL EEPROM", + 0xf5: "PIO ACCESS READ", + 0xA5: "PIO ACCESS WRITE", + 0x99: "CHAIN", + # memory + 0xf0: "READ MEMORY", + 0xa5: "EXTENDED READ MEMORY", + 0x0f: "WRITE MEMORY", + 0x55: "WRITE STATUS", + 0xaa: "READ STATUS", + 0xf5: "CHANNEL ACCESS" +} class Decoder(srd.Decoder): api_version = 1 |