diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-01 10:44:38 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-01 10:44:38 +0200 |
| commit | e980af9df00ec25cbfbb07a37bc4dfe2088ed566 (patch) | |
| tree | ec21b90ecfeeec83170aef2f590792a8d572ed24 /addons/hw_scale/controllers/main.py | |
| parent | cbff00a5d2cf7137e903853cffc9aab15dd72016 (diff) | |
| parent | a9a556178d5fb4cb3fc657c4ffc455c521f1396c (diff) | |
[MERGE] forward port branch 11.0 up to a9a556178d5
Diffstat (limited to 'addons/hw_scale/controllers/main.py')
| -rw-r--r-- | addons/hw_scale/controllers/main.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/hw_scale/controllers/main.py b/addons/hw_scale/controllers/main.py index 162ab7a866d..ed8f92c73ea 100644 --- a/addons/hw_scale/controllers/main.py +++ b/addons/hw_scale/controllers/main.py @@ -95,7 +95,7 @@ ADAMEquipmentProtocol = ScaleProtocol( parity=serial.PARITY_NONE, timeout=0.2, writeTimeout=0.2, - weightRegexp=r"\s*([0-9.]+)kg", # LABEL format 3 + KG in the scale settings, but Label 1/2 should work + weightRegexp=b"\s*([0-9.]+)kg", # LABEL format 3 + KG in the scale settings, but Label 1/2 should work statusRegexp=None, statusParse=None, commandTerminator=b"\r\n", |