Mercurial > public > ostc4
annotate ostc4pack/OSTC4_FONT_upload.bin @ 471:73da921869d9 fix-bat-2
bugfix: implement battery charge percentage in dive header
This commit is (much) less trivial than the related 919e5cb51c92.
First, rename the CCRmode attribute (corresponding to byte Ox59) of
the SLogbookHeaderOSTC3. This byte (according to the hwOS interface
document) does not contain any CCR related value, but it contains
"battery information". Already since 2017, this byte is used from
libdivecomputer to interface the charge percentage. So, its
renamed from CCRmode to batteryCharge, to reflect its true purpose.
Now, simply add a batteryCharge attribute to the SLogbookHeader
(and see below why that is possible, without breaking things).
The remaining changes are trivial to implement battery charge
percentage in dive header.
Caveat: do not get confused by the exact role of the individual
logbook header types. SLogbookHeaderOSTC3 is the formal type of
the logbook format that the OSTC4 produces. This format is
supposed to identical to the format, as is used in hwOS for the
series of small OSTCs. Only some values of attributes are different.
For example, the OSTC4 supports VPM, so byte 0x79 (deco model used
for this dive) also has a value for VPM. But the SLogbookHeader
type, despite its name and structure, is *not* a true logbook
header, as it includes attributes that are not available in the
SLogbookHeaderOSTC3 formal header type.
Signed-off-by: Jan Mulder <jan@jlmulder.nl>
--> -->
| <type 'exceptions.AttributeError'> | Python 2.7.17: /usr/bin/python Sat Aug 24 22:38:10 2024 |
A problem occurred in a Python script. Here is the sequence of function calls leading up to the error, in the order they occurred.
| /var/www/vhosts/heinrichsweikamp.com/code/hgweb-public.cgi in <module>() |
| 15 |
| 16 from mercurial import demandimport; demandimport.enable() |
| 17 from mercurial.hgweb import hgweb, wsgicgi |
| 18 application = hgweb(config) |
| => 19 wsgicgi.launch(application) |
| wsgicgi = <module 'mercurial.hgweb.wsgicgi' from '/usr/lib...on2.7/dist-packages/mercurial/hgweb/wsgicgi.pyc'>, wsgicgi.launch = <function launch>, application = <mercurial.hgweb.hgwebdir_mod.hgwebdir object> |
| /usr/lib/python2.7/dist-packages/mercurial/hgweb/wsgicgi.py in launch(application=<mercurial.hgweb.hgwebdir_mod.hgwebdir object>) |
| 83 content = application(environ, start_response) |
| 84 try: |
| => 85 for chunk in content: |
| 86 write(chunk) |
| 87 if not headers_sent: |
| chunk = '/public/ostc4/rev/73da921869d9">changeset</a></l...Signed-off-by: Jan Mulder <jan@jlmulder.nl>', content = <generator object run_wsgi> |
| /usr/lib/python2.7/dist-packages/mercurial/hgweb/hgwebdir_mod.py in run_wsgi(self=<mercurial.hgweb.hgwebdir_mod.hgwebdir object>, req=<mercurial.hgweb.request.wsgirequest object>) |
| 227 with profiling.profile(self.ui, enabled=profile): |
| 228 try: |
| => 229 for r in self._runwsgi(req): |
| 230 yield r |
| 231 finally: |
| r = '/public/ostc4/rev/73da921869d9">changeset</a></l...Signed-off-by: Jan Mulder <jan@jlmulder.nl>', self = <mercurial.hgweb.hgwebdir_mod.hgwebdir object>, self._runwsgi = <bound method hgwebdir._runwsgi of <mercurial.hgweb.hgwebdir_mod.hgwebdir object>>, req = <mercurial.hgweb.request.wsgirequest object> |
| /usr/lib/python2.7/dist-packages/mercurial/hgweb/hgweb_mod.py in run_wsgi(self=<mercurial.hgweb.hgweb_mod.hgweb object>, req=<mercurial.hgweb.request.wsgirequest object>) |
| 316 profile = repo.ui.configbool('profiling', 'enabled') |
| 317 with profiling.profile(repo.ui, enabled=profile): |
| => 318 for r in self._runwsgi(req, repo): |
| 319 yield r |
| 320 |
| r = '/public/ostc4/rev/73da921869d9">changeset</a></l...Signed-off-by: Jan Mulder <jan@jlmulder.nl>', self = <mercurial.hgweb.hgweb_mod.hgweb object>, self._runwsgi = <bound method hgweb._runwsgi of <mercurial.hgweb.hgweb_mod.hgweb object>>, req = <mercurial.hgweb.request.wsgirequest object>, repo = <filteredrepo:served <mercurial.localrepo.localrepository object>> |
| /usr/lib/python2.7/dist-packages/mercurial/util.py in increasingchunks(source=<generator object _flatten>, min=4096, max=65536) |
| 1015 buf = [] |
| 1016 blen = 0 |
| => 1017 for chunk in source: |
| 1018 buf.append(chunk) |
| 1019 blen += len(chunk) |
| chunk = '">\n ', source = <generator object _flatten> |
| /usr/lib/python2.7/dist-packages/mercurial/templater.py in _flatten(thing=<generator object runtemplate>) |
| 1279 yield pycompat.bytestr(i) |
| 1280 else: |
| => 1281 for j in _flatten(i): |
| 1282 yield j |
| 1283 |
| j = '">\n<span>Ignore whitespace changes - </span>\n<sp..."ignorewseol-checkbox" type="checkbox" />\n</form>', global _flatten = <function _flatten>, i = <generator object runmap> |
| /usr/lib/python2.7/dist-packages/mercurial/templater.py in _flatten(thing=<generator object runmap>) |
| 1270 yield pycompat.bytestr(thing) |
| 1271 else: |
| => 1272 for i in thing: |
| 1273 i = templatekw.unwraphybrid(i) |
| 1274 if isinstance(i, bytes): |
| i undefined, thing = <generator object runmap> |
| /usr/lib/python2.7/dist-packages/mercurial/templater.py in runmap(context=<mercurial.templater.engine object>, mapping={'annotate': <function annotate>, 'author': 'Jan Mulder <jlmulder@xs4all.nl>', 'bookmarks': [], 'branch': [{'name': 'fix-bat-2'}], 'branches': [{'name': 'fix-bat-2'}], 'child': <function <lambda>>, 'date': (1587553737.0, -7200), 'desc': 'bugfix: implement battery charge percentage in d...ype.\n\nSigned-off-by: Jan Mulder <jan@jlmulder.nl>', 'diffopts': {'context': 3, 'git': False, 'ignoreblanklines': False, 'ignorews': False, 'ignorewsamount': False, 'ignorewseol': False, 'index': 0, 'nobinary': False, 'nodates': False, 'noprefix': False, ...}, 'extra': {'branch': 'fix-bat-2', 'histedit_source': '431c6aa60331c77467767166a3dc432b7838f805,205fda0551a2ed6e401fa71b963884c34034fd90', 'rebase_source': '08be2288bd75525348df4a7ca46fe6f91ebde61c'}, ...}, data=((<function runsymbol>, 'annotate'), (<function runtemplate>, [(<function runstring>, '\n<tr id="'), (<function runsymbol>, 'lineid'), (<function runstring>, '"'), (<function ifeq>, [(<function runsymbol>, 'node'), (<function runsymbol>, 'originalnode'), (<function runstring>, ' class="thisrev"')]), (<function runstring>, '>\n<td class="annotate parity'), (<function runsymbol>, 'blockparity'), (<function runstring>, '">\n'), (<function if_>, [(<function runsymbol>, 'blockhead'), (<function runtemplate>, [...])]), (<function runstring>, '\n<div class="annotate-info">\n<div>\n<a href="'), (<function runfilter>, ((<function runsymbol>, 'url'), <function urlescape>)), (<function runstring>, 'annotate/'), (<function runfilter>, ((<function runsymbol>, 'node'), <function short>)), (<function runstring>, '/'), (<function runfilter>, ((<function runsymbol>, 'file'), <function urlescape>)), (<function runmap>, ((<function runsymbol>, 'sessionvars'), (<function runtemplate>, [...]))), (<function runstring>, '#l'), (<function runsymbol>, 'targetline'), (<function runstring>, '">\n'), (<function runfilter>, ((<function runsymbol>, 'node'), <function short>)), (<function runstring>, '</a>\n'), ...]))) |
| 460 raise error.ParseError(_("%r is not iterable") % d) |
| 461 |
| => 462 for i, v in enumerate(diter): |
| 463 lm = mapping.copy() |
| 464 lm['index'] = i |
| i undefined, v undefined, builtin enumerate = <type 'enumerate'>, diter = <generator object annotate> |
| /usr/lib/python2.7/dist-packages/mercurial/hgweb/webcommands.py in annotate(**map={'annotate': <function annotate>, 'author': 'Jan Mulder <jlmulder@xs4all.nl>', 'bookmarks': [], 'branch': [{'name': 'fix-bat-2'}], 'branches': [{'name': 'fix-bat-2'}], 'child': <function <lambda>>, 'date': (1587553737.0, -7200), 'desc': 'bugfix: implement battery charge percentage in d...ype.\n\nSigned-off-by: Jan Mulder <jan@jlmulder.nl>', 'diffopts': {'context': 3, 'git': False, 'ignoreblanklines': False, 'ignorews': False, 'ignorewsamount': False, 'ignorewseol': False, 'index': 0, 'nobinary': False, 'nodates': False, 'noprefix': False, ...}, 'extra': {'branch': 'fix-bat-2', 'histedit_source': '431c6aa60331c77467767166a3dc432b7838f805,205fda0551a2ed6e401fa71b963884c34034fd90', 'rebase_source': '08be2288bd75525348df4a7ca46fe6f91ebde61c'}, ...}) |
| 907 blockparitygen = paritygen(1) |
| 908 for lineno, (aline, l) in enumerate(lines): |
| => 909 f = aline.fctx |
| 910 rev = f.rev() |
| 911 if rev != previousrev: |
| f undefined, aline = (<filectx ostc4pack/OSTC4_FONT_upload.bin@018586760ca7>, 1), aline.fctx undefined |
<type 'exceptions.AttributeError'>: 'tuple' object has no attribute 'fctx'
args =
("'tuple' object has no attribute 'fctx'",)
message =
"'tuple' object has no attribute 'fctx'"