Some code cleanup

new page code example by page windrose

.gitignore

@@ -6,3 +6,4 @@
 generated/*
 lib/generated
 webinstall/token.php
+*~

extra_script.py

@@ -104,8 +104,7 @@ def writeFileIfChanged(fileName,data):
     return True    
 
 def mergeConfig(base,other):
-    for bdir in other:
+    for cname in other:
-        cname=os.path.join(bdir,"config.json")
         if os.path.exists(cname):
             print("merge config %s"%cname)
             with open(cname,'rb') as ah:
@@ -151,13 +150,25 @@ def expandConfig(config):
                     rt.append(replaceTexts(c,replace))
     return rt
 
-def generateMergedConfig(inFile,outFile,addDirs=[]):
+def createUserItemList(dirs,itemName,files):
+    rt=[]
+    for d in dirs:
+        iname=os.path.join(d,itemName)
+        if os.path.exists(iname):
+            rt.append(iname)
+    for f in files:
+        if not os.path.exists(f):
+            raise Exception("user item %s not found"%f)
+        rt.append(f)
+    return rt
+
+def generateMergedConfig(inFile,outFile,addFiles=[]):
     if not os.path.exists(inFile):
         raise Exception("unable to read cfg file %s"%inFile)
     data=""
     with open(inFile,'rb') as ch:    
         config=json.load(ch)
-        config=mergeConfig(config,addDirs)
+        config=mergeConfig(config,addFiles)
         config=expandConfig(config)
         data=json.dumps(config,indent=2)
         writeFileIfChanged(outFile,data)
@@ -274,9 +285,9 @@ class Grove:
     def _ss(self,z=False):
         if z:
             return self.name
-        return self.name if self.name is not 'Z' else ''
+        return self.name if self.name != 'Z' else ''
     def _suffix(self):
-        return '_'+self.name if self.name is not 'Z' else ''
+        return '_'+self.name if self.name != 'Z' else ''
     def replace(self,line):
         if line is None:
             return line
@@ -377,12 +388,7 @@ def getLibs():
 
 
 
-def joinFiles(target,pattern,dirlist):
+def joinFiles(target,flist):
-    flist=[]
-    for dir in dirlist:
-            fn=os.path.join(dir,pattern)
-            if os.path.exists(fn):
-                flist.append(fn)
     current=False
     if os.path.exists(target):
         current=True
@@ -453,7 +459,28 @@ def handleDeps(env):
         )
     env.AddBuildMiddleware(injectIncludes)
 
+def getOption(env,name,toArray=True):
+    try:
+        opt=env.GetProjectOption(name)
+        if toArray:
+            if opt is None:
+                return []
+            if isinstance(opt,list):
+                return opt
+            return opt.split("\n" if "\n" in opt else ",")
+        return opt
+    except:
+        pass
+    if toArray:
+        return []
 
+def getFileList(files):
+    base=basePath()
+    rt=[]
+    for f in files:
+        if f is not None and f != "":
+            rt.append(os.path.join(base,f))
+    return rt
 def prebuild(env):
     global userTaskDirs
     print("#prebuild running")
@@ -463,14 +490,18 @@ def prebuild(env):
     if ldf_mode == 'off':
         print("##ldf off - own dependency handling")
         handleDeps(env)
+    extraConfigs=getOption(env,'custom_config',toArray=True)
+    extraJs=getOption(env,'custom_js',toArray=True)
+    extraCss=getOption(env,'custom_css',toArray=True)
+
     userTaskDirs=getUserTaskDirs()
     mergedConfig=os.path.join(outPath(),os.path.basename(CFG_FILE))
-    generateMergedConfig(os.path.join(basePath(),CFG_FILE),mergedConfig,userTaskDirs)
+    generateMergedConfig(os.path.join(basePath(),CFG_FILE),mergedConfig,createUserItemList(userTaskDirs,"config.json", getFileList(extraConfigs)))
     compressFile(mergedConfig,mergedConfig+".gz")
     generateCfg(mergedConfig,os.path.join(outPath(),CFG_INCLUDE),False)
     generateCfg(mergedConfig,os.path.join(outPath(),CFG_INCLUDE_IMPL),True)
-    joinFiles(os.path.join(outPath(),INDEXJS+".gz"),INDEXJS,["web"]+userTaskDirs)
+    joinFiles(os.path.join(outPath(),INDEXJS+".gz"),createUserItemList(["web"]+userTaskDirs,INDEXJS,getFileList(extraJs)))
-    joinFiles(os.path.join(outPath(),INDEXCSS+".gz"),INDEXCSS,["web"]+userTaskDirs)
+    joinFiles(os.path.join(outPath(),INDEXCSS+".gz"),createUserItemList(["web"]+userTaskDirs,INDEXCSS,getFileList(extraCss)))
     embedded=getEmbeddedFiles(env)
     filedefs=[]
     for ef in embedded:

extra_script.py.new

@@ -1,542 +0,0 @@
-print("running extra...")
-import gzip
-import shutil
-import os
-import sys
-import inspect
-import json
-import glob
-from datetime import datetime
-import re
-import pprint
-from platformio.project.config import ProjectConfig
-from platformio.project.exception import InvalidProjectConfError
-
-Import("env")
-#print(env.Dump())
-OWN_FILE="extra_script.py"
-GEN_DIR='lib/generated'
-CFG_FILE='web/config.json'
-XDR_FILE='web/xdrconfig.json'
-INDEXJS="index.js"
-INDEXCSS="index.css"
-CFG_INCLUDE='GwConfigDefinitions.h'
-CFG_INCLUDE_IMPL='GwConfigDefImpl.h'
-XDR_INCLUDE='GwXdrTypeMappings.h'
-TASK_INCLUDE='GwUserTasks.h'
-GROVE_CONFIG="GwM5GroveGen.h"
-GROVE_CONFIG_IN="lib/hardware/GwM5Grove.in"
-EMBEDDED_INCLUDE="GwEmbeddedFiles.h"
-
-def getEmbeddedFiles(env):
-    rt=[]
-    efiles=env.GetProjectOption("board_build.embed_files")
-    for f in efiles.split("\n"):
-        if f == '':
-            continue
-        rt.append(f)
-    return rt  
-
-def basePath():
-    #see: https://stackoverflow.com/questions/16771894/python-nameerror-global-name-file-is-not-defined
-    return os.path.dirname(inspect.getfile(lambda: None))
-
-def outPath():
-    return os.path.join(basePath(),GEN_DIR)
-def checkDir():
-    dn=outPath()
-    if not os.path.exists(dn):
-        os.makedirs(dn)
-    if not os.path.isdir(dn):
-        print("unable to create %s"%dn)
-        return False
-    return True    
-
-def isCurrent(infile,outfile):
-    if os.path.exists(outfile):
-        otime=os.path.getmtime(outfile)
-        itime=os.path.getmtime(infile)
-        if (otime >= itime):
-            own=os.path.join(basePath(),OWN_FILE)
-            if os.path.exists(own):
-                owntime=os.path.getmtime(own)
-                if owntime > otime:
-                    return False
-            print("%s is newer then %s, no need to recreate"%(outfile,infile))
-            return True
-    return False        
-def compressFile(inFile,outfile):
-    if isCurrent(inFile,outfile):
-        return
-    print("compressing %s"%inFile)
-    with open(inFile, 'rb') as f_in:
-        with gzip.open(outfile, 'wb') as f_out:
-            shutil.copyfileobj(f_in, f_out)
-
-def generateFile(infile,outfile,callback,inMode='rb',outMode='w'):
-    if isCurrent(infile,outfile):
-        return
-    print("creating %s"%outfile)
-    oh=None
-    with open(infile,inMode) as ch:
-        with open(outfile,outMode) as oh:
-            try:
-                callback(ch,oh,inFile=infile)
-                oh.close()
-            except Exception as e:
-                try:
-                    oh.close()
-                except:
-                    pass
-                os.unlink(outfile)
-                raise
-
-def writeFileIfChanged(fileName,data):
-    if os.path.exists(fileName):
-        with open(fileName,"r") as ih:
-            old=ih.read()
-            ih.close()
-            if old == data:
-                return False
-    print("#generating %s"%fileName)
-    with open(fileName,"w") as oh:
-        oh.write(data)
-    return True    
-
-def mergeConfig(base,other):
-    try:
-        customconfig = env.GetProjectOption("custom_config")
-    except InvalidProjectConfError:
-        customconfig = None
-    for bdir in other:
-        if customconfig and os.path.exists(os.path.join(bdir,customconfig)):
-            cname=os.path.join(bdir,customconfig)
-            print("merge custom config {}".format(cname))
-            with open(cname,'rb') as ah:
-                base += json.load(ah)
-            continue   
-        cname=os.path.join(bdir,"config.json")
-        if os.path.exists(cname):
-            print("merge config %s"%cname)
-            with open(cname,'rb') as ah:
-                merge=json.load(ah)
-                base=base+merge
-    return base
-
-def replaceTexts(data,replacements):
-    if replacements is None:
-        return data
-    if isinstance(data,str):
-        for k,v in replacements.items():
-            data=data.replace("$"+k,str(v))
-        return data
-    if isinstance(data,list):
-        rt=[]
-        for e in data:
-            rt.append(replaceTexts(e,replacements))
-        return rt
-    if isinstance(data,dict):   
-        rt={} 
-        for k,v in data.items():
-            rt[replaceTexts(k,replacements)]=replaceTexts(v,replacements)
-        return rt
-    return data
-def expandConfig(config):
-    rt=[]
-    for item in config:
-        type=item.get('type')
-        if type != 'array':
-            rt.append(item)
-            continue
-        replacements=item.get('replace')
-        children=item.get('children')
-        name=item.get('name')
-        if name is None:
-            name="#unknown#"
-        if not isinstance(replacements,list):
-            raise Exception("missing replacements at array %s"%name)
-        for replace in replacements:
-            if children is not None:
-                for c in children:
-                    rt.append(replaceTexts(c,replace))
-    return rt
-
-def generateMergedConfig(inFile,outFile,addDirs=[]):
-    if not os.path.exists(inFile):
-        raise Exception("unable to read cfg file %s"%inFile)
-    data=""
-    with open(inFile,'rb') as ch:    
-        config=json.load(ch)
-        config=mergeConfig(config,addDirs)
-        config=expandConfig(config)
-        data=json.dumps(config,indent=2)
-        writeFileIfChanged(outFile,data)
-
-def generateCfg(inFile,outFile,impl):
-    if not os.path.exists(inFile):
-        raise Exception("unable to read cfg file %s"%inFile)
-    data=""
-    with open(inFile,'rb') as ch:    
-        config=json.load(ch)     
-        data+="//generated from %s\n"%inFile
-        l=len(config)
-        idx=0
-        if not impl:
-            data+='#include "GwConfigItem.h"\n'
-            data+='class GwConfigDefinitions{\n'
-            data+='  public:\n'
-            data+='  int getNumConfig() const{return %d;}\n'%(l)
-            for item in config:
-                n=item.get('name')
-                if n is None:
-                    continue
-                if len(n) > 15:
-                    raise Exception("%s: config names must be max 15 caracters"%n)
-                data+='  static constexpr const char* %s="%s";\n'%(n,n)
-            data+="};\n"
-        else:
-            data+='void GwConfigHandler::populateConfigs(GwConfigInterface **config){\n'
-            for item in config:
-                name=item.get('name')
-                if name is None:
-                    continue
-                data+='  configs[%d]='%(idx)
-                idx+=1
-                secret="false";
-                if item.get('type') == 'password':
-                    secret="true"
-                data+="     new GwConfigInterface(%s,\"%s\",%s);\n"%(name,item.get('default'),secret)
-            data+='}\n'  
-    writeFileIfChanged(outFile,data)    
-                    
-def labelFilter(label):
-    return re.sub("[^a-zA-Z0-9]","",re.sub("\([0-9]*\)","",label))    
-def generateXdrMappings(fp,oh,inFile=''):
-    jdoc=json.load(fp)
-    oh.write("static GwXDRTypeMapping* typeMappings[]={\n")
-    first=True
-    for cat in jdoc:
-        item=jdoc[cat]
-        cid=item.get('id')
-        if cid is None:
-            continue
-        tc=item.get('type')
-        if tc is not None:
-            if first:
-                first=False
-            else:
-                oh.write(",\n")
-            oh.write("   new GwXDRTypeMapping(%d,0,%d) /*%s*/"%(cid,tc,cat))
-        fields=item.get('fields')
-        if fields is None:
-            continue
-        idx=0
-        for fe in fields:
-            if not isinstance(fe,dict):
-                continue
-            tc=fe.get('t')
-            id=fe.get('v')
-            if id is None:
-                id=idx
-            idx+=1
-            l=fe.get('l') or ''
-            if tc is None or id is None:
-                continue
-            if first:
-                first=False
-            else:
-                oh.write(",\n")
-            oh.write("   new GwXDRTypeMapping(%d,%d,%d) /*%s:%s*/"%(cid,id,tc,cat,l))
-    oh.write("\n")
-    oh.write("};\n")
-    for cat in jdoc:
-        item=jdoc[cat]
-        cid=item.get('id')
-        if cid is None:
-            continue
-        selectors=item.get('selector')
-        if selectors is not None:
-            for selector in selectors:
-                label=selector.get('l')
-                value=selector.get('v')
-                if label is not None and value is not None:
-                    label=labelFilter(label)
-                    define=("GWXDRSEL_%s_%s"%(cat,label)).upper()
-                    oh.write("    #define %s %s\n"%(define,value))
-        fields=item.get('fields')
-        if fields is not None:
-            idx=0
-            for field in fields:
-                v=field.get('v')
-                if v is None:
-                    v=idx
-                else:
-                    v=int(v)
-                label=field.get('l')
-                if v is not None and label is not None:
-                    define=("GWXDRFIELD_%s_%s"%(cat,labelFilter(label))).upper();
-                    oh.write("    #define %s %s\n"%(define,str(v)))
-                idx+=1
-
-class Grove:
-    def __init__(self,name) -> None:
-        self.name=name
-    def _ss(self,z=False):
-        if z:
-            return self.name
-        return self.name if self.name != 'Z' else ''
-    def _suffix(self):
-        return '_'+self.name if self.name != 'Z' else ''
-    def replace(self,line):
-        if line is None:
-            return line
-        return line.replace('$G$',self._ss()).replace('$Z$',self._ss(True)).replace('$GS$',self._suffix())
-def generateGroveDefs(inh,outh,inFile=''):
-    GROVES=[Grove('Z'),Grove('A'),Grove('B'),Grove('C')]
-    definition=[]
-    started=False
-    def writeConfig():
-        for grove in GROVES:        
-            for cl in definition:
-                outh.write(grove.replace(cl))
-
-    for line in inh:
-        if re.match(" *#GROVE",line):
-            started=True
-            if len(definition) > 0:
-                writeConfig()
-            definition=[]
-            continue
-        if started:
-            definition.append(line)
-    if len(definition) > 0:
-        writeConfig()
-
-
-
-userTaskDirs=[]
-
-def getUserTaskDirs():
-    rt=[]
-    taskdirs=glob.glob(os.path.join( basePath(),'lib','*task*'))
-    for task in taskdirs:
-        rt.append(task)
-    return rt
-
-def checkAndAdd(file,names,ilist):
-    if not file.endswith('.h'):
-        return
-    match=False
-    for cmp in names:
-        #print("##check %s<->%s"%(f.lower(),cmp))
-        if file.lower() == cmp:
-            match=True
-    if not match:
-        return
-    ilist.append(file) 
-def genereateUserTasks(outfile):
-    includes=[]
-    for task in userTaskDirs:
-        #print("##taskdir=%s"%task)
-        base=os.path.basename(task)
-        includeNames=[base.lower()+".h",'gw'+base.lower()+'.h']
-        for f in os.listdir(task):
-            checkAndAdd(f,includeNames,includes)
-    includeData=""
-    for i in includes:
-        print("#task include %s"%i)
-        includeData+="#include <%s>\n"%i
-    writeFileIfChanged(outfile,includeData)            
-
-def generateEmbedded(elist,outFile):
-    content=""
-    for entry in elist:
-        content+="EMBED_GZ_FILE(\"%s\",%s,\"%s\");\n"%entry
-    writeFileIfChanged(outFile,content)    
-
-def getContentType(fn):
-    if (fn.endswith('.gz')):
-        fn=fn[0:-3]
-    if (fn.endswith('html')):
-        return "text/html"
-    if (fn.endswith('json')):
-        return "application/json"
-    if (fn.endswith('js')):
-        return "text/javascript"
-    if (fn.endswith('css')):    
-        return "text/css"
-    return "application/octet-stream"
-
-
-def getLibs():
-    base=os.path.join(basePath(),"lib")
-    rt=[]
-    for sd in os.listdir(base):
-        if sd == '..':
-            continue
-        if sd == '.':
-            continue
-        fn=os.path.join(base,sd)
-        if os.path.isdir(fn):
-            rt.append(sd)
-    EXTRAS=['generated']
-    for e in EXTRAS:
-        if not e in rt:
-            rt.append(e)
-    return rt
-
-
-
-def joinFiles(target,pattern,dirlist):
-    flist=[]
-    for dir in dirlist:
-            fn=os.path.join(dir,pattern)
-            if os.path.exists(fn):
-                flist.append(fn)
-    current=False
-    if os.path.exists(target):
-        current=True
-        for f in flist:
-            if not isCurrent(f,target):
-                current=False
-                break
-    if current:
-        print("%s is up to date"%target)
-        return
-    print("creating %s"%target)
-    with gzip.open(target,"wb") as oh:
-        for fn in flist:
-            print("adding %s to %s"%(fn,target))
-            with open(fn,"rb") as rh:
-                shutil.copyfileobj(rh,oh)
-    
-
-OWNLIBS=getLibs()+["FS","WiFi"]
-GLOBAL_INCLUDES=[]
-
-def handleDeps(env):
-    #overwrite the GetProjectConfig
-    #to inject all our libs
-    oldGetProjectConfig=env.GetProjectConfig    
-    def GetProjectConfigX(env):        
-        rt=oldGetProjectConfig()
-        cenv="env:"+env['PIOENV']
-        libs=[]
-        for section,options in rt.as_tuple():
-            if section == cenv:
-                for key,values in options:
-                    if key == 'lib_deps':
-                        libs=values
-    
-        mustUpdate=False
-        for lib in OWNLIBS:
-            if not lib in libs:
-                libs.append(lib)
-                mustUpdate=True
-        if mustUpdate:
-            update=[(cenv,[('lib_deps',libs)])]
-            rt.update(update)
-        return rt
-    env.AddMethod(GetProjectConfigX,"GetProjectConfig")
-    #store the list of all includes after we resolved
-    #the dependencies for our main project
-    #we will use them for all compilations afterwards
-    oldLibBuilder=env.ConfigureProjectLibBuilder
-    def ConfigureProjectLibBuilderX(env):
-        global GLOBAL_INCLUDES
-        project=oldLibBuilder()
-        #print("##ConfigureProjectLibBuilderX")
-        #pprint.pprint(project)
-        if project.depbuilders:
-            #print("##depbuilders %s"%",".join(map(lambda x: x.path,project.depbuilders)))
-            for db in project.depbuilders:
-                idirs=db.get_include_dirs()
-                for id in idirs:
-                    if not id in GLOBAL_INCLUDES:
-                        GLOBAL_INCLUDES.append(id)
-        return project
-    env.AddMethod(ConfigureProjectLibBuilderX,"ConfigureProjectLibBuilder")
-    def injectIncludes(env,node):
-        return env.Object(
-            node,
-            CPPPATH=env["CPPPATH"]+GLOBAL_INCLUDES
-        )
-    env.AddBuildMiddleware(injectIncludes)
-
-
-def prebuild(env):
-    global userTaskDirs
-    print("#prebuild running")
-    if not checkDir():
-        sys.exit(1)
-    ldf_mode=env.GetProjectOption("lib_ldf_mode")
-    if ldf_mode == 'off':
-        print("##ldf off - own dependency handling")
-        handleDeps(env)
-    userTaskDirs=getUserTaskDirs()
-    mergedConfig=os.path.join(outPath(),os.path.basename(CFG_FILE))
-    generateMergedConfig(os.path.join(basePath(),CFG_FILE),mergedConfig,userTaskDirs)
-    compressFile(mergedConfig,mergedConfig+".gz")
-    generateCfg(mergedConfig,os.path.join(outPath(),CFG_INCLUDE),False)
-    generateCfg(mergedConfig,os.path.join(outPath(),CFG_INCLUDE_IMPL),True)
-    joinFiles(os.path.join(outPath(),INDEXJS+".gz"),INDEXJS,["web"]+userTaskDirs)
-    joinFiles(os.path.join(outPath(),INDEXCSS+".gz"),INDEXCSS,["web"]+userTaskDirs)
-    embedded=getEmbeddedFiles(env)
-    filedefs=[]
-    for ef in embedded:
-        print("#checking embedded file %s"%ef)
-        (dn,fn)=os.path.split(ef)
-        pureName=fn
-        if pureName.endswith('.gz'):
-            pureName=pureName[0:-3]
-        ct=getContentType(pureName)
-        usname=ef.replace('/','_').replace('.','_')
-        filedefs.append((pureName,usname,ct))
-        inFile=os.path.join(basePath(),"web",pureName)
-        if os.path.exists(inFile):
-            compressFile(inFile,ef)
-        else:
-            print("#WARNING: infile %s for %s not found"%(inFile,ef))
-    generateEmbedded(filedefs,os.path.join(outPath(),EMBEDDED_INCLUDE))
-    genereateUserTasks(os.path.join(outPath(), TASK_INCLUDE))
-    generateFile(os.path.join(basePath(),XDR_FILE),os.path.join(outPath(),XDR_INCLUDE),generateXdrMappings)
-    generateFile(os.path.join(basePath(),GROVE_CONFIG_IN),os.path.join(outPath(),GROVE_CONFIG),generateGroveDefs,inMode='r')
-    version="dev"+datetime.now().strftime("%Y%m%d")
-    env.Append(CPPDEFINES=[('GWDEVVERSION',version)])
-
-def cleangenerated(source, target, env):
-    od=outPath()
-    if os.path.isdir(od):
-        print("#cleaning up %s"%od)
-        for f in os.listdir(od):
-            if f == "." or f == "..":
-                continue
-            fn=os.path.join(od,f)
-            os.unlink(f)
-
-
-print("#prescript...")
-prebuild(env)
-board="PLATFORM_BOARD_%s"%env["BOARD"].replace("-","_").upper()
-print("Board=#%s#"%board)
-print("BuildFlags=%s"%(" ".join(env["BUILD_FLAGS"])))
-env.Append(
-    LINKFLAGS=[ "-u", "custom_app_desc" ],
-    CPPDEFINES=[(board,"1")]
-)
-#script does not run on clean yet - maybe in the future
-env.AddPostAction("clean",cleangenerated)
-
-#look for extra task scripts and include them here
-for taskdir in userTaskDirs:
-    script = os.path.join(taskdir, "extra_task.py")
-    if os.path.isfile(script):
-        taskname = os.path.basename(os.path.normpath(taskdir))
-        print("#extra task script for '{}'".format(taskname))
-        with open(script) as fh:
-            try:
-                code = compile(fh.read(), taskname, 'exec')
-            except SyntaxError:
-                print("#ERROR: script does not compile")
-                continue
-            exec(code)

extra_script.py.old

@@ -1,518 +0,0 @@
-print("running extra...")
-import gzip
-import shutil
-import os
-import sys
-import inspect
-import json
-import glob
-from datetime import datetime
-import re
-import pprint
-from platformio.project.config import ProjectConfig
-
-
-Import("env")
-#print(env.Dump())
-OWN_FILE="extra_script.py"
-GEN_DIR='lib/generated'
-CFG_FILE='web/config.json'
-XDR_FILE='web/xdrconfig.json'
-INDEXJS="index.js"
-INDEXCSS="index.css"
-CFG_INCLUDE='GwConfigDefinitions.h'
-CFG_INCLUDE_IMPL='GwConfigDefImpl.h'
-XDR_INCLUDE='GwXdrTypeMappings.h'
-TASK_INCLUDE='GwUserTasks.h'
-GROVE_CONFIG="GwM5GroveGen.h"
-GROVE_CONFIG_IN="lib/hardware/GwM5Grove.in"
-EMBEDDED_INCLUDE="GwEmbeddedFiles.h"
-
-def getEmbeddedFiles(env):
-    rt=[]
-    efiles=env.GetProjectOption("board_build.embed_files")
-    for f in efiles.split("\n"):
-        if f == '':
-            continue
-        rt.append(f)
-    return rt  
-
-def basePath():
-    #see: https://stackoverflow.com/questions/16771894/python-nameerror-global-name-file-is-not-defined
-    return os.path.dirname(inspect.getfile(lambda: None))
-
-def outPath():
-    return os.path.join(basePath(),GEN_DIR)
-def checkDir():
-    dn=outPath()
-    if not os.path.exists(dn):
-        os.makedirs(dn)
-    if not os.path.isdir(dn):
-        print("unable to create %s"%dn)
-        return False
-    return True    
-
-def isCurrent(infile,outfile):
-    if os.path.exists(outfile):
-        otime=os.path.getmtime(outfile)
-        itime=os.path.getmtime(infile)
-        if (otime >= itime):
-            own=os.path.join(basePath(),OWN_FILE)
-            if os.path.exists(own):
-                owntime=os.path.getmtime(own)
-                if owntime > otime:
-                    return False
-            print("%s is newer then %s, no need to recreate"%(outfile,infile))
-            return True
-    return False        
-def compressFile(inFile,outfile):
-    if isCurrent(inFile,outfile):
-        return
-    print("compressing %s"%inFile)
-    with open(inFile, 'rb') as f_in:
-        with gzip.open(outfile, 'wb') as f_out:
-            shutil.copyfileobj(f_in, f_out)
-
-def generateFile(infile,outfile,callback,inMode='rb',outMode='w'):
-    if isCurrent(infile,outfile):
-        return
-    print("creating %s"%outfile)
-    oh=None
-    with open(infile,inMode) as ch:
-        with open(outfile,outMode) as oh:
-            try:
-                callback(ch,oh,inFile=infile)
-                oh.close()
-            except Exception as e:
-                try:
-                    oh.close()
-                except:
-                    pass
-                os.unlink(outfile)
-                raise
-
-def writeFileIfChanged(fileName,data):
-    if os.path.exists(fileName):
-        with open(fileName,"r") as ih:
-            old=ih.read()
-            ih.close()
-            if old == data:
-                return False
-    print("#generating %s"%fileName)
-    with open(fileName,"w") as oh:
-        oh.write(data)
-    return True    
-
-def mergeConfig(base,other):
-    for bdir in other:
-        cname=os.path.join(bdir,"config.json")
-        if os.path.exists(cname):
-            print("merge config %s"%cname)
-            with open(cname,'rb') as ah:
-                merge=json.load(ah)
-                base=base+merge
-    return base
-
-def replaceTexts(data,replacements):
-    if replacements is None:
-        return data
-    if isinstance(data,str):
-        for k,v in replacements.items():
-            data=data.replace("$"+k,str(v))
-        return data
-    if isinstance(data,list):
-        rt=[]
-        for e in data:
-            rt.append(replaceTexts(e,replacements))
-        return rt
-    if isinstance(data,dict):   
-        rt={} 
-        for k,v in data.items():
-            rt[replaceTexts(k,replacements)]=replaceTexts(v,replacements)
-        return rt
-    return data
-def expandConfig(config):
-    rt=[]
-    for item in config:
-        type=item.get('type')
-        if type != 'array':
-            rt.append(item)
-            continue
-        replacements=item.get('replace')
-        children=item.get('children')
-        name=item.get('name')
-        if name is None:
-            name="#unknown#"
-        if not isinstance(replacements,list):
-            raise Exception("missing replacements at array %s"%name)
-        for replace in replacements:
-            if children is not None:
-                for c in children:
-                    rt.append(replaceTexts(c,replace))
-    return rt
-
-def generateMergedConfig(inFile,outFile,addDirs=[]):
-    if not os.path.exists(inFile):
-        raise Exception("unable to read cfg file %s"%inFile)
-    data=""
-    with open(inFile,'rb') as ch:    
-        config=json.load(ch)
-        config=mergeConfig(config,addDirs)
-        config=expandConfig(config)
-        data=json.dumps(config,indent=2)
-        writeFileIfChanged(outFile,data)
-
-def generateCfg(inFile,outFile,impl):
-    if not os.path.exists(inFile):
-        raise Exception("unable to read cfg file %s"%inFile)
-    data=""
-    with open(inFile,'rb') as ch:    
-        config=json.load(ch)     
-        data+="//generated from %s\n"%inFile
-        l=len(config)
-        idx=0
-        if not impl:
-            data+='#include "GwConfigItem.h"\n'
-            data+='class GwConfigDefinitions{\n'
-            data+='  public:\n'
-            data+='  int getNumConfig() const{return %d;}\n'%(l)
-            for item in config:
-                n=item.get('name')
-                if n is None:
-                    continue
-                if len(n) > 15:
-                    raise Exception("%s: config names must be max 15 caracters"%n)
-                data+='  static constexpr const char* %s="%s";\n'%(n,n)
-            data+="};\n"
-        else:
-            data+='void GwConfigHandler::populateConfigs(GwConfigInterface **config){\n'
-            for item in config:
-                name=item.get('name')
-                if name is None:
-                    continue
-                data+='  configs[%d]='%(idx)
-                idx+=1
-                secret="false";
-                if item.get('type') == 'password':
-                    secret="true"
-                data+="     new GwConfigInterface(%s,\"%s\",%s);\n"%(name,item.get('default'),secret)
-            data+='}\n'  
-    writeFileIfChanged(outFile,data)    
-                    
-def labelFilter(label):
-    return re.sub("[^a-zA-Z0-9]","",re.sub("\([0-9]*\)","",label))    
-def generateXdrMappings(fp,oh,inFile=''):
-    jdoc=json.load(fp)
-    oh.write("static GwXDRTypeMapping* typeMappings[]={\n")
-    first=True
-    for cat in jdoc:
-        item=jdoc[cat]
-        cid=item.get('id')
-        if cid is None:
-            continue
-        tc=item.get('type')
-        if tc is not None:
-            if first:
-                first=False
-            else:
-                oh.write(",\n")
-            oh.write("   new GwXDRTypeMapping(%d,0,%d) /*%s*/"%(cid,tc,cat))
-        fields=item.get('fields')
-        if fields is None:
-            continue
-        idx=0
-        for fe in fields:
-            if not isinstance(fe,dict):
-                continue
-            tc=fe.get('t')
-            id=fe.get('v')
-            if id is None:
-                id=idx
-            idx+=1
-            l=fe.get('l') or ''
-            if tc is None or id is None:
-                continue
-            if first:
-                first=False
-            else:
-                oh.write(",\n")
-            oh.write("   new GwXDRTypeMapping(%d,%d,%d) /*%s:%s*/"%(cid,id,tc,cat,l))
-    oh.write("\n")
-    oh.write("};\n")
-    for cat in jdoc:
-        item=jdoc[cat]
-        cid=item.get('id')
-        if cid is None:
-            continue
-        selectors=item.get('selector')
-        if selectors is not None:
-            for selector in selectors:
-                label=selector.get('l')
-                value=selector.get('v')
-                if label is not None and value is not None:
-                    label=labelFilter(label)
-                    define=("GWXDRSEL_%s_%s"%(cat,label)).upper()
-                    oh.write("    #define %s %s\n"%(define,value))
-        fields=item.get('fields')
-        if fields is not None:
-            idx=0
-            for field in fields:
-                v=field.get('v')
-                if v is None:
-                    v=idx
-                else:
-                    v=int(v)
-                label=field.get('l')
-                if v is not None and label is not None:
-                    define=("GWXDRFIELD_%s_%s"%(cat,labelFilter(label))).upper();
-                    oh.write("    #define %s %s\n"%(define,str(v)))
-                idx+=1
-
-class Grove:
-    def __init__(self,name) -> None:
-        self.name=name
-    def _ss(self,z=False):
-        if z:
-            return self.name
-        return self.name if self.name is not 'Z' else ''
-    def _suffix(self):
-        return '_'+self.name if self.name is not 'Z' else ''
-    def replace(self,line):
-        if line is None:
-            return line
-        return line.replace('$G$',self._ss()).replace('$Z$',self._ss(True)).replace('$GS$',self._suffix())
-def generateGroveDefs(inh,outh,inFile=''):
-    GROVES=[Grove('Z'),Grove('A'),Grove('B'),Grove('C')]
-    definition=[]
-    started=False
-    def writeConfig():
-        for grove in GROVES:        
-            for cl in definition:
-                outh.write(grove.replace(cl))
-
-    for line in inh:
-        if re.match(" *#GROVE",line):
-            started=True
-            if len(definition) > 0:
-                writeConfig()
-            definition=[]
-            continue
-        if started:
-            definition.append(line)
-    if len(definition) > 0:
-        writeConfig()
-
-
-
-userTaskDirs=[]
-
-def getUserTaskDirs():
-    rt=[]
-    taskdirs=glob.glob(os.path.join( basePath(),'lib','*task*'))
-    for task in taskdirs:
-        rt.append(task)
-    return rt
-
-def checkAndAdd(file,names,ilist):
-    if not file.endswith('.h'):
-        return
-    match=False
-    for cmp in names:
-        #print("##check %s<->%s"%(f.lower(),cmp))
-        if file.lower() == cmp:
-            match=True
-    if not match:
-        return
-    ilist.append(file) 
-def genereateUserTasks(outfile):
-    includes=[]
-    for task in userTaskDirs:
-        #print("##taskdir=%s"%task)
-        base=os.path.basename(task)
-        includeNames=[base.lower()+".h",'gw'+base.lower()+'.h']
-        for f in os.listdir(task):
-            checkAndAdd(f,includeNames,includes)
-    includeData=""
-    for i in includes:
-        print("#task include %s"%i)
-        includeData+="#include <%s>\n"%i
-    writeFileIfChanged(outfile,includeData)            
-
-def generateEmbedded(elist,outFile):
-    content=""
-    for entry in elist:
-        content+="EMBED_GZ_FILE(\"%s\",%s,\"%s\");\n"%entry
-    writeFileIfChanged(outFile,content)    
-
-def getContentType(fn):
-    if (fn.endswith('.gz')):
-        fn=fn[0:-3]
-    if (fn.endswith('html')):
-        return "text/html"
-    if (fn.endswith('json')):
-        return "application/json"
-    if (fn.endswith('js')):
-        return "text/javascript"
-    if (fn.endswith('css')):    
-        return "text/css"
-    return "application/octet-stream"
-
-
-def getLibs():
-    base=os.path.join(basePath(),"lib")
-    rt=[]
-    for sd in os.listdir(base):
-        if sd == '..':
-            continue
-        if sd == '.':
-            continue
-        fn=os.path.join(base,sd)
-        if os.path.isdir(fn):
-            rt.append(sd)
-    EXTRAS=['generated']
-    for e in EXTRAS:
-        if not e in rt:
-            rt.append(e)
-    return rt
-
-
-
-def joinFiles(target,pattern,dirlist):
-    flist=[]
-    for dir in dirlist:
-            fn=os.path.join(dir,pattern)
-            if os.path.exists(fn):
-                flist.append(fn)
-    current=False
-    if os.path.exists(target):
-        current=True
-        for f in flist:
-            if not isCurrent(f,target):
-                current=False
-                break
-    if current:
-        print("%s is up to date"%target)
-        return
-    print("creating %s"%target)
-    with gzip.open(target,"wb") as oh:
-        for fn in flist:
-            print("adding %s to %s"%(fn,target))
-            with open(fn,"rb") as rh:
-                shutil.copyfileobj(rh,oh)
-    
-
-OWNLIBS=getLibs()+["FS","WiFi"]
-GLOBAL_INCLUDES=[]
-
-def handleDeps(env):
-    #overwrite the GetProjectConfig
-    #to inject all our libs
-    oldGetProjectConfig=env.GetProjectConfig    
-    def GetProjectConfigX(env):        
-        rt=oldGetProjectConfig()
-        cenv="env:"+env['PIOENV']
-        libs=[]
-        for section,options in rt.as_tuple():
-            if section == cenv:
-                for key,values in options:
-                    if key == 'lib_deps':
-                        libs=values
-    
-        mustUpdate=False
-        for lib in OWNLIBS:
-            if not lib in libs:
-                libs.append(lib)
-                mustUpdate=True
-        if mustUpdate:
-            update=[(cenv,[('lib_deps',libs)])]
-            rt.update(update)
-        return rt
-    env.AddMethod(GetProjectConfigX,"GetProjectConfig")
-    #store the list of all includes after we resolved
-    #the dependencies for our main project
-    #we will use them for all compilations afterwards
-    oldLibBuilder=env.ConfigureProjectLibBuilder
-    def ConfigureProjectLibBuilderX(env):
-        global GLOBAL_INCLUDES
-        project=oldLibBuilder()
-        #print("##ConfigureProjectLibBuilderX")
-        #pprint.pprint(project)
-        if project.depbuilders:
-            #print("##depbuilders %s"%",".join(map(lambda x: x.path,project.depbuilders)))
-            for db in project.depbuilders:
-                idirs=db.get_include_dirs()
-                for id in idirs:
-                    if not id in GLOBAL_INCLUDES:
-                        GLOBAL_INCLUDES.append(id)
-        return project
-    env.AddMethod(ConfigureProjectLibBuilderX,"ConfigureProjectLibBuilder")
-    def injectIncludes(env,node):
-        return env.Object(
-            node,
-            CPPPATH=env["CPPPATH"]+GLOBAL_INCLUDES
-        )
-    env.AddBuildMiddleware(injectIncludes)
-
-
-def prebuild(env):
-    global userTaskDirs
-    print("#prebuild running")
-    if not checkDir():
-        sys.exit(1)
-    ldf_mode=env.GetProjectOption("lib_ldf_mode")
-    if ldf_mode == 'off':
-        print("##ldf off - own dependency handling")
-        handleDeps(env)
-    userTaskDirs=getUserTaskDirs()
-    mergedConfig=os.path.join(outPath(),os.path.basename(CFG_FILE))
-    generateMergedConfig(os.path.join(basePath(),CFG_FILE),mergedConfig,userTaskDirs)
-    compressFile(mergedConfig,mergedConfig+".gz")
-    generateCfg(mergedConfig,os.path.join(outPath(),CFG_INCLUDE),False)
-    generateCfg(mergedConfig,os.path.join(outPath(),CFG_INCLUDE_IMPL),True)
-    joinFiles(os.path.join(outPath(),INDEXJS+".gz"),INDEXJS,["web"]+userTaskDirs)
-    joinFiles(os.path.join(outPath(),INDEXCSS+".gz"),INDEXCSS,["web"]+userTaskDirs)
-    embedded=getEmbeddedFiles(env)
-    filedefs=[]
-    for ef in embedded:
-        print("#checking embedded file %s"%ef)
-        (dn,fn)=os.path.split(ef)
-        pureName=fn
-        if pureName.endswith('.gz'):
-            pureName=pureName[0:-3]
-        ct=getContentType(pureName)
-        usname=ef.replace('/','_').replace('.','_')
-        filedefs.append((pureName,usname,ct))
-        inFile=os.path.join(basePath(),"web",pureName)
-        if os.path.exists(inFile):
-            compressFile(inFile,ef)
-        else:
-            print("#WARNING: infile %s for %s not found"%(inFile,ef))
-    generateEmbedded(filedefs,os.path.join(outPath(),EMBEDDED_INCLUDE))
-    genereateUserTasks(os.path.join(outPath(), TASK_INCLUDE))
-    generateFile(os.path.join(basePath(),XDR_FILE),os.path.join(outPath(),XDR_INCLUDE),generateXdrMappings)
-    generateFile(os.path.join(basePath(),GROVE_CONFIG_IN),os.path.join(outPath(),GROVE_CONFIG),generateGroveDefs,inMode='r')
-    version="dev"+datetime.now().strftime("%Y%m%d")
-    env.Append(CPPDEFINES=[('GWDEVVERSION',version)])
-
-def cleangenerated(source, target, env):
-    od=outPath()
-    if os.path.isdir(od):
-        print("#cleaning up %s"%od)
-        for f in os.listdir(od):
-            if f == "." or f == "..":
-                continue
-            fn=os.path.join(od,f)
-            os.unlink(f)
-
-
-print("#prescript...")
-prebuild(env)
-board="PLATFORM_BOARD_%s"%env["BOARD"].replace("-","_").upper()
-print("Board=#%s#"%board)
-print("BuildFlags=%s"%(" ".join(env["BUILD_FLAGS"])))
-env.Append(
-    LINKFLAGS=[ "-u", "custom_app_desc" ],
-    CPPDEFINES=[(board,"1")]
-)
-#script does not run on clean yet - maybe in the future
-env.AddPostAction("clean",cleangenerated)

lib/api/GwApi.h

@@ -2,6 +2,8 @@
 #define _GWAPI_H
 #include "GwMessage.h"
 #include "N2kMsg.h"
+#include "Nmea2kTwai.h"
+#include "N2kDeviceList.h"
 #include "NMEA0183Msg.h"
 #include "GWConfig.h"
 #include "GwBoatData.h"
@@ -23,6 +25,7 @@ class GwApi{
             bool formatSet=false;
             public:
                 double value=0;
+                String svalue="";
                 bool valid=false;
                 int source=-1;
                 bool changed=false; //will be set by getBoatDataValues
@@ -222,6 +225,8 @@ class GwApi{
          * accessing boat data must only be executed from within the main thread
          * you need to use the request pattern as shown in GwExampleTask.cpp
          */
+        virtual Nmea2kTwai *getNMEA2000()=0;
+        virtual tN2kDeviceList *getN2kDeviceList()=0;
         virtual GwBoatData *getBoatData()=0;
         virtual ~GwApi(){}
 };

lib/appinfo/GwAppInfo.h

@@ -19,4 +19,4 @@
 #else
 #define FIRMWARE_TYPE GWSTRINGIFY(PIO_ENV_BUILD)
 #endif
-#define IDF_VERSION GWSTRINGIFY(ESP_IDF_VERSION_MAJOR) "." GWSTRINGIFY(ESP_IDF_VERSION_MINOR) "." GWSTRINGIFY(ESP_IDF_VERSION_PATCH)
+#define IDF_VERSION GWSTRINGIFY(ESP_IDF_VERSION_MAJOR) "." GWSTRINGIFY(ESP_IDF_VERSION_MINOR) "." GWSTRINGIFY(ESP_IDF_VERSION_PATCH)

lib/boatData/GwBoatData.cpp

@@ -2,11 +2,6 @@
 #include <GwJsonDocument.h>
 #include <ArduinoJson/Json/TextFormatter.hpp>
 #include "GWConfig.h"
-#define GWTYPE_DOUBLE 1
-#define GWTYPE_UINT32 2
-#define GWTYPE_UINT16 3
-#define GWTYPE_INT16 4
-#define GWTYPE_USER 100
 
 class GwBoatItemTypes
 {
@@ -15,7 +10,9 @@ public:
     static int getType(const uint16_t &x) { return GWTYPE_UINT16; }
     static int getType(const int16_t &x) { return GWTYPE_INT16; }
     static int getType(const double &x) { return GWTYPE_DOUBLE; }
+    static int getType(const String &x) { return GWTYPE_STRING; }
     static int getType(const GwSatInfoList &x) { return GWTYPE_USER + 1; }
+    static int getType(const GwAisTargetList &x) { return GWTYPE_USER + 1; }
 };
 
 bool GwBoatItemBase::isValid(unsigned long now) const
@@ -252,6 +249,10 @@ static void writeToString(GwTextWriter *writer, const int16_t &value)
 {
     writer->writeInteger(value);
 }
+static void writeToString(GwTextWriter *writer, String value)
+{
+    writer->writeString(value.c_str());
+}
 static void writeToString(GwTextWriter *writer, GwSatInfoList &value)
 {
     writer->writeInteger(value.getNumSats());
@@ -288,6 +289,8 @@ template class GwBoatItem<double>;
 template class GwBoatItem<uint32_t>;
 template class GwBoatItem<uint16_t>;
 template class GwBoatItem<int16_t>;
+template class GwBoatItem<String>;
+
 void GwSatInfoList::houseKeeping(unsigned long ts)
 {
     if (ts == 0)
@@ -301,6 +304,7 @@ void GwSatInfoList::houseKeeping(unsigned long ts)
                    }),
                sats.end());
 }
+
 void GwSatInfoList::update(GwSatInfo entry, unsigned long validTill)
 {
     entry.validTill = validTill;
@@ -343,6 +347,63 @@ void GwBoatDataSatList::toJsonDoc(GwJsonDocument *doc, unsigned long minTime)
     GwBoatItem<GwSatInfoList>::toJsonDoc(doc, minTime);
 }
 
+void GwAisTargetList::houseKeeping(unsigned long ts)
+{
+    if (ts == 0) {
+        ts = millis();
+    }
+    targets.erase(
+        std::remove_if(
+            targets.begin(),
+            targets.end(),
+            [ts, this](const GwAisTarget &target) {
+                return target.validTill < ts;
+            }
+        ),
+        targets.end()
+    );
+}
+
+void GwAisTargetList::update(GwAisTarget target, unsigned long validTill)
+{
+    target.validTill = validTill;
+    for (auto it = targets.begin(); it != targets.end(); it++) {
+        if (it->mmsi == target.mmsi) {
+            *it = target;
+            houseKeeping();
+            return;
+        }
+    }
+    houseKeeping();
+    targets.push_back(target);
+}
+
+GwBoatDataAisList::GwBoatDataAisList(String name, String formatInfo, GwBoatItemBase::TOType toType, GwBoatItemMap *map) : GwBoatItem<GwAisTargetList>(name, formatInfo, toType, map) {}
+
+bool GwBoatDataAisList::update(GwAisTarget target, int source)
+{
+    unsigned long now = millis();
+    if (isValid(now))
+    {
+        //priority handling
+        //sources with lower ids will win
+        //and we will not overwrite their value
+        if (lastUpdateSource < source)
+        {
+            return false;
+        }
+    }
+    lastUpdateSource = source;
+    uls(now);
+    data.update(target, now+invalidTime);
+    return true;
+}
+void GwBoatDataAisList::toJsonDoc(GwJsonDocument *doc, unsigned long minTime)
+{
+    data.houseKeeping();
+    GwBoatItem<GwAisTargetList>::toJsonDoc(doc, minTime);
+}
+
 GwBoatData::GwBoatData(GwLog *logger, GwConfigHandler *cfg)
 {
     this->logger = logger;
@@ -512,6 +573,11 @@ bool convertToJson(const GwSatInfoList &si, JsonVariant &variant)
     return variant.set(si.getNumSats());
 }
 
+bool convertToJson(const GwAisTargetList &si, JsonVariant &variant)
+{
+    return variant.set(si.getNumTargets());
+}
+
 #ifdef _UNDEF
 #include <ArduinoJson/Json/TextFormatter.hpp>
 

lib/boatData/GwBoatData.h

@@ -9,6 +9,13 @@
 #define GW_BOAT_VALUE_LEN 32
 #define GWSC(name) static constexpr const char* name=#name
 
+#define GWTYPE_DOUBLE 1
+#define GWTYPE_UINT32 2
+#define GWTYPE_UINT16 3
+#define GWTYPE_INT16 4
+#define GWTYPE_STRING 5
+#define GWTYPE_USER 100
+
 //see https://github.com/wellenvogel/esp32-nmea2000/issues/44
 //factor to convert from N2k/SI rad/s to current NMEA rad/min
 #define ROT_WA_FACTOR 60
@@ -58,6 +65,7 @@ class GwBoatItemBase{
         GWSC(formatRot);
         GWSC(formatDate);
         GWSC(formatTime);
+        GWSC(formatName);
     protected:
         int type;
         unsigned long lastSet=0;
@@ -92,6 +100,7 @@ class GwBoatItemBase{
         virtual int getLastSource(){return lastUpdateSource;}
         virtual void refresh(unsigned long ts=0){uls(ts);}
         virtual double getDoubleValue()=0;
+        virtual String getStringValue()=0;
         String getName(){return name;}
         const String & getFormat() const{return format;}
         virtual void setInvalidTime(GwConfigHandler *cfg);
@@ -120,7 +129,17 @@ template<class T> class GwBoatItem : public GwBoatItemBase{
             if (! isValid(millis())) return defaultv;
             return data;
         }
-        virtual double getDoubleValue(){return (double)data;}
+        virtual double getDoubleValue(){
+            if constexpr (std::is_same<T, String>::value) {
+                return 0.0; // TODO any better ideas?
+            } else {
+                return (double)data;
+            }
+        }
+        virtual String getStringValue(){
+            return (String)data;
+        }
+
         virtual void fillString();
         virtual void toJsonDoc(GwJsonDocument *doc, unsigned long minTime);
         virtual int getLastSource(){return lastUpdateSource;}
@@ -177,6 +196,55 @@ public:
 
 };
 
+class GwAisTarget {
+public:
+    uint32_t mmsi;
+    char callsign[8];
+    char name[21];
+    uint8_t vesseltype;
+    double lat;
+    double lon;
+    float length;
+    float beam;
+    float sog;
+    float cog;
+    unsigned long validTill;
+};
+
+class GwAisTargetList {
+public:
+    static const GwBoatItemBase::TOType toType=GwBoatItemBase::TOType::ais;
+    std::vector<GwAisTarget> targets;
+    void houseKeeping(unsigned long ts=0);
+    void update(GwAisTarget target, unsigned long validTill);
+    int getNumTargets() const {
+        return targets.size();
+    }
+    GwAisTarget *getAt(int idx){
+        if (idx >= 0 && idx < targets.size()) return &targets.at(idx);
+        return NULL;
+    }
+    operator double(){ return getNumTargets();}
+};
+
+class GwBoatDataAisList : public GwBoatItem<GwAisTargetList> {
+public:
+    GwBoatDataAisList(String name, String formatInfo, GwBoatItemBase::TOType toType, GwBoatItemMap *map = NULL);
+    bool update(GwAisTarget target, int source);
+    virtual void toJsonDoc(GwJsonDocument *doc, unsigned long minTime);
+    GwAisTarget *getAt(int idx) {
+        if (! isValid()) return NULL;
+        return data.getAt(idx);
+    }
+    int getNumTargets(){
+        if (! isValid()) return 0;
+        return data.getNumTargets();
+    }
+    virtual double getDoubleValue(){
+        return (double)(data.getNumTargets());
+    }
+};
+
 class GwBoatItemNameProvider
 {
 public:
@@ -235,7 +303,9 @@ class GwBoatData{
     GWBOATDATA(double,XTE,formatXte) // cross track error
     GWBOATDATA(double,WPLat,formatLatitude) // waypoint latitude
     GWBOATDATA(double,WPLon,formatLongitude) // waypoint longitude
+    GWBOATDATA(String,WPName,formatName) // waypoint name
     GWSPECBOATDATA(GwBoatDataSatList,SatInfo,GwSatInfoList::toType,formatFixed0);
+    GWSPECBOATDATA(GwBoatDataAisList,AisTarget,GwAisTargetList::toType,formatFixed0);
     public:
         GwBoatData(GwLog *logger, GwConfigHandler *cfg);
         ~GwBoatData();

lib/config/GwConverterConfig.h

@@ -113,4 +113,4 @@ class GwConverterConfig{
 
 
   };
-#endif
+#endif

lib/gwupdate/GwUpdate.cpp

@@ -79,7 +79,7 @@ GwUpdate::GwUpdate(GwLog *log, GwWebServer *webserver, PasswordChecker ckr)
                     }
                     if (!param->hasError())
                     {
-                        AsyncWebParameter *hash=request->getParam("_hash");
+                        const AsyncWebParameter *hash=request->getParam("_hash");
                         if (! hash){
                             hash=request->getParam("_hash",true);
                         }
@@ -141,4 +141,4 @@ GwUpdate::GwUpdate(GwLog *log, GwWebServer *webserver, PasswordChecker ckr)
                     }
                 }
             });
-}
+}

lib/gwwebserver/GwWebServer.cpp

@@ -27,7 +27,7 @@ void sendEmbeddedFile(String name,String contentType,AsyncWebServerRequest *requ
     std::map<String,EmbeddedFile*>::iterator it=embeddedFiles.find(name);
     if (it != embeddedFiles.end()){
       EmbeddedFile* found=it->second;
-      AsyncWebServerResponse *response=request->beginResponse_P(200,contentType,found->start,found->len);
+      AsyncWebServerResponse *response=request->beginResponse(200, contentType, found->start, found->len);
       response->addHeader(F("Content-Encoding"), F("gzip"));
       request->send(response);
     }

lib/gwwifi/GWWifi.h

@@ -2,6 +2,9 @@
 #define _GWWIFI_H
 #include <WiFi.h>
 #include <GWConfig.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>
+
 class GwWifi{
     private:
         const GwConfigHandler *config;
@@ -16,15 +19,21 @@ class GwWifi{
         bool apActive=false;
         bool fixedApPass=true;
         bool clientIsConnected=false;
+        SemaphoreHandle_t wifiMutex=nullptr;
+        static const TickType_t WIFI_MUTEX_TIMEOUT=pdMS_TO_TICKS(1000);
+        bool acquireMutex();
+        void releaseMutex();
     public:
         const char *AP_password = "esp32nmea2k"; 
         GwWifi(const GwConfigHandler *config,GwLog *log, bool fixedApPass=true);
+        ~GwWifi();
         void setup();
         void loop();
         bool clientConnected();
-        bool connectClient();
+        bool connectClient();          // Blocking version
+        bool connectClientAsync();     // Non-blocking version for other tasks
         String apIP();
         bool isApActive(){return apActive;}
         bool isClientActive(){return wifiClient->asBoolean();}
 };
-#endif
+#endif

lib/gwwifi/GwWifi.cpp

@@ -1,7 +1,6 @@
 #include <esp_wifi.h>
 #include "GWWifi.h"
 
-
 GwWifi::GwWifi(const GwConfigHandler *config,GwLog *log, bool fixedApPass){
     this->config=config;
     this->logger=log;
@@ -9,6 +8,28 @@ GwWifi::GwWifi(const GwConfigHandler *config,GwLog *log, bool fixedApPass){
     wifiSSID=config->getConfigItem(config->wifiSSID,true);
     wifiPass=config->getConfigItem(config->wifiPass,true);
     this->fixedApPass=fixedApPass;
+    wifiMutex=xSemaphoreCreateMutex();
+    if (wifiMutex==nullptr){
+        LOG_DEBUG(GwLog::ERROR,"GwWifi: unable to create mutex");
+    }
+}
+
+GwWifi::~GwWifi(){
+    if (wifiMutex!=nullptr){
+        vSemaphoreDelete(wifiMutex);
+        wifiMutex=nullptr;
+    }
+}
+
+bool GwWifi::acquireMutex(){
+    if (wifiMutex==nullptr) return false;
+    return xSemaphoreTake(wifiMutex,WIFI_MUTEX_TIMEOUT)==pdTRUE;
+}
+
+void GwWifi::releaseMutex(){
+    if (wifiMutex!=nullptr){
+        xSemaphoreGive(wifiMutex);
+    }
 }
 void GwWifi::setup(){
     LOG_DEBUG(GwLog::LOG,"Wifi setup");
@@ -85,8 +106,14 @@ bool GwWifi::connectInternal(){
     if (wifiClient->asBoolean()){
         clientIsConnected=false;
         LOG_DEBUG(GwLog::LOG,"creating wifiClient ssid=%s",wifiSSID->asString().c_str());
+        // CRITICAL SECTION: WiFi operations has to be serialized
+        if (!acquireMutex()){
+            LOG_DEBUG(GwLog::ERROR,"GwWifi: mutex timeout in connectInternal");
+            return false;
+        }
         WiFi.setAutoReconnect(false); //#102
         wl_status_t rt=WiFi.begin(wifiSSID->asCString(),wifiPass->asCString());
+        releaseMutex();
         LOG_DEBUG(GwLog::LOG,"wifiClient connect returns %d",(int)rt);
         lastConnectStart=millis();
         return true;
@@ -104,8 +131,42 @@ void GwWifi::loop(){
             if (lastConnectStart > now || (lastConnectStart + RETRY_MILLIS) < now)
             {
                 LOG_DEBUG(GwLog::LOG,"wifiClient: retry connect to %s", wifiSSID->asCString());
-                WiFi.disconnect();
+
-                connectInternal();
+                // Keep locked sections short to avoid cross-core stalls/WDT.
+                if (acquireMutex()){
+                    WiFi.disconnect(true);
+                    releaseMutex();
+                }
+                else{
+                    LOG_DEBUG(GwLog::ERROR,"GwWifi: mutex timeout in loop (disconnect)");
+                }
+
+                delay(300);
+
+                if (acquireMutex()){
+                    esp_err_t stopErr=esp_wifi_stop();
+                    releaseMutex();
+                    if (stopErr != ESP_OK){
+                        LOG_DEBUG(GwLog::ERROR,"GwWifi: esp_wifi_stop failed: %d",(int)stopErr);
+                    }
+                }
+                else{
+                    LOG_DEBUG(GwLog::ERROR,"GwWifi: mutex timeout in loop (stop)");
+                }
+
+                delay(100);
+
+                if (acquireMutex()){
+                    esp_err_t startErr=esp_wifi_start();
+                    releaseMutex();
+                    if (startErr != ESP_OK){
+                        LOG_DEBUG(GwLog::ERROR,"GwWifi: esp_wifi_start failed: %d",(int)startErr);
+                    }
+                    connectInternal();
+                }
+                else{
+                    LOG_DEBUG(GwLog::ERROR,"GwWifi: mutex timeout in loop (start)");
+                }
             }
         }
         else{
@@ -126,15 +187,46 @@ void GwWifi::loop(){
         }
     }
 }
+
 bool GwWifi::clientConnected(){
-    return WiFi.status() == WL_CONNECTED;
+    // CRITICAL SECTION: WiFi.status() has to be protected
+    if (!acquireMutex()){
+        LOG_DEBUG(GwLog::ERROR,"GwWifi: mutex timeout in clientConnected");
+        return false;  // conservative: assume not connected
+    }
+    bool result = WiFi.status() == WL_CONNECTED;
+    releaseMutex();
+    return result;
 };
+
 bool GwWifi::connectClient(){
+    // CRITICAL SECTION: disconnect and connect has to be atomar
+    if (!acquireMutex()){
+        LOG_DEBUG(GwLog::ERROR,"GwWifi: mutex timeout in connectClient");
+        return false;
+    }
     WiFi.disconnect();
+    releaseMutex();
+    return connectInternal();
+}
+
+bool GwWifi::connectClientAsync(){
+    // Non-blocking version: Try to get Mutex but give up immediately
+    // Ideal for tasks which should not block
+    if (wifiMutex==nullptr){
+        LOG_DEBUG(GwLog::ERROR,"GwWifi: mutex not initialized in connectClientAsync");
+        return false;
+    }
+    if (xSemaphoreTake(wifiMutex, 0)!=pdTRUE){
+        LOG_DEBUG(GwLog::LOG,"GwWifi: connectClientAsync skipped - WiFi busy");
+        return false;  // WiFiis busy, try again later
+    }
+    WiFi.disconnect();
+    xSemaphoreGive(wifiMutex);
     return connectInternal();
 }
 
 String GwWifi::apIP(){
     if (! apActive) return String();
     return WiFi.softAPIP().toString();
-}
+}

lib/iictask/GwQMP6988.cpp

@@ -113,4 +113,4 @@ SC6988(QMP698822,2,112);
     SensorBase::Creator registerQMP6988(GwApi *api){
         return SensorBase::Creator();
     }
-#endif
+#endif

lib/iictask/SHT3X.cpp

@@ -44,4 +44,4 @@ byte SHT3X::get()
 
   return 0;
 }
-#endif
+#endif

lib/nmea0183ton2k/NMEA0183DataToN2K.cpp

@@ -355,6 +355,7 @@ private:
             AppendN2kRouteWPInfo(n2kMsg,destinationId,rmb.destID,rmb.latitude,rmb.longitude);
             send(n2kMsg,msg.sourceId);
             }
+        boatData->WPName->update(String(rmb.destID), msg.sourceId);
     }
     void convertRMC(const SNMEA0183Msg &msg)
     {

lib/nmea2ktwai/Nmea2kTwai.cpp

@@ -9,6 +9,7 @@ static const int TIMEOUT_OFFLINE=256; //# of timeouts to consider offline
 Nmea2kTwai::Nmea2kTwai(gpio_num_t _TxPin,  gpio_num_t _RxPin, unsigned long recP, unsigned long logP):
      tNMEA2000(),RxPin(_RxPin),TxPin(_TxPin)
 {
+    pN2kDeviceList = new tN2kDeviceList(this);
     if (RxPin < 0 || TxPin < 0){
         disabled=true;    
     }
@@ -201,4 +202,4 @@ const char * Nmea2kTwai::stateStr(const Nmea2kTwai::STATE &st){
     case ST_DISABLED: return "DISABLED";
     }
     return "ERROR";
-}
+}

lib/nmea2ktwai/Nmea2kTwai.h

@@ -1,6 +1,7 @@
 #ifndef _NMEA2KTWAI_H
 #define _NMEA2KTWAI_H
 #include "NMEA2000.h"
+#include "N2kDeviceList.h"
 #include "GwTimer.h"
 
 class Nmea2kTwai : public tNMEA2000{
@@ -26,6 +27,7 @@ class Nmea2kTwai : public tNMEA2000{
             STATE state=ST_ERROR;
         } Status;
         Status getStatus();
+        tN2kDeviceList *getDeviceList(){return pN2kDeviceList;}
         unsigned long getLastRecoveryStart(){return lastRecoveryStart;}
         void loop();
         static const char * stateStr(const STATE &st);
@@ -58,6 +60,7 @@ class Nmea2kTwai : public tNMEA2000{
     GwIntervalRunner timers;
     bool disabled=false;
     unsigned long lastRecoveryStart=0;
+    tN2kDeviceList *pN2kDeviceList;
 };
 
-#endif
+#endif

lib/obp60task/ConfigMenu.cpp

@@ -0,0 +1,204 @@
+/*
+  Menu system for online configuration
+*/
+#include "ConfigMenu.h"
+
+ConfigMenuItem::ConfigMenuItem(String itemtype, String itemlabel, uint16_t itemval, String itemunit) {
+    if (! (itemtype == "int" or itemtype == "bool")) {
+        valtype = "int";
+    } else {
+        valtype = itemtype;
+    }
+    label = itemlabel;
+    min = 0;
+    max = std::numeric_limits<uint16_t>::max();
+    value = itemval;
+    unit = itemunit;
+}
+
+void ConfigMenuItem::setRange(uint16_t valmin, uint16_t valmax, std::vector<uint16_t> valsteps) {
+    min = valmin;
+    max = valmax;
+    steps = valsteps;
+};
+
+bool ConfigMenuItem::checkRange(uint16_t checkval) {
+    return (checkval >= min) and (checkval <= max);
+}
+
+String ConfigMenuItem::getLabel() {
+    return label;
+};
+
+uint16_t ConfigMenuItem::getValue() {
+    return value;
+}
+
+bool ConfigMenuItem::setValue(uint16_t newval) {
+    if (valtype == "int") {
+        if (newval >= min and newval <= max) {
+            value = newval;
+            return true;
+        }
+        return false; // out of range
+    } else if (valtype == "bool") {
+        value = (newval != 0) ? 1 : 0;
+        return true;
+    }
+    return false; // invalid type
+};
+
+void ConfigMenuItem::incValue() {
+    // increase value by step
+    if (valtype == "int") {
+        if (value + step < max) {
+            value += step;
+        } else {
+            value = max;
+        }
+    } else if (valtype == "bool") {
+        value = !value;
+    }
+};
+
+void ConfigMenuItem::decValue() {
+    // decrease value by step
+    if (valtype == "int") {
+        if (value - step > min) {
+            value -= step;
+        } else {
+            value = min;
+        }
+    } else if (valtype == "bool") {
+        value = !value;
+    }
+};
+
+String ConfigMenuItem::getUnit() {
+    return unit;
+}
+
+uint16_t ConfigMenuItem::getStep() {
+    return step;
+}
+
+void ConfigMenuItem::setStep(uint16_t newstep) {
+    if (std::find(steps.begin(), steps.end(), newstep) == steps.end()) {
+        return; // invalid step: not in list of possible steps
+    }
+    step = newstep;
+}
+
+int8_t ConfigMenuItem::getPos() {
+    return position;
+};
+
+void ConfigMenuItem::setPos(int8_t newpos) {
+    position = newpos;
+};
+
+String ConfigMenuItem::getType() {
+    return valtype;
+}
+
+ConfigMenu::ConfigMenu(String menutitle, uint16_t menu_x, uint16_t menu_y) {
+    title = menutitle;
+    x = menu_x;
+    y = menu_y;
+};
+
+ConfigMenuItem* ConfigMenu::addItem(String key, String label, String valtype, uint16_t val, String valunit) {
+    if (items.find(key) != items.end()) {
+        // duplicate keys not allowed
+        return nullptr;
+    }
+    ConfigMenuItem *itm = new ConfigMenuItem(valtype, label, val, valunit);
+    items.insert(std::pair<String, ConfigMenuItem*>(key, itm));
+    // Append key to index, index starting with 0
+    int8_t ix = items.size() - 1;
+    index[ix] = key;
+    itm->setPos(ix);
+    return itm;
+};
+
+void ConfigMenu::setItemDimension(uint16_t itemwidth, uint16_t itemheight) {
+    w = itemwidth;
+    h = itemheight;
+};
+
+void ConfigMenu::setItemActive(String key) {
+    if (items.find(key) != items.end()) {
+        activeitem = items[key]->getPos();
+    } else {
+        activeitem = -1;
+    }
+};
+
+int8_t ConfigMenu::getActiveIndex() {
+    return activeitem;
+}
+
+ConfigMenuItem* ConfigMenu::getActiveItem() {
+    if (activeitem < 0) {
+        return nullptr;
+    }
+    return items[index[activeitem]];
+};
+
+ConfigMenuItem* ConfigMenu::getItemByIndex(uint8_t ix) {
+    if (ix > index.size() - 1) {
+        return nullptr;
+    }
+    return items[index[ix]];
+};
+
+ConfigMenuItem* ConfigMenu::getItemByKey(String key) {
+    if (items.find(key) == items.end()) {
+        return nullptr;
+    }
+    return items[key];
+};
+
+uint8_t ConfigMenu::getItemCount() {
+    return items.size();
+};
+
+void ConfigMenu::goPrev() {
+    if (activeitem == 0) {
+        activeitem = items.size() - 1;
+    } else {
+        activeitem--;
+    }
+}
+
+void ConfigMenu::goNext() {
+    if (activeitem == items.size() - 1) {
+        activeitem = 0;
+    } else {
+        activeitem++;
+    }
+}
+
+Point ConfigMenu::getXY() {
+    return {static_cast<double>(x), static_cast<double>(y)};
+}
+
+Rect ConfigMenu::getRect() {
+    return {static_cast<double>(x), static_cast<double>(y),
+            static_cast<double>(w), static_cast<double>(h)};
+}
+
+Rect ConfigMenu::getItemRect(int8_t index) {
+    return {static_cast<double>(x), static_cast<double>(y + index * h),
+            static_cast<double>(w), static_cast<double>(h)};
+}
+
+void ConfigMenu::setCallback(void (*callback)()) {
+    fptrCallback = callback;
+}
+
+void ConfigMenu::storeValues() {
+    if (fptrCallback) {
+        fptrCallback();
+    }
+}

lib/obp60task/ConfigMenu.h

@@ -0,0 +1,66 @@
+#pragma once
+
+#include <Arduino.h>
+#include <vector>
+#include <map>
+#include "Graphics.h"  // for Point and Rect
+
+class ConfigMenuItem {
+private:
+    String label;
+    uint16_t value;
+    String unit;
+    String valtype; // "int" | "bool"
+    uint16_t min;
+    uint16_t max;
+    std::vector<uint16_t> steps;
+    uint16_t step;
+    int8_t position; // counted fom 0
+
+public:
+    ConfigMenuItem(String itemtype, String itemlabel, uint16_t itemval, String itemunit);
+    void setRange(uint16_t valmin, uint16_t valmax, std::vector<uint16_t> steps);
+    bool checkRange(uint16_t checkval);
+    String getLabel();
+    uint16_t getValue();
+    bool setValue(uint16_t newval);
+    void incValue();
+    void decValue();
+    String getUnit();
+    uint16_t getStep();
+    void setStep(uint16_t newstep);
+    int8_t getPos();
+    void setPos(int8_t newpos);
+    String getType();
+};
+
+class ConfigMenu {
+private:
+    String title;
+    std::map <String,ConfigMenuItem*> items;
+    std::map <uint8_t,String> index;
+    int8_t activeitem = -1; // refers to position of item
+    uint16_t x;
+    uint16_t y;
+    uint16_t w;
+    uint16_t h;
+    void (*fptrCallback)();
+
+public:
+    ConfigMenu(String title, uint16_t menu_x, uint16_t menu_y);
+    ConfigMenuItem* addItem(String key, String label, String valtype, uint16_t val, String valunit);
+    void setItemDimension(uint16_t itemwidth, uint16_t itemheight);
+    int8_t getActiveIndex();
+    void setItemActive(String key);
+    ConfigMenuItem* getActiveItem();
+    ConfigMenuItem* getItemByIndex(uint8_t index);
+    ConfigMenuItem* getItemByKey(String key);
+    uint8_t getItemCount();
+    void goPrev();
+    void goNext();
+    Point getXY();
+    Rect getRect();
+    Rect getItemRect(int8_t index);
+    void setCallback(void (*callback)());
+    void storeValues();
+};

lib/obp60task/Create_new_pages.txt

@@ -1,6 +0,0 @@
-Craete new page for OBP60
-1. Create page under /lib/obp60task/PageXXXX.cpp
-2. Set page name in PageXXXX.cpp on file name
-3. Register new page in  /lib/obp60task/obp60task.cpp line 242 (registerAllPages)
-4. Add new page in /lib/obp60task/config.json for each page type or add new page to gen_set.py and run it to auto-generate the relevant section of  config.json
-

lib/obp60task/ImageDecoder.cpp

@@ -2,13 +2,22 @@
 #include <mbedtls/base64.h>
 
 // Decoder for Base64 content
-bool ImageDecoder::decodeBase64(const String& base64, uint8_t* outBuffer, size_t outSize, size_t& decodedSize) {
+bool ImageDecoder::decodeBase64(const char* base64, size_t base64Len, uint8_t* outBuffer, size_t outSize, size_t& decodedSize) {
+    if (base64 == nullptr) {
+        decodedSize = 0;
+        return false;
+    }
     int ret = mbedtls_base64_decode(
         outBuffer,
         outSize,
         &decodedSize,
-        (const unsigned char*)base64.c_str(),
+        (const unsigned char*)base64,
-        base64.length()
+        base64Len
     );
     return (ret == 0);
 }
+
+// Decoder for Base64 content
+bool ImageDecoder::decodeBase64(const String& base64, uint8_t* outBuffer, size_t outSize, size_t& decodedSize) {
+    return decodeBase64(base64.c_str(), base64.length(), outBuffer, outSize, decodedSize);
+}

lib/obp60task/ImageDecoder.h

@@ -5,5 +5,6 @@
 
 class ImageDecoder {
 public:
+    bool decodeBase64(const char* base64, size_t base64Len, uint8_t* outBuffer, size_t outSize, size_t& decodedSize);
     bool decodeBase64(const String& base64, uint8_t* outBuffer, size_t outSize, size_t& decodedSize);
 };

lib/obp60task/LedSpiTask.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include <FreeRTOS.h>
 #include "LedSpiTask.h"
 #include "GwHardware.h"
@@ -14,6 +15,30 @@ https://controllerstech.com/ws2812-leds-using-spi/
 
 */
 
+String Color::toHex() {
+    char hexColor[8];
+    sprintf(hexColor, "#%02X%02X%02X", r, g, b);
+    return String(hexColor);
+}
+
+String Color::toName() {
+    static std::map<int, String> const names = {
+        {0xff0000, "Red"},
+        {0x00ff00, "Green"},
+        {0x0000ff, "Blue",},
+        {0xff9900, "Orange"},
+        {0xffff00, "Yellow"},
+        {0x3366ff, "Aqua"},
+        {0xff0066, "Violet"},
+        {0xffffff, "White"}
+    };
+    int color = (r << 16) + (g << 8) + b;
+    auto it = names.find(color);
+    if (it == names.end()) {
+        return toHex();
+    }
+    return it->second;
+}
 
 static uint8_t mulcolor(uint8_t f1, uint8_t f2){
     uint16_t rt=f1;
@@ -26,7 +51,7 @@ Color setBrightness(const Color &color,uint8_t brightness){
 
     uint16_t br255=brightness*255;
     br255=br255/100;
-    //Very simple for now
+    //very simple for now
     Color rt=color;
     rt.g=mulcolor(rt.g,br255);
     rt.b=mulcolor(rt.b,br255);
@@ -61,12 +86,12 @@ static size_t ledsToBuffer(int numLeds,const Color *leds,uint8_t *buffer){
 bool prepareGpio(GwLog *logger, uint8_t pin){
     esp_err_t err=gpio_set_direction((gpio_num_t)pin,GPIO_MODE_OUTPUT);
     if (err != ESP_OK){
-        LOG_DEBUG(GwLog::ERROR,"unable to set gpio mode for %d: %d",pin,(int)err);
+        logger->logDebug(GwLog::ERROR, "unable to set gpio mode for %d: %d", pin, (int)err);
         return false;
     }
     err=gpio_set_level((gpio_num_t)pin,0);
     if (err != ESP_OK){
-        LOG_DEBUG(GwLog::ERROR,"unable to set gpio level for %d: %d",pin,(int)err);
+        logger->logDebug(GwLog::ERROR, "unable to set gpio level for %d: %d", pin, (int)err);
         return false;
     }
     return true;
@@ -92,8 +117,8 @@ bool prepareSpi(GwLog *logger,spi_host_device_t bus,spi_device_handle_t *device)
         };   
     esp_err_t err=spi_bus_initialize(bus,&buscfg,SPI_DMA_CH_AUTO);    
     if (err != ESP_OK){
-        LOG_DEBUG(GwLog::ERROR,"unable to initialize SPI bus %d,mosi=%d, error=%d",
+        logger->logDebug(GwLog::ERROR, "unable to initialize SPI bus %d,mosi=%d, error=%d",
-        (int)bus,-1,(int)err);
+            (int)bus, -1, (int)err);
         return false;
     }
     spi_device_interface_config_t devcfg = {
@@ -111,16 +136,16 @@ bool prepareSpi(GwLog *logger,spi_host_device_t bus,spi_device_handle_t *device)
         };
     err=spi_bus_add_device(bus,&devcfg,device);
     if (err != ESP_OK){
-        LOG_DEBUG(GwLog::ERROR,"unable to add device to SPI bus %d,mosi=%d, error=%d",
+        logger->logDebug(GwLog::ERROR, "unable to add device to SPI bus %d,mosi=%d, error=%d",
-        (int)bus,-1,(int)err);
+            (int)bus, -1, (int)err);
         return false;
     }
     //slightly speed up the transactions
     //as we are the only ones using the bus we can safely acquire it forever
     err=spi_device_acquire_bus(*device,portMAX_DELAY);
     if (err != ESP_OK){
-        LOG_DEBUG(GwLog::ERROR,"unable to acquire SPI bus %d,mosi=%d, error=%d",
+        logger->logDebug(GwLog::ERROR,"unable to acquire SPI bus %d,mosi=%d, error=%d",
-        (int)bus,-1,(int)err);
+            (int)bus, -1, (int)err);
         return false;
     }
     return true;
@@ -150,7 +175,7 @@ bool sendToLeds(GwLog *logger, uint8_t pin, int numLeds, Color *leds, spi_host_d
         buffer = (uint8_t *)heap_caps_malloc(bufferSize, MALLOC_CAP_DMA|MALLOC_CAP_32BIT);
         if (!buffer)
         {
-            LOG_DEBUG(GwLog::ERROR, "unable to allocate %d bytes of DMA buffer", (int)bufferSize);
+            logger->logDebug(GwLog::ERROR, "unable to allocate %d bytes of DMA buffer", (int)bufferSize);
             return false;
         }
     }
@@ -171,12 +196,12 @@ bool sendToLeds(GwLog *logger, uint8_t pin, int numLeds, Color *leds, spi_host_d
     int64_t end = esp_timer_get_time();
     if (ret != ESP_OK)
     {
-        LOG_DEBUG(GwLog::ERROR, "unable to send led data: %d", (int)ret);
+        logger->logDebug(GwLog::ERROR, "unable to send led data: %d", (int)ret);
         rv = false;
     }
     else
     {
-        LOG_DEBUG(GwLog::DEBUG, "successfully send led data for %d leds, %lld us", numLeds, end - now);
+        logger->logDebug(GwLog::DEBUG, "successfully send led data for %d leds, %lld us", numLeds, end - now);
     }
     if (ownsBuffer)
     {
@@ -189,10 +214,10 @@ bool sendToLeds(GwLog *logger, uint8_t pin, int numLeds, Color *leds, spi_host_d
 void handleSpiLeds(void *param){
     LedTaskData *taskData=(LedTaskData*)param;
     GwLog *logger=taskData->api->getLogger();
-    LOG_DEBUG(GwLog::ERROR,"spi led task initialized");
+    logger->logDebug(GwLog::ERROR, "spi led task initialized");
     spi_host_device_t bus=SPI3_HOST;
     bool spiValid=false;
-    LOG_DEBUG(GwLog::ERROR,"SpiLed task started");
+    LOG_DEBUG(GwLog::ERROR, "SpiLed task started");
     
     if (! prepareGpio(logger,OBP_FLASH_LED)){
         EXIT_TASK;
@@ -211,15 +236,15 @@ void handleSpiLeds(void *param){
         LedInterface newLeds=taskData->getLedData();
         if (first || current.backlightChanged(newLeds) || current.flasChanged(newLeds)){
             first=false;
-            LOG_DEBUG(GwLog::ERROR,"handle SPI leds");
+            logger->logDebug(GwLog::ERROR, "handle SPI leds");
             if (current.backlightChanged(newLeds) || first){
-                LOG_DEBUG(GwLog::ERROR,"setting backlight r=%02d,g=%02d,b=%02d",
+                logger->logDebug(GwLog::ERROR, "setting backlight r=%02d,g=%02d,b=%02d",
-                 newLeds.backlight[0].r,newLeds.backlight[0].g,newLeds.backlight[0].b);
+                    newLeds.backlight[0].r,newLeds.backlight[0].g,newLeds.backlight[0].b);
                 sendToLeds(logger,OBP_BACKLIGHT_LED,newLeds.backlightLen(),newLeds.backlight,bus,device);
             }
             if (current.flasChanged(newLeds) || first){
-                LOG_DEBUG(GwLog::ERROR,"setting flashr=%02d,g=%02d,b=%02d",
+                logger->logDebug(GwLog::ERROR, "setting flashr=%02d,g=%02d,b=%02d",
-                 newLeds.flash[0].r,newLeds.flash[0].g,newLeds.flash[0].b);
+                    newLeds.flash[0].r,newLeds.flash[0].g,newLeds.flash[0].b);
                 sendToLeds(logger,OBP_FLASH_LED,newLeds.flashLen(),newLeds.flash,bus,device);
             }
             current=newLeds;
@@ -229,6 +254,11 @@ void handleSpiLeds(void *param){
     vTaskDelete(NULL);
 }
 
-void createSpiLedTask(LedTaskData *param){
+void createSpiLedTask(LedTaskData *param) {
-    xTaskCreate(handleSpiLeds,"handleLeds",4000,param,3,NULL);
+    TaskHandle_t xHandle = NULL;
-}
+    GwLog *logger = param->api->getLogger();
+    esp_err_t err = xTaskCreate(handleSpiLeds, "handleLeds", configMINIMAL_STACK_SIZE + 2048, param, 3, &xHandle);
+    if (err != pdPASS) {
+        logger->logDebug(GwLog::ERROR, "Failed to create spiled task! (err=%d)", err);
+    };
+}

lib/obp60task/LedSpiTask.h

@@ -10,7 +10,7 @@ class Color{
     uint8_t g;
     uint8_t b;
     Color():r(0),g(0),b(0){}
-    Color(uint8_t cr, uint8_t cg,uint8_t cb):
+    Color(uint8_t cr, uint8_t cg, uint8_t cb):
         b(cb),g(cg),r(cr){}
     Color(const Color &o):b(o.b),g(o.g),r(o.r){}
     bool equal(const Color &o) const{
@@ -22,6 +22,8 @@ class Color{
     bool operator != (const Color &other) const{
         return ! equal(other);
     }
+    String toHex();
+    String toName();
 };
 
 static Color COLOR_GREEN=Color(0,255,0);

lib/obp60task/Logo_OBP_400x300_sw.h

@@ -1,939 +0,0 @@
-const unsigned char gImage_Logo_OBP_400x300_sw[15000] = { /* 0X00,0X01,0X90,0X01,0X2C,0X01, */
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X40,
-0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X01,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X01,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X03,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X80,0X00,0X03,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0X80,0X00,0X03,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X80,
-0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X3F,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X3F,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X7F,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XFF,0XFF,0X00,0X03,0XFF,0XFF,0XF8,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XFF,0XE0,0X00,0X00,0X1F,0XFF,0XF8,0X00,0X00,0X00,0X07,0XFF,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0X80,0X00,0X00,0X07,0XFF,0XF8,0X00,0X00,0X00,
-0X03,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X0F,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0X00,0X00,0X00,0X03,0XFF,0XF8,0X00,
-0X00,0X00,0X01,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X1F,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFE,0X00,0X00,0X00,0X00,0XFF,
-0XF8,0X00,0X00,0X00,0X00,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFC,0X00,0X00,0X00,
-0X00,0X7F,0XF8,0X00,0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XF8,0X00,
-0X00,0X00,0X00,0X7F,0XF8,0X00,0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XF0,0X00,0X00,0X00,0X00,0X3F,0XF8,0X00,0X00,0X00,0X00,0X3F,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XE0,0X00,0X00,0X00,0X00,0X1F,0XF8,0X00,0X1E,0X00,0X00,0X3F,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XE0,0X00,0X0F,0XC0,0X00,0X1F,0XF8,0X00,0X1F,0XE0,0X00,0X3F,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X3F,0XF0,0X00,0X0F,0XF8,0X00,0X1F,0XF0,
-0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X01,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X7F,0XF8,0X00,0X0F,0XF8,0X00,
-0X1F,0XF8,0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X03,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0XFF,0XFC,0X00,0X07,
-0XF8,0X00,0X1F,0XF8,0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X01,0XFF,0XFE,
-0X00,0X07,0XF8,0X00,0X1F,0XF8,0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X01,
-0XFF,0XFE,0X00,0X07,0XF8,0X00,0X1F,0XF8,0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0X80,0X01,0XFF,0XFF,0X00,0X07,0XF8,0X00,0X1F,0XF8,0X00,0X3F,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0X80,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X1F,0XF0,0X00,0X3F,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0X80,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X1F,0XE0,0X00,0X3F,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0X00,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,
-0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X7F,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X00,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,
-0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X00,0X03,0XFF,0XFF,0X00,0X03,
-0XF8,0X00,0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X00,0X03,0XFF,0XFF,
-0X00,0X03,0XF8,0X00,0X00,0X00,0X00,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X00,0X03,
-0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,0X01,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0X00,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,0X03,0XFF,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0X00,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,0X07,0XFF,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0X00,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,0X0F,0XFF,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,
-0X7F,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,
-0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X03,0XFF,0XFF,0X00,0X07,0XF8,0X00,
-0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X1F,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X01,0XFF,0XFE,0X00,0X07,
-0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X01,0XFF,0XFE,
-0X00,0X07,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X00,
-0XFF,0XFC,0X00,0X07,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XC0,0X00,0XFF,0XFC,0X00,0X0F,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XC0,0X00,0X3F,0XF8,0X00,0X0F,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XE0,0X00,0X1F,0XE0,0X00,0X1F,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XE0,0X00,0X00,0X00,0X00,0X1F,0XF8,0X00,0X1F,0XFF,
-0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,
-0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X3F,0XF8,0X00,
-0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X07,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X3F,
-0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XF8,0X00,0X00,0X00,
-0X00,0X7F,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFC,0X00,
-0X00,0X00,0X00,0XFF,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XFE,0X00,0X00,0X00,0X01,0XFF,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XFF,0X80,0X00,0X00,0X03,0XFF,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XFF,0XC0,0X00,0X00,0X0F,0XFF,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X3F,0XFF,0XF8,0X00,0X1F,0XFF,
-0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,
-0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFE,0X00,0X01,0XFF,0XFF,0XF8,0X00,
-0X3F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,
-0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,
-0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,
-0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X1F,0XFF,0XF8,
-0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X0F,
-0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,
-0X00,0X07,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,
-0X03,0XFE,0X00,0X03,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,
-0X00,0X00,0X03,0XFE,0X00,0X03,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X01,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,0XFF,0XF0,0X00,0X7F,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,0X7F,0XF0,
-0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,
-0X3F,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,
-0X00,0X00,0X3F,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,
-0XFF,0XFE,0X00,0X00,0X1F,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,
-0XFF,0XFF,0XFF,0XFE,0X00,0X00,0X0F,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X00,0X0F,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X00,0X07,0XF0,0X00,0X7F,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X00,0X03,0XF0,0X00,0X7F,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X00,0X03,0XF0,
-0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X00,
-0X01,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,
-0X00,0X00,0X00,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,
-0X07,0XFE,0X00,0X00,0X00,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,
-0X00,0X00,0X07,0XFE,0X00,0X00,0X00,0X70,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X00,0X00,0X30,0X00,0X7F,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X08,0X00,0X30,0X00,0X7F,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X0C,0X00,0X10,0X00,0X7F,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X0C,0X00,0X00,
-0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X0E,
-0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,
-0X00,0X0F,0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,
-0XFF,0XFE,0X00,0X0F,0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X3F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,
-0XFF,0XFF,0XFF,0XFE,0X00,0X0F,0X80,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X0F,0XC0,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X0F,0XC0,0X00,0X00,0X7F,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X0F,0XE0,0X00,0X00,0X7F,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X0F,0XF0,0X00,
-0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X0F,
-0XF8,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0XFF,0XFF,0XFF,0XFE,
-0X00,0X0F,0XF8,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,
-0X01,0XFE,0X00,0X0F,0XFC,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,
-0X00,0X00,0X01,0XFE,0X00,0X0F,0XFE,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XC0,0X00,0X00,0X00,0X01,0XFE,0X00,0X0F,0XFE,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XC0,0X00,0X00,0X00,0X01,0XFE,0X00,0X0F,0XFF,0X00,0X00,0X7F,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X01,0XFE,0X00,0X0F,0XFF,0X80,0X00,0X7F,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X01,0XFE,0X00,0X0F,0XFF,0X80,
-0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X01,0XFE,0X00,0X0F,
-0XFF,0XC0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X01,0XFE,
-0X00,0X0F,0XFF,0XE0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,
-0X01,0XFE,0X00,0X0F,0XFF,0XE0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,
-0X00,0X00,0X01,0XFE,0X00,0X1F,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
-0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0X80,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XC0,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,
-0XFF,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X40,0X00,0X0F,0XFF,0XE0,0X00,0X00,
-0X00,0X00,0X00,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X02,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X03,0XFF,0XFF,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XC0,0X00,0X0F,0XFF,0XF8,
-0X00,0X00,0X00,0X00,0X00,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X0E,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X00,0X00,0X07,0XC0,0X00,0X0F,
-0XFF,0XFC,0X00,0X00,0X00,0X00,0X00,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X3E,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X00,0X00,0X0F,0XC0,
-0X00,0X0F,0XFF,0XFE,0X00,0X00,0X00,0X00,0X00,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,
-0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XE0,0X00,0X00,0X00,0X00,0X00,
-0X0F,0XC0,0X00,0X0F,0XFF,0XFE,0X00,0X00,0X00,0X00,0X00,0X7E,0X00,0X00,0X00,0X00,
-0X00,0X00,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X1F,0XE0,0X00,0X00,0X00,
-0X00,0X00,0X0F,0XC0,0X00,0X0F,0XE0,0XFF,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X0F,0XE0,0X03,
-0XE0,0X00,0X3F,0XE0,0X1F,0XC0,0X00,0X0F,0XE0,0X7F,0X00,0X0E,0X00,0X7E,0X00,0X00,
-0X00,0X3F,0X00,0X01,0XFC,0X00,0XFE,0X00,0X3F,0XC0,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X0F,
-0XC0,0X1F,0XFC,0X00,0XFF,0XF8,0X7F,0XFC,0X00,0X0F,0XE0,0X7F,0X1F,0X9F,0X83,0XFF,
-0X80,0X7E,0X01,0XFF,0XE0,0X07,0XFF,0X03,0XFF,0XE0,0XFF,0XF0,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,
-0XF8,0X1F,0XC0,0X3F,0XFE,0X03,0XFF,0XFC,0X7F,0XFC,0X00,0X0F,0XE0,0X7F,0X1F,0XFF,
-0X07,0XFF,0XE0,0X7E,0X03,0XFF,0XF0,0X1F,0XFF,0XC3,0XFF,0XE1,0XFF,0XF8,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X03,0XFF,0XFF,0X80,0X7F,0XFF,0X83,0XFF,0XFE,0X7F,0XFC,0X00,0X0F,0XE0,0XFF,
-0X1F,0XFF,0X0F,0XFF,0XF0,0X7E,0X07,0XFF,0XF8,0X3F,0XFF,0XE3,0XFF,0XE3,0XFF,0XFC,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X03,0XFF,0XFF,0X00,0XFF,0XFF,0X87,0XF8,0XFE,0X7F,0XFC,0X00,0X0F,
-0XFF,0XFE,0X1F,0XFE,0X1F,0XFF,0XF0,0X7E,0X0F,0XE3,0XF8,0X3F,0XFF,0XE3,0XFF,0XE3,
-0XE1,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0X01,0XFE,0X3F,0XC7,0XF0,0X7E,0X1F,0XC0,
-0X00,0X0F,0XFF,0XFE,0X1F,0XF2,0X1F,0XC3,0XF8,0X7E,0X0F,0XC1,0XFC,0X7F,0X87,0XF0,
-0XFE,0X07,0XE0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XC1,0XFC,0X1F,0XC0,0X00,0XFE,
-0X0F,0XC0,0X00,0X0F,0XFF,0XFC,0X1F,0XE0,0X3F,0X83,0XF8,0X7E,0X1F,0XC0,0XFC,0X7F,
-0X03,0X80,0XFE,0X03,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XE1,0XFC,0X0F,0XC0,
-0X07,0XFE,0X0F,0XC0,0X00,0X0F,0XFF,0XF8,0X1F,0XC0,0X3F,0X81,0XF8,0X7E,0X1F,0XC0,
-0XFC,0X7E,0X00,0X00,0XFE,0X03,0XFF,0XE0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X0F,0XE1,0XF8,
-0X0F,0XC0,0XFF,0XFE,0X0F,0XC0,0X00,0X0F,0XFF,0XE0,0X1F,0XC0,0X3F,0X81,0XF8,0X7E,
-0X1F,0XFF,0XFE,0X7E,0X00,0X00,0XFE,0X01,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X0F,
-0XF1,0XF8,0X0F,0XC3,0XFF,0XFE,0X0F,0XC0,0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X3F,0X01,
-0XFC,0X7E,0X1F,0XFF,0XFE,0X7E,0X00,0X00,0XFE,0X00,0XFF,0XFC,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,
-0XF8,0X0F,0XF1,0XF8,0X0F,0XC7,0XFC,0X7E,0X0F,0XC0,0X00,0X0F,0XE0,0X00,0X1F,0XC0,
-0X3F,0X81,0XF8,0X7E,0X1F,0XFF,0XFE,0X7E,0X00,0X00,0XFE,0X00,0X3F,0XFC,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X03,0XF8,0X0F,0XF1,0XFC,0X1F,0XC7,0XF0,0X7E,0X0F,0XC0,0X00,0X0F,0XE0,0X00,
-0X1F,0XC0,0X3F,0X81,0XF8,0X7E,0X1F,0XC0,0X00,0X7F,0X03,0XC0,0XFE,0X00,0X01,0XFE,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X03,0XFC,0X3F,0XF1,0XFC,0X1F,0XC7,0XE0,0X7E,0X0F,0XC0,0X00,0X0F,
-0XE0,0X00,0X1F,0XC0,0X1F,0X83,0XF8,0X7E,0X1F,0XC0,0X00,0X7F,0X07,0XF0,0XFE,0X00,
-0X60,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XE0,0XFF,0X3F,0X87,0XE0,0XFE,0X0F,0XFC,
-0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X1F,0XE7,0XF0,0X7E,0X0F,0XE1,0XFC,0X7F,0XCF,0XF0,
-0X7F,0XC7,0XF0,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XE0,0XFF,0XFF,0X87,0XFF,0XFE,
-0X0F,0XFC,0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X0F,0XFF,0XF0,0X7E,0X0F,0XFF,0XF8,0X3F,
-0XFF,0XE0,0X7F,0XC7,0XFF,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XC0,0X7F,0XFF,0X07,
-0XFF,0XFE,0X0F,0XFC,0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X07,0XFF,0XE0,0X7E,0X07,0XFF,
-0XF0,0X1F,0XFF,0XC0,0X7F,0XE3,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0X80,0X1F,
-0XFE,0X03,0XFF,0X3F,0X07,0XFC,0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X03,0XFF,0XC0,0X7E,
-0X03,0XFF,0XE0,0X0F,0XFF,0X80,0X3F,0XE1,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XF8,
-0X00,0X07,0XF8,0X00,0XFC,0X3F,0X03,0XFC,0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X00,0XFF,
-0X00,0X7E,0X00,0XFF,0X80,0X03,0XFE,0X00,0X1F,0XE0,0X7F,0XC0,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFC,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFC,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XE0,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,};

lib/obp60task/MFD_OBP60_400x300_sw.h

@@ -1,939 +0,0 @@
-const unsigned char gImage_MFD_OBP60_400x300_sw[15000] = { /* 0X00,0X01,0X90,0X01,0X2C,0X01, */
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XE0,0X3F,
-0XC0,0X00,0X00,0X7E,0X00,0X40,0XFC,0X07,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X08,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XE0,0X0F,0XC0,0X00,0X00,0X00,
-0X00,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,
-0XF0,0X3F,0XC0,0X00,0X00,0X7E,0X01,0XC0,0XFC,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X38,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XF8,0X0F,0XC0,0X00,
-0X00,0X00,0X00,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X1F,0XF0,0X7F,0XC0,0X00,0X00,0X7E,0X07,0XC0,0XFC,0X1F,0XF0,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0XF8,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFC,0X0F,
-0XC0,0X00,0X00,0X00,0X00,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X1F,0XF0,0X7F,0XC0,0X00,0X00,0X7E,0X0F,0XC0,0XFC,0X3F,0XE0,0X00,
-0X00,0X00,0X00,0X00,0X00,0X01,0XF8,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,
-0XFE,0X0F,0XC0,0X00,0X00,0X00,0X00,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X1F,0XF0,0X7F,0XC0,0X00,0X00,0X7E,0X0F,0XC0,0X00,0X3F,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X07,0XFF,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XF8,0X7F,0XC0,0X00,0X00,0X7E,0X0F,0XC0,
-0X00,0X3F,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XF8,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X07,0XF0,0XFF,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X80,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XF8,0XFF,0XC3,0XE0,0XF8,0X7E,
-0X3F,0XF8,0XFC,0XFF,0XE7,0XC1,0XF0,0XF8,0XF8,0X01,0XFC,0X07,0XFF,0X1F,0X80,0X7F,
-0X00,0XF8,0XF8,0X00,0X07,0XF0,0X7F,0X0F,0XC0,0X7F,0X80,0XF9,0XF0,0X1F,0X80,0XFF,
-0X83,0XF0,0X3F,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X78,0XF7,0XC3,0XE0,
-0XF8,0X7E,0X3F,0XF8,0XFC,0XFF,0XE7,0XC1,0XF0,0XFB,0XFC,0X07,0XFF,0X07,0XFF,0X1F,
-0X81,0XFF,0XC0,0XFB,0XFC,0X00,0X07,0XF0,0X3F,0X0F,0XC1,0XFF,0XE0,0XFB,0XFC,0X1F,
-0X83,0XFF,0XE1,0XF8,0X3E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X78,0XF7,
-0XC3,0XE0,0XF8,0X7E,0X3F,0XF8,0XFC,0XFF,0XE7,0XC1,0XF0,0XFF,0XFE,0X0F,0XFF,0XC7,
-0XFF,0X1F,0X83,0XFF,0XE0,0XFF,0XFE,0X00,0X07,0XF0,0X3F,0X0F,0XC3,0XFF,0XF0,0XFF,
-0XFE,0X1F,0X87,0XFF,0XF1,0XF8,0X3E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,
-0X7C,0XF7,0XC3,0XE0,0XF8,0X7E,0X3F,0XF8,0XFC,0XFF,0XE7,0XC1,0XF0,0XFF,0XFE,0X1F,
-0XFF,0XC7,0XFF,0X1F,0X87,0XFF,0XF0,0XFF,0XFE,0X00,0X07,0XF0,0X3F,0X8F,0XC3,0XE3,
-0XF0,0XFF,0XFE,0X1F,0X87,0XFF,0XF0,0XF8,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X1F,0X3D,0XE7,0XC3,0XE0,0XF8,0X7E,0X0F,0XC0,0XFC,0X3F,0X07,0XC1,0XF0,0XFF,
-0XFE,0X1F,0X87,0XE1,0XF8,0X1F,0X87,0XE3,0XF0,0XFF,0XFE,0X00,0X07,0XF0,0X3F,0X8F,
-0XC3,0XE1,0X80,0XFC,0X7F,0X1F,0X87,0XC1,0XF0,0XFC,0X7C,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X1F,0X3D,0XE7,0XC3,0XE0,0XF8,0X7E,0X0F,0XC0,0XFC,0X3F,0X07,0XC1,
-0XF0,0XFC,0X7E,0X3F,0X07,0X01,0XF8,0X1F,0X8F,0XC1,0XF8,0XFC,0X7E,0X00,0X07,0XF0,
-0X3F,0X8F,0XC3,0XFC,0X00,0XFC,0X3F,0X1F,0X80,0X07,0XF0,0X7C,0X7C,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X1F,0X3F,0XE7,0XC3,0XE0,0XF8,0X7E,0X0F,0XC0,0XFC,0X3F,
-0X07,0XC1,0XF0,0XFC,0X3E,0X3F,0X00,0X01,0XF8,0X1F,0X8F,0XC1,0XF8,0XFC,0X3E,0X00,
-0X07,0XF0,0X3F,0X0F,0XC3,0XFF,0XE0,0XF8,0X3F,0X1F,0X80,0X7F,0XF0,0X7C,0XF8,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X3F,0XE7,0XC3,0XE0,0XF8,0X7E,0X0F,0XC0,
-0XFC,0X3F,0X07,0XC1,0XF0,0XF8,0X3E,0X3F,0X00,0X01,0XF8,0X1F,0X8F,0XC1,0XF8,0XF8,
-0X3E,0X00,0X07,0XF0,0X3F,0X0F,0XC1,0XFF,0XF0,0XF8,0X3F,0X1F,0X83,0XFF,0XF0,0X7C,
-0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X1F,0XC7,0XC3,0XE1,0XF8,0X7E,
-0X0F,0XC0,0XFC,0X3F,0X07,0XC3,0XF0,0XF8,0X3E,0X3F,0X00,0X01,0XF8,0X1F,0X8F,0XC1,
-0XF8,0XF8,0X3E,0X00,0X07,0XF0,0X3F,0X0F,0XC0,0X7F,0XF8,0XF8,0X3F,0X1F,0X87,0XF1,
-0XF0,0X3E,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X1F,0XC7,0XC3,0XF1,
-0XF8,0X7E,0X0F,0XC0,0XFC,0X3F,0X07,0XE3,0XF0,0XF8,0X3E,0X3F,0X03,0X01,0XF8,0X1F,
-0X8F,0XC1,0XF8,0XF8,0X3E,0X00,0X07,0XF0,0X7F,0X0F,0XC0,0X03,0XF8,0XFC,0X3F,0X1F,
-0X8F,0XC1,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X1F,0XC7,
-0XC3,0XFF,0XF8,0X7E,0X0F,0XC0,0XFC,0X3F,0X07,0XFF,0XF0,0XF8,0X3E,0X1F,0X87,0XE1,
-0XF8,0X1F,0X87,0XE3,0XF0,0XF8,0X3E,0X00,0X07,0XFF,0XFE,0X0F,0XC0,0XE0,0XF8,0XFC,
-0X7F,0X1F,0X8F,0XC3,0XF0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,
-0X1F,0XC7,0XC3,0XFF,0XF8,0X7E,0X0F,0XF8,0XFC,0X3F,0X07,0XFF,0XF0,0XF8,0X3E,0X1F,
-0XFF,0XC1,0XFF,0X1F,0X87,0XFF,0XF0,0XF8,0X3E,0X00,0X07,0XFF,0XFE,0X0F,0XC7,0XE1,
-0XF8,0XFF,0XFE,0X1F,0X8F,0XFF,0XF0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X1F,0X0F,0X87,0XC3,0XFF,0XF8,0X7E,0X0F,0XF8,0XFC,0X3F,0X07,0XFF,0XF0,0XF8,
-0X3E,0X0F,0XFF,0XC1,0XFF,0X1F,0X83,0XFF,0XE0,0XF8,0X3E,0X00,0X07,0XFF,0XFC,0X0F,
-0XC3,0XFF,0XF0,0XFF,0XFE,0X1F,0X8F,0XFF,0XF0,0X1F,0XE0,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X1F,0X0F,0X87,0XC1,0XFE,0XF8,0X7E,0X07,0XF8,0XFC,0X3F,0X03,0XFD,
-0XF0,0XF8,0X3E,0X07,0XFF,0X80,0XFF,0X1F,0X81,0XFF,0XC0,0XF8,0X3E,0X00,0X07,0XFF,
-0XF8,0X0F,0XC3,0XFF,0XE0,0XFF,0XFC,0X1F,0X87,0XFD,0XF0,0X0F,0XE0,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X1F,0X0F,0X87,0XC0,0XF8,0XF8,0X7E,0X03,0XF8,0XFC,0X3F,
-0X01,0XF1,0XF0,0XF8,0X3E,0X01,0XFE,0X00,0X7F,0X1F,0X80,0X7F,0X00,0XF8,0X3E,0X00,
-0X07,0XFF,0XC0,0X0F,0XC0,0X7F,0X80,0XF9,0XF0,0X1F,0X81,0XF0,0XF8,0X0F,0XC0,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XF8,0X00,0X00,0X00,0X00,0X00,0X0F,
-0XC0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XF8,0X00,0X00,0X00,0X00,
-0X00,0X0F,0XC0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XF8,0X00,0X00,
-0X00,0X00,0X01,0XFF,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XF8,
-0X00,0X00,0X00,0X00,0X01,0XFF,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0XF8,0X00,0X00,0X00,0X00,0X01,0XFF,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0XF8,0X00,0X00,0X00,0X00,0X00,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XF8,0X01,0XFF,0XFC,0X03,0XFF,0XF0,0X00,0XFC,
-0X00,0X3F,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFE,0X01,0XFF,0XFF,0X03,0XFF,0XFC,
-0X03,0XFF,0X00,0XFF,0XE0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0X81,0XFF,0XFF,0X83,
-0XFF,0XFE,0X07,0XFF,0X81,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XC1,0XFF,
-0XFF,0X83,0XFF,0XFE,0X0F,0XFF,0XC3,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,
-0XC1,0XFF,0XFF,0XC3,0XFF,0XFE,0X1F,0X8F,0XC3,0XF1,0XF8,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,
-0XFE,0X1F,0XE1,0XFC,0X1F,0XC3,0XF0,0X7F,0X1F,0X87,0X83,0XE0,0XF8,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X01,0XFC,0X0F,0XE1,0XFC,0X1F,0X83,0XF0,0X3F,0X1F,0X00,0X07,0XE0,0XF8,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X01,0XF8,0X07,0XE1,0XFC,0X1F,0X83,0XF0,0X3F,0X3F,0X3E,0X07,0XE0,
-0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X07,0XF1,0XFF,0XFF,0X03,0XF0,0X7F,0X3F,0X7F,
-0X87,0XE0,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X07,0XF1,0XFF,0XFE,0X03,0XFF,0XFE,
-0X3F,0XFF,0XC7,0XE0,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X07,0XF1,0XFF,0XFF,0X03,
-0XFF,0XFE,0X3F,0XFF,0XC7,0XE0,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X07,0XF1,0XFF,
-0XFF,0X83,0XFF,0XFC,0X3F,0X87,0XE7,0XE0,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X07,
-0XF1,0XFF,0XFF,0XC3,0XFF,0XF8,0X3F,0X07,0XE7,0XE0,0XFC,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,
-0XF8,0X07,0XE1,0XFC,0X0F,0XC3,0XFF,0XE0,0X3F,0X03,0XE7,0XE0,0XFC,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X01,0XFC,0X0F,0XE1,0XFC,0X0F,0XE3,0XF0,0X00,0X1F,0X03,0XE3,0XE0,0XFC,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X01,0XFE,0X1F,0XE1,0XFC,0X0F,0XE3,0XF0,0X00,0X1F,0X07,0XE3,0XE0,
-0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XC1,0XFF,0XFF,0XC3,0XF0,0X00,0X1F,0X87,
-0XE3,0XF1,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XC1,0XFF,0XFF,0XC3,0XF0,0X00,
-0X0F,0XFF,0XC1,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0X81,0XFF,0XFF,0X83,
-0XF0,0X00,0X07,0XFF,0X81,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFE,0X01,0XFF,
-0XFF,0X83,0XF0,0X00,0X03,0XFF,0X00,0XFF,0XE0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XF8,
-0X01,0XFF,0XFC,0X03,0XF0,0X00,0X00,0XFC,0X00,0X3F,0X80,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X40,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XC0,0X07,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XC0,0X07,
-0XFF,0XFC,0X07,0XFF,0X00,0X07,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,
-0XC0,0X07,0XFF,0XE0,0X00,0XFF,0X00,0X00,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X0F,0XC0,0X07,0XFF,0XC0,0X00,0X7F,0X00,0X00,0X7F,0XF0,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X1F,0XC0,0X07,0XFF,0X80,0X00,0X3F,0X00,0X00,0X3F,0XF0,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X1F,0XC0,0X07,0XFF,0X00,0X00,0X1F,0X00,0X00,0X1F,0XF0,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XC0,0X07,0XFE,0X00,0XC0,0X0F,0X01,0XE0,
-0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XC0,0X07,0XFE,0X03,0XF0,0X0F,
-0X01,0XF0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XC0,0X07,0XFC,0X03,
-0XF8,0X0F,0X01,0XF0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XC0,0X07,
-0XFC,0X07,0XF8,0X07,0X01,0XF0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,
-0XC0,0X07,0XFC,0X07,0XFC,0X07,0X01,0XE0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X03,0XFF,0XC0,0X07,0XFC,0X07,0XFC,0X07,0X00,0X00,0X3F,0XF0,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X03,0XFF,0XC0,0X07,0XFC,0X07,0XFC,0X07,0X00,0X00,0X3F,0XF0,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X07,0XFF,0XC0,0X07,0XFC,0X07,0XFC,0X07,0X00,0X00,0X7F,0XF0,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XC0,0X07,0XFC,0X07,0XFC,0X07,0X00,0X00,
-0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XC0,0X07,0XFC,0X07,0XF8,0X07,
-0X01,0XDF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XC0,0X07,0XFC,0X07,
-0XF8,0X0F,0X01,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XC0,0X07,
-0XFE,0X03,0XF8,0X0F,0X01,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,
-0XC0,0X07,0XFE,0X00,0XE0,0X0F,0X01,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X7F,0XFF,0XC0,0X07,0XFF,0X00,0X00,0X1F,0X01,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0XFF,0XFF,0XC0,0X07,0XFF,0X00,0X00,0X3F,0X01,0XFF,0XFF,0XF0,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X01,0XFF,0XFF,0XC0,0X07,0XFF,0X80,0X00,0X7F,0X01,0XFF,0XFF,0XF0,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XC0,0X07,0XFF,0XE0,0X00,0XFF,0X01,0XFF,
-0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XC0,0X07,0XFF,0XF8,0X03,0XFF,
-0X01,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XC0,0X07,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,
-0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,
-0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X3F,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X3F,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0X78,
-0X0F,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,
-0X00,0X78,0X07,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XC0,0X07,
-0XFE,0X00,0X00,0X78,0X07,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,
-0XC0,0X07,0XFE,0X00,0X00,0X78,0X03,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,
-0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0X78,0X01,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X07,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X01,0XF0,0X3F,0XF0,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X00,0XF0,0X3F,0XF0,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X00,0X70,
-0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0XF8,
-0X00,0X70,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,
-0X00,0XF8,0X00,0X30,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XC0,0X07,
-0XFE,0X00,0X00,0XF8,0X00,0X10,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,
-0XC0,0X07,0XFE,0X00,0X00,0XF8,0X00,0X10,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,
-0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0XF8,0X08,0X00,0X3F,0XF0,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,
-0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X0C,0X00,0X3F,0XF0,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X0E,0X00,0X3F,0XF0,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X0E,0X00,
-0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,
-0X0F,0X00,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,
-0X00,0X78,0X0F,0X80,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,
-0XFE,0X00,0X00,0X78,0X0F,0X80,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,
-0XC0,0X07,0XFE,0X00,0X00,0X78,0X0F,0XC0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,
-0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0X78,0X0F,0XE0,0X3F,0XF0,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,
-0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0X78,0X0F,0XE0,0X3F,0XF0,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,
-0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,
-0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,
-0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XF8,0X00,0X00,0X00,0X20,0X0F,0XE0,
-0X00,0X00,0X38,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFC,0X00,0X00,0X00,0X60,
-0X0F,0XF8,0X00,0X00,0X38,0X00,0X00,0X01,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFE,0X00,0X00,
-0X00,0XE0,0X0F,0XF8,0X00,0X00,0X00,0X00,0X00,0X03,0X80,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X0E,
-0X06,0X00,0XC0,0XE0,0X0E,0X3C,0X08,0X38,0X00,0X18,0X03,0X03,0X81,0XC0,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X07,0X1E,0X1F,0X87,0XFB,0XF8,0X0E,0X3C,0XDC,0XFE,0X38,0X7F,0X0F,0XE7,0XE7,0XF0,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X07,0XFC,0X3F,0XCF,0X3B,0XF8,0X0F,0XF8,0XF9,0XFF,0X38,0XE7,0X1F,0XE7,
-0XE6,0X38,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X07,0XFE,0X78,0XE0,0X38,0XE0,0X0F,0XF8,0XE1,0XC7,0X39,0XE3,
-0XBC,0X03,0X87,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X0E,0X70,0XE3,0XF8,0XE0,0X0F,0XE0,0XE1,0XC7,
-0X39,0XFF,0XB8,0X03,0X87,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X0F,0X70,0XEF,0X38,0XE0,0X0E,0X00,
-0XE1,0XC7,0X39,0XFF,0XB8,0X03,0X81,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X1E,0X39,0XEE,0X38,0XE0,
-0X0E,0X00,0XE1,0XC7,0X38,0XE0,0X3C,0XF3,0X80,0X38,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFE,0X3F,0XCF,
-0XF8,0XF0,0X0E,0X00,0XE0,0XFF,0X38,0XFF,0X1F,0XE3,0XEF,0X78,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFC,
-0X1F,0X87,0XD8,0XF8,0X0E,0X00,0XE0,0X7C,0X38,0X7E,0X0F,0XC1,0XE7,0XF0,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X38,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X78,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XF8,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X20,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
-0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,};

lib/obp60task/NetworkClient.cpp

@@ -1,16 +1,140 @@
 #include "NetworkClient.h"
+#include "GWWifi.h"             // WiFi management (thread-safe)
+
+extern GwWifi gwWifi;   // Extern declaration of global WiFi instance
 
 extern "C" {
     #include "puff.h"
 }
 
+static uint32_t crc32_update(uint32_t crc, const uint8_t* data, size_t len) {
+    crc = ~crc;
+    for (size_t i = 0; i < len; ++i) {
+        crc ^= data[i];
+        for (int bit = 0; bit < 8; ++bit) {
+            uint32_t mask = -(int32_t)(crc & 1U);
+            crc = (crc >> 1) ^ (0xEDB88320U & mask);
+        }
+    }
+    return ~crc;
+}
+
 // Constructor
 NetworkClient::NetworkClient(size_t reserveSize)
     : _doc(reserveSize),
-      _valid(false)
+      _valid(false),
+      _jsonRaw(nullptr),
+      _jsonRawLen(0),
+      _imageWidth(0),
+      _imageHeight(0),
+      _numberPixels(0),
+      _pictureBase64(nullptr),
+      _pictureBase64Len(0)
 {
 }
 
+NetworkClient::~NetworkClient() {
+    if (_jsonRaw != nullptr) {
+        free(_jsonRaw);
+        _jsonRaw = nullptr;
+        _jsonRawLen = 0;
+    }
+}
+
+bool NetworkClient::findJsonIntField(const char* json, size_t len, const char* key, int& outValue) {
+    if (json == nullptr || key == nullptr || len == 0) {
+        return false;
+    }
+
+    char pattern[64];
+    int plen = snprintf(pattern, sizeof(pattern), "\"%s\"", key);
+    if (plen <= 0 || (size_t)plen >= sizeof(pattern)) {
+        return false;
+    }
+
+    const char* keyPos = strstr(json, pattern);
+    if (keyPos == nullptr) {
+        return false;
+    }
+
+    const char* end = json + len;
+    const char* colon = strchr(keyPos + plen, ':');
+    if (colon == nullptr || colon >= end) {
+        return false;
+    }
+
+    const char* p = colon + 1;
+    while (p < end && (*p == ' ' || *p == '\t' || *p == '\r' || *p == '\n')) {
+        ++p;
+    }
+    if (p >= end) {
+        return false;
+    }
+
+    char* parseEnd = nullptr;
+    long value = strtol(p, &parseEnd, 10);
+    if (parseEnd == p) {
+        return false;
+    }
+    outValue = (int)value;
+    return true;
+}
+
+bool NetworkClient::extractJsonStringInPlace(char* json, size_t len, const char* key, char*& outValue, size_t& outLen) {
+    outValue = nullptr;
+    outLen = 0;
+
+    if (json == nullptr || key == nullptr || len == 0) {
+        return false;
+    }
+
+    char pattern[64];
+    int plen = snprintf(pattern, sizeof(pattern), "\"%s\"", key);
+    if (plen <= 0 || (size_t)plen >= sizeof(pattern)) {
+        return false;
+    }
+
+    char* keyPos = strstr(json, pattern);
+    if (keyPos == nullptr) {
+        return false;
+    }
+
+    char* end = json + len;
+    char* colon = strchr(keyPos + plen, ':');
+    if (colon == nullptr || colon >= end) {
+        return false;
+    }
+
+    char* p = colon + 1;
+    while (p < end && (*p == ' ' || *p == '\t' || *p == '\r' || *p == '\n')) {
+        ++p;
+    }
+    if (p >= end || *p != '"') {
+        return false;
+    }
+
+    char* valueStart = p + 1;
+    char* cur = valueStart;
+    while (cur < end) {
+        if (*cur == '\\') {
+            ++cur;
+            if (cur < end) {
+                ++cur;
+            }
+            continue;
+        }
+        if (*cur == '"') {
+            *cur = '\0';
+            outValue = valueStart;
+            outLen = (size_t)(cur - valueStart);
+            return true;
+        }
+        ++cur;
+    }
+
+    return false;
+}
+
 // Skip GZIP Header an goto DEFLATE content
 int NetworkClient::skipGzipHeader(const uint8_t* data, size_t len) {
     if (len < 10) return -1;
@@ -48,11 +172,18 @@ int NetworkClient::skipGzipHeader(const uint8_t* data, size_t len) {
 // HTTP GET + GZIP Decompression (reading in chunks)
 bool NetworkClient::httpGetGzip(const String& url, uint8_t*& outData, size_t& outLen) {
 
-    const size_t capacity = READLIMIT;   // Read limit for data (can be adjusted in NetworkClient.h)
+    const size_t capacity = READLIMIT;          // Read limit for data (can be adjusted in NetworkClient.h)
     uint8_t* buffer = (uint8_t*)malloc(capacity);
 
+    // If not with WiFi connectetd then return without any activities
+    if (!gwWifi.clientConnected()) {
+        if (DEBUGING) {Serial.println("No WiFi connection");}
+        return false;
+    }
+    
+    // If frame buffer not correct allocated then return without any activities
     if (!buffer) {
-        if (DEBUG) {Serial.println("Malloc failed (buffer");}
+        if (DEBUGING) {Serial.println("Malloc failed buffer");}
         return false;
     }
 
@@ -63,20 +194,50 @@ bool NetworkClient::httpGetGzip(const String& url, uint8_t*& outData, size_t& ou
     http.setTimeout(TCPREADTIMEOUT);            // Read timeout in ms (can be adjusted in NetworkClient.h)
 
     http.begin(url);
+
+    // NEW: force server to close the connection after the response (prevents "stuck" keep-alive reads)
+    http.addHeader("Connection", "close");
+
+    // NEW: request gzip, but we will only decompress if the server actually answers with gzip
     http.addHeader("Accept-Encoding", "gzip");
 
+    // NEW: register headers BEFORE GET() (more reliable with Arduino HTTPClient)
+    if (DEBUGING) {
+        // We need follow key words
+        const char* keys[] = {
+            "Content-Encoding",
+            "Transfer-Encoding",
+            "Content-Length"
+        };
+        // Read header
+        http.collectHeaders(keys, 3);
+    }
+
     int code = http.GET();
     if (code != HTTP_CODE_OK) {
-        Serial.printf("HTTP ERROR: %d\n", code);
+        Serial.printf("HTTP Client ERROR: %d (%s)\n", code, http.errorToString(code).c_str());
 
         // Hard reset HTTP + socket
         WiFiClient* tmp = http.getStreamPtr();
         if (tmp) tmp->stop();   // Force close TCP socket
+        
         http.end();
-
         free(buffer);
         return false;
     }
+    else{       
+        if (DEBUGING) {
+            String ce = http.header("Content-Encoding");
+            String te = http.header("Transfer-Encoding");
+            String cl = http.header("Content-Length");
+
+            // Print header informations
+            Serial.printf("Content-Encoding=%s Transfer-Encoding=%s Content-Length=%s\n",
+                        ce.c_str(),
+                        te.c_str(),
+                        cl.c_str());
+        }                
+    }
 
     WiFiClient* stream = http.getStreamPtr();
 
@@ -85,55 +246,251 @@ bool NetworkClient::httpGetGzip(const String& url, uint8_t*& outData, size_t& ou
     const uint32_t READ_TIMEOUT = READDATATIMEOUT;   // Timeout for reading data (can be adjusted in NetworkClient.h)
 
     bool complete = false;
+    bool aborting = false;   // NEW: remember if we must force-close socket
 
-    while (http.connected() && !complete) {
+    // NEW: detect if server really sent gzip
+    String ce = http.header("Content-Encoding");
+    bool isGzip = ce.equalsIgnoreCase("gzip");
 
-        size_t avail = stream->available();
+    // NEW: read expected body size if provided by server (prevents waiting forever for missing bytes)
+    int total = http.getSize();  // returns Content-Length, or -1 if unknown/chunked
 
-        if (avail == 0) {
+    // NEW: fail fast if server claims something larger than our buffer
-            if (millis() - lastData > READ_TIMEOUT) {
+    if (total > 0 && (size_t)total > capacity) {
-                Serial.println("TIMEOUT waiting for data!");
+        Serial.println("Response exceeds READLIMIT.");
-                break;
+        aborting = true;
-            }
-            delay(1);
-            continue;
-        }
-
-        if (len + avail > capacity)
-            avail = capacity - len;
-
-        int read = stream->readBytes(buffer + len, avail);
-        len += read;
-        lastData = millis();
-
-        if (DEBUG) {Serial.printf("Read chunk: %d (total: %d)\n", read, (int)len);}
-
-        if (len < 20) continue;  // Not enough data for header
-
-        int headerOffset = skipGzipHeader(buffer, len);
-        if (headerOffset < 0) continue;
-
-        unsigned long testLen = len * 8; // Dynamic expansion
-        uint8_t* test = (uint8_t*)malloc(testLen);
-
-        if (!test) continue;
-
-        unsigned long srcLen = len - headerOffset;
-
-        int res = puff(test, &testLen, buffer + headerOffset, &srcLen);
-        if (res == 0) {
-            if (DEBUG) {Serial.printf("Decompress OK! Size: %lu bytes\n", testLen);}
-            outData = test;
-            outLen = testLen;
-            complete = true;
-            break;
-        }
-
-        free(test);
     }
 
-    // --- Added: Force-close connection in all cases to avoid stuck TCP sockets ---
+    // NEW: if not gzip, we will not try to decompress (prevents false "Decompress OK" / random success)
-    if (stream) stream->stop();
+    // You can either handle plain JSON here or just fail-fast.
+    if (!isGzip && !aborting) {
+        if (DEBUGING) {
+            Serial.println("Server response is NOT gzip (Content-Encoding != gzip).");
+            Serial.println("Either disable Accept-Encoding: gzip or add plain-body handling here.");
+        }
+
+        // --- Plain-body handling (recommended): read full body into outData as-is ---
+        // NEW: try to read Content-Length bytes if available (more robust)
+        if (total > 0 && (size_t)total > capacity) {
+            Serial.println("Plain response exceeds READLIMIT.");
+            aborting = true;
+        } else {
+            // Read until we have all bytes (Content-Length) or until connection closes + buffer drains
+            while ((http.connected() || (stream && stream->available())) && !aborting) {
+                size_t avail = stream ? stream->available() : 0;
+                if (avail == 0) {
+                    if (millis() - lastData > READ_TIMEOUT) {
+                        Serial.println("TIMEOUT waiting for data (plain)!");
+                        aborting = true;
+                        break;
+                    }
+                    delay(1);
+                    continue;
+                }
+
+                if (len >= capacity) {
+                    Serial.println("READLIMIT reached, aborting (plain).");
+                    aborting = true;
+                    break;
+                }
+
+                if (len + avail > capacity)
+                    avail = capacity - len;
+
+                int read = stream->readBytes(buffer + len, avail);
+                if (read > 0) {
+                    len += (size_t)read;
+                    lastData = millis();
+                }
+
+                // NEW: stop reading as soon as we have the full response
+                if (total > 0 && (int)len >= total) {
+                    break; // we got full body
+                }
+            }
+        }
+
+        if (aborting) {
+            // --- Added: Force-close connection only if aborted to avoid TCP RST storms ---
+            if (stream) stream->stop();   // Force close TCP socket
+            http.end();
+            free(buffer);
+            return false;
+        }
+
+        if (total > 0 && (int)len != total) {
+            Serial.printf("Plain response incomplete: got=%d expected=%d\n", (int)len, total);
+            if (stream) stream->stop();
+            http.end();
+            free(buffer);
+            return false;
+        }
+
+        // Return plain body to caller
+        outData = (uint8_t*)malloc(len + 1);
+        if (!outData) {
+            Serial.println("Malloc failed outData (plain).");
+            // --- Added: Force-close connection only if aborted to avoid TCP RST storms ---
+            if (stream) stream->stop();   // Force close TCP socket
+            http.end();
+            free(buffer);
+            return false;
+        }
+        memcpy(outData, buffer, len);
+        outData[len] = 0;
+        outLen = len;
+
+        http.end();
+        free(buffer);
+        return true;
+    }
+
+    // --- GZIP path (only if Content-Encoding is gzip) ---
+    if (!aborting) {
+
+        // NEW: read exactly Content-Length bytes when available (prevents partial-body timeout loops)
+        while ((http.connected() || (stream && stream->available())) && !complete && !aborting) {
+
+            size_t avail = stream ? stream->available() : 0;
+
+            if (avail == 0) {
+                // NEW: if Content-Length is known and we already read it all, stop immediately
+                if (total > 0 && (int)len >= total) {
+                    break;
+                }
+
+                if (millis() - lastData > READ_TIMEOUT) {
+                    Serial.println("TIMEOUT waiting for data!");
+                    aborting = true;   // NEW: mark abnormal exit
+                    break;
+                }
+                delay(1);
+                continue;
+            }
+
+            // NEW: safety check if buffer limit is reached
+            if (len >= capacity) {
+                Serial.println("READLIMIT reached, aborting.");
+                aborting = true;
+                break;
+            }
+
+            // NEW: if Content-Length is known, do not read beyond it
+            if (total > 0) {
+                size_t remaining = (size_t)total - len;
+                if (avail > remaining) avail = remaining;
+            }
+
+            if (len + avail > capacity)
+                avail = capacity - len;
+
+            int read = stream->readBytes(buffer + len, avail);
+            if (read <= 0) {
+                // NEW: avoid tight loop if read returns zero
+                delay(1);
+                continue;
+            }
+
+            len += (size_t)read;
+            lastData = millis();
+
+            if (DEBUGING) {Serial.printf("Read chunk: %d (total: %d)\n", read, (int)len);}
+
+            // NEW: if Content-Length is known and fully received, we can stop reading
+            if (total > 0 && (int)len >= total) {
+                break;
+            }
+        }
+
+        // NEW: only attempt gzip parse/decompress after we have a complete body (when Content-Length is known)
+        // This avoids wasting heap with repeated malloc/free and reduces fragmentation over long runtimes.
+        if (!aborting) {
+            if (total > 0 && (int)len != total) {
+                Serial.printf("GZIP response incomplete: got=%d expected=%d\n", (int)len, total);
+                aborting = true;
+            }
+        }
+
+        if (!aborting) {
+            if (len < 20) {
+                aborting = true;
+            } else {
+                int headerOffset = skipGzipHeader(buffer, len);
+                if (headerOffset < 0) {
+                    aborting = true;
+                } else {
+                    size_t deflateLen = len - (size_t)headerOffset;
+                    // GZIP trailer (CRC32 + ISIZE) is 8 bytes and not part of deflate stream.
+                    if (deflateLen >= 8) {
+                        deflateLen -= 8;
+                    }
+
+                    unsigned long srcLenForSize = (unsigned long)deflateLen;
+                    unsigned long outNeeded = 0;
+                    int sizeRes = puff(NIL, &outNeeded, buffer + headerOffset, &srcLenForSize);
+
+                    if (sizeRes != 0) {
+                        if (DEBUGING) {
+                            Serial.printf("Decompress size probe failed: res=%d src=%lu\n", sizeRes, srcLenForSize);
+                        }
+                        aborting = true;
+                    } else {
+                        uint8_t* test = (uint8_t*)malloc((size_t)outNeeded + 1);
+                        if (!test) {
+                            Serial.println("Malloc failed test buffer, aborting.");
+                            aborting = true;
+                        } else {
+                            unsigned long srcLen = (unsigned long)deflateLen;
+                            unsigned long testLen = outNeeded;
+                            int res = puff(test, &testLen, buffer + headerOffset, &srcLen);
+
+                            if (res == 0) {
+                                uint32_t trailerCrc =
+                                    (uint32_t)buffer[len - 8] |
+                                    ((uint32_t)buffer[len - 7] << 8) |
+                                    ((uint32_t)buffer[len - 6] << 16) |
+                                    ((uint32_t)buffer[len - 5] << 24);
+                                uint32_t trailerIsize =
+                                    (uint32_t)buffer[len - 4] |
+                                    ((uint32_t)buffer[len - 3] << 8) |
+                                    ((uint32_t)buffer[len - 2] << 16) |
+                                    ((uint32_t)buffer[len - 1] << 24);
+                                uint32_t calcCrc = crc32_update(0, test, (size_t)testLen);
+                                uint32_t calcIsize = (uint32_t)testLen;
+
+                                if (calcCrc != trailerCrc || calcIsize != trailerIsize) {
+                                    Serial.printf(
+                                        "GZIP CRC/ISIZE mismatch crc=%08lx/%08lx isize=%lu/%lu\n",
+                                        (unsigned long)calcCrc,
+                                        (unsigned long)trailerCrc,
+                                        (unsigned long)calcIsize,
+                                        (unsigned long)trailerIsize
+                                    );
+                                    free(test);
+                                    aborting = true;
+                                } else {
+                                    test[testLen] = 0;
+                                    if (DEBUGING) {Serial.printf("Decompress OK! Size: %lu bytes\n", testLen);}
+                                    outData = test;
+                                    outLen = (size_t)testLen;
+                                    complete = true;
+                                }
+                            } else {
+                                if (DEBUGING) {
+                                    Serial.printf("Decompress failed: res=%d out=%lu src=%lu\n", res, testLen, srcLen);
+                                }
+                                free(test);
+                                aborting = true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // --- Added: Force-close connection only if aborted to avoid TCP RST storms ---
+    if (aborting && stream) stream->stop();   // NEW: stop() only on abnormal termination
 
     http.end();
     free(buffer);
@@ -150,6 +507,18 @@ bool NetworkClient::httpGetGzip(const String& url, uint8_t*& outData, size_t& ou
 bool NetworkClient::fetchAndDecompressJson(const String& url) {
 
     _valid = false;
+    _doc.clear();
+    _imageWidth = 0;
+    _imageHeight = 0;
+    _numberPixels = 0;
+    _pictureBase64 = nullptr;
+    _pictureBase64Len = 0;
+
+    if (_jsonRaw != nullptr) {
+        free(_jsonRaw);
+        _jsonRaw = nullptr;
+        _jsonRawLen = 0;
+    }
 
     uint8_t* raw = nullptr;
     size_t rawLen = 0;
@@ -159,15 +528,38 @@ bool NetworkClient::fetchAndDecompressJson(const String& url) {
         return false;
     }
 
-    DeserializationError err = deserializeJson(_doc, raw, rawLen);
+    char* json = reinterpret_cast<char*>(raw);
-    free(raw);
+    bool ok = true;
+    ok = findJsonIntField(json, rawLen, "number_pixels", _numberPixels) && ok;
+    ok = findJsonIntField(json, rawLen, "width", _imageWidth) && ok;
+    ok = findJsonIntField(json, rawLen, "height", _imageHeight) && ok;
+    ok = extractJsonStringInPlace(json, rawLen, "picture_base64", _pictureBase64, _pictureBase64Len) && ok;
 
-    if (err) {
+    if (!ok) {
-        Serial.printf("JSON ERROR: %s\n", err.c_str());
+        Serial.println("JSON field extraction failed.");
+        free(raw);
         return false;
     }
 
-    if (DEBUG) {Serial.println("JSON OK!");}
+    if (_imageWidth <= 0 || _imageHeight <= 0 || _pictureBase64Len == 0) {
+        Serial.printf("JSON invalid geometry/data w=%d h=%d b64=%u\n",
+                      _imageWidth,
+                      _imageHeight,
+                      (unsigned int)_pictureBase64Len);
+        free(raw);
+        return false;
+    }
+
+    _jsonRaw = raw;
+    _jsonRawLen = rawLen;
+
+    if (DEBUGING) {
+        Serial.printf("JSON fields OK: num=%d w=%d h=%d b64=%u\n",
+                      _numberPixels,
+                      _imageWidth,
+                      _imageHeight,
+                      (unsigned int)_pictureBase64Len);
+    }
     _valid = true;
     return true;
 }
@@ -176,6 +568,26 @@ JsonDocument& NetworkClient::json() {
     return _doc;
 }
 
+int NetworkClient::imageWidth() const {
+    return _imageWidth;
+}
+
+int NetworkClient::imageHeight() const {
+    return _imageHeight;
+}
+
+int NetworkClient::numberPixels() const {
+    return _numberPixels;
+}
+
+const char* NetworkClient::pictureBase64() const {
+    return _pictureBase64;
+}
+
+size_t NetworkClient::pictureBase64Len() const {
+    return _pictureBase64Len;
+}
+
 bool NetworkClient::isValid() const {
     return _valid;
 }

lib/obp60task/NetworkClient.h

@@ -3,7 +3,7 @@
 #include <WiFi.h>
 #include <HTTPClient.h>
 
-#define DEBUG false             // Debug flag for NetworkClient for more live information
+#define DEBUGING true             // Debug flag for NetworkClient for more live information
 #define READLIMIT 200000        // HTTP read limit in byte for gzip content (can be adjusted)
 #define CONNECTIONTIMEOUT 3000  // Timeout in ms for HTTP connection 
 #define TCPREADTIMEOUT 2000     // Timeout in ms for read HTTP client stack
@@ -12,16 +12,31 @@
 class NetworkClient {
 public:
     NetworkClient(size_t reserveSize = 0);
+    ~NetworkClient();
 
     bool fetchAndDecompressJson(const String& url);
     JsonDocument& json();
+    int imageWidth() const;
+    int imageHeight() const;
+    int numberPixels() const;
+    const char* pictureBase64() const;
+    size_t pictureBase64Len() const;
     bool isValid() const;
 
 private:
     DynamicJsonDocument _doc;
     bool _valid;
+    uint8_t* _jsonRaw;
+    size_t _jsonRawLen;
+    int _imageWidth;
+    int _imageHeight;
+    int _numberPixels;
+    char* _pictureBase64;
+    size_t _pictureBase64Len;
 
     int skipGzipHeader(const uint8_t* data, size_t len);
     bool httpGetGzip(const String& url, uint8_t*& outData, size_t& outLen);
+    static bool findJsonIntField(const char* json, size_t len, const char* key, int& outValue);
+    static bool extractJsonStringInPlace(char* json, size_t len, const char* key, char*& outValue, size_t& outLen);
 };
 

lib/obp60task/OBP60Extensions.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include <Arduino.h>
@@ -24,37 +25,30 @@
 #include "fonts/Ubuntu_Bold20pt8b.h"
 #include "fonts/Ubuntu_Bold32pt8b.h"
 #include "fonts/Atari16px8b.h" // Key label font
+#include "fonts/Atari6px8b.h"  // Very small (6x6) font
 #include "fonts/IBM8x8px.h"
 
 // E-Ink Display
-// Definition for e-paper width an height refer OBP60Hardware.h
+#define GxEPD_WIDTH 400     // Display width
+#define GxEPD_HEIGHT 300    // Display height
+
 #ifdef DISPLAY_GDEW042T2
 // Set display type and SPI pins for display
 GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> display(GxEPD2_420(OBP_SPI_CS, OBP_SPI_DC, OBP_SPI_RST, OBP_SPI_BUSY)); // GDEW042T2 400x300, UC8176 (IL0398)
-// Export display in new funktion
-GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> & getdisplay(){return display;}
 #endif
-
 #ifdef DISPLAY_GDEY042T81
 // Set display type and SPI pins for display
 GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> display(GxEPD2_420_GDEY042T81(OBP_SPI_CS, OBP_SPI_DC, OBP_SPI_RST, OBP_SPI_BUSY)); // GDEW042T2 400x300, UC8176 (IL0398)
-// Export display in new funktion
-GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> & getdisplay(){return display;}
 #endif
-
 #ifdef DISPLAY_GYE042A87
 // Set display type and SPI pins for display
 GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> display(GxEPD2_420_GYE042A87(OBP_SPI_CS, OBP_SPI_DC, OBP_SPI_RST, OBP_SPI_BUSY)); // GDEW042T2 400x300, UC8176 (IL0398)
-// Export display in new funktion
-GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> & getdisplay(){return display;}
 #endif
-
 #ifdef DISPLAY_SE0420NQ04
 // Set display type and SPI pins for display
 GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> display(GxEPD2_420_SE0420NQ04(OBP_SPI_CS, OBP_SPI_DC, OBP_SPI_RST, OBP_SPI_BUSY)); // GDEW042T2 400x300, UC8176 (IL0398)
-// Export display in new funktion
-GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> & getdisplay(){return display;}
 #endif
+gxepd2display *epd = &display;
 
 // Horter I2C moduls
 PCF8574 pcf8574_Modul1(PCF8574_I2C_ADDR1); // First digital IO modul PCF8574 from Horter
@@ -70,6 +64,7 @@ sdmmc_card_t *sdcard;
 bool hasSDCard = false;
 
 // Global vars
+bool heartbeat = false;         // Heartbeat indicator with two different states
 bool blinkingLED = false;       // Enable / disable blinking flash LED
 bool statusLED = false;         // Actual status of flash LED on/off
 bool statusBacklightLED = false;// Actual status of flash LED on/off
@@ -88,11 +83,11 @@ void hardwareInit(GwApi *api)
 
     Wire.begin();
     // Init PCF8574 digital outputs
-    Wire.setClock(I2C_SPEED_LOW);   // Set I2C clock on 10 kHz
+    Wire.setClock(I2C_SPEED_LOW);      // Set I2C clock to low for external devices
-    if(pcf8574_Modul1.begin()){        // Initialize PCF8574
+    if (pcf8574_Modul1.begin()) {      // Initialize PCF8574
         pcf8574_Modul1.write8(255);    // Clear all outputs (low activ)
     }
-    Wire.setClock(I2C_SPEED);       // Set I2C clock on 100 kHz
+    Wire.setClock(I2C_SPEED);          // Set I2C clock to normal
     fram = Adafruit_FRAM_I2C();
     if (esp_reset_reason() ==  ESP_RST_POWERON) {
         // help initialize FRAM
@@ -242,17 +237,17 @@ void deepSleep(CommonData &common){
     setFlashLED(false);                     // Flash LED Off
     buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
     // Shutdown EInk display
-    getdisplay().setFullWindow();               // Set full Refresh
+    epd->setFullWindow();                   // Set full Refresh
-    getdisplay().fillScreen(common.bgcolor);    // Clear screen
+    epd->fillScreen(common.bgcolor);        // Clear screen
-    getdisplay().setTextColor(common.fgcolor);
+    epd->setTextColor(common.fgcolor);
-    getdisplay().setFont(&Ubuntu_Bold20pt8b);
+    epd->setFont(&Ubuntu_Bold20pt8b);
-    getdisplay().setCursor(85, 150);
+    epd->setCursor(85, 150);
-    getdisplay().print("Sleep Mode");
+    epd->print("Sleep Mode");
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    epd->setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setCursor(65, 175);
+    epd->setCursor(65, 175);
-    getdisplay().print("To wake up press key and wait 5s");
+    epd->print("To wake up press key and wait 5s");
-    getdisplay().nextPage();                // Update display contents
+    epd->nextPage();                        // Update display contents
-    getdisplay().powerOff();                // Display power off
+    epd->powerOff();                        // Display power off
     setPortPin(OBP_POWER_50, false);        // Power off ePaper display
     // Stop system
     esp_deep_sleep_start();                 // Deep Sleep with weakup via touch pin
@@ -266,18 +261,18 @@ void deepSleep(CommonData &common){
     setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
     setFlashLED(false);                     // Flash LED Off
     // Shutdown EInk display
-    getdisplay().setFullWindow();               // Set full Refresh
+    epd->setFullWindow();               // Set full Refresh
-    //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+    //epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-    getdisplay().fillScreen(common.bgcolor);    // Clear screen
+    epd->fillScreen(common.bgcolor);    // Clear screen
-    getdisplay().setTextColor(common.fgcolor);
+    epd->setTextColor(common.fgcolor);
-    getdisplay().setFont(&Ubuntu_Bold20pt8b);
+    epd->setFont(&Ubuntu_Bold20pt8b);
-    getdisplay().setCursor(85, 150);
+    epd->setCursor(85, 150);
-    getdisplay().print("Sleep Mode");
+    epd->print("Sleep Mode");
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    epd->setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setCursor(65, 175);
+    epd->setCursor(65, 175);
-    getdisplay().print("To wake up press wheel and wait 5s");
+    epd->print("To wake up press wheel and wait 5s");
-    getdisplay().nextPage();                // Partial update
+    epd->nextPage();                // Partial update
-    getdisplay().powerOff();                // Display power off
+    epd->powerOff();                // Display power off
     setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
     setPortPin(OBP_POWER_SD, false);        // Power off SD card
     // Stop system
@@ -322,65 +317,69 @@ void setBacklightLED(uint brightness, const Color &color){
     ledTaskData->setLedData(current);    
 }
 
-void toggleBacklightLED(uint brightness, const Color &color){
+void toggleBacklightLED(uint brightness, const Color &color) {
     if (ledTaskData == nullptr) return;
     statusBacklightLED = !statusBacklightLED;
-    Color nv=setBrightness(statusBacklightLED?color:COLOR_BLACK,brightness);
+    Color nv = setBrightness(statusBacklightLED ? color : COLOR_BLACK, brightness);
-    LedInterface current=ledTaskData->getLedData();
+    LedInterface current = ledTaskData->getLedData();
     current.setBacklight(nv);
     ledTaskData->setLedData(current); 
 }
 
-void stepsBacklightLED(uint brightness, const Color &color){
+void stepsBacklightLED(uint brightness, const Color &color) {
     static uint step = 0;
     uint actBrightness = 0;
     // Different brightness steps
-    if(step == 0){
+    if (step == 0){
-        actBrightness = brightness;         // 100% from brightess
+        actBrightness = brightness;         // 100% from brightness
         statusBacklightLED = true;
     }
-    if(step == 1){
+    else if (step == 1) {
-        actBrightness = brightness * 0.5;   // 50% from brightess
+        actBrightness = brightness * 0.5;   // 50% from brighntess
         statusBacklightLED = true;
     }
-    if(step == 2){
+    else if (step == 2) {
-        actBrightness = brightness * 0.2;   // 20% from brightess
+        actBrightness = brightness * 0.2;   // 20% from brightness
         statusBacklightLED = true;
     }
-    if(step == 3){
+    else if (step == 3) {
         actBrightness = 0;                  // 0%
         statusBacklightLED = false;
     }
-    if(actBrightness < 5){                  // Limiter if values too low
+    if (actBrightness < 5) {                  // Limiter if values too low
         actBrightness = 5;
     }
-    step = step + 1;    // Increment step counter
+    step = step + 1;      // Increment step counter
-    if(step == 4){      // Reset counter
+    if (step == 4) {      // Reset counter
         step = 0;
     }
-    if (ledTaskData == nullptr) return;
+    if (ledTaskData == nullptr) {
-    Color nv=setBrightness(statusBacklightLED?color:COLOR_BLACK,actBrightness);
+        return;
-    LedInterface current=ledTaskData->getLedData();
+    }
+    Color nv = setBrightness(statusBacklightLED ? color:COLOR_BLACK, actBrightness);
+    LedInterface current = ledTaskData->getLedData();
     current.setBacklight(nv);
     ledTaskData->setLedData(current); 
 }
 
-void setFlashLED(bool status){
+void setFlashLED(bool status) {
-    if (ledTaskData == nullptr) return;
+    if (ledTaskData == nullptr) {
-    Color c=status?COLOR_RED:COLOR_BLACK;
+        return;
-    LedInterface current=ledTaskData->getLedData();
+    }
+    Color c = status ? COLOR_RED : COLOR_BLACK;
+    LedInterface current = ledTaskData->getLedData();
     current.setFlash(c);
     ledTaskData->setLedData(current);
 }
 
-void blinkingFlashLED(){
+void blinkingFlashLED() {
-    if(blinkingLED == true){
+    if (blinkingLED == true) {
         statusLED = !statusLED;     // Toggle LED for each run
         setFlashLED(statusLED);
-    }    
+    }
 }
 
-void setBlinkingLED(bool status){
+void setBlinkingLED(bool status) {
     blinkingLED = status;
 }
 
@@ -410,26 +409,29 @@ void setBuzzerPower(uint power){
     buzzerpower = power;
 }
 
-// Delete xdr prefix from string
+// Delete xdr prefix from string and optional limit length
-String xdrDelete(String input){
+String xdrDelete(String input, uint8_t maxlen) {
-    if(input.substring(0,3) == "xdr"){
+    if (input.substring(0, 3) == "xdr") {
         input = input.substring(3, input.length());
     }
+    if (maxlen > 0) {
+        return input.substring(0, maxlen);
+    }
     return input;
 }
 
 void fillPoly4(const std::vector<Point>& p4, uint16_t color) {
-    getdisplay().fillTriangle(p4[0].x, p4[0].y, p4[1].x, p4[1].y, p4[2].x, p4[2].y, color);
+    epd->fillTriangle(p4[0].x, p4[0].y, p4[1].x, p4[1].y, p4[2].x, p4[2].y, color);
-    getdisplay().fillTriangle(p4[0].x, p4[0].y, p4[2].x, p4[2].y, p4[3].x, p4[3].y, color);
+    epd->fillTriangle(p4[0].x, p4[0].y, p4[2].x, p4[2].y, p4[3].x, p4[3].y, color);
 }
 
 void drawPoly(const std::vector<Point>& points, uint16_t color) {
     size_t polysize = points.size();
     for (size_t i = 0; i < polysize - 1; i++) {
-        getdisplay().drawLine(points[i].x, points[i].y, points[i+1].x, points[i+1].y, color);
+        epd->drawLine(points[i].x, points[i].y, points[i+1].x, points[i+1].y, color);
     }
     // close path
-    getdisplay().drawLine(points[polysize-1].x, points[polysize-1].y, points[0].x, points[0].y, color);
+    epd->drawLine(points[polysize-1].x, points[polysize-1].y, points[0].x, points[0].y, color);
 }
 
 // Split string into words, whitespace separated
@@ -479,29 +481,29 @@ std::vector<String> wordwrap(String &line, uint16_t maxwidth) {
 void drawTextCenter(int16_t cx, int16_t cy, String text) {
     int16_t x1, y1;
     uint16_t w, h;
-    getdisplay().getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
+    epd->getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
-    getdisplay().setCursor(cx - w / 2, cy + h / 2);
+    epd->setCursor(cx - w / 2, cy + h / 2);
-    getdisplay().print(text);
+    epd->print(text);
 }
 
 // Draw centered botton with centered text
 void drawButtonCenter(int16_t cx, int16_t cy, int8_t sx, int8_t sy, String text, uint16_t fg, uint16_t bg, bool inverted) {
     int16_t x1, y1;
     uint16_t w, h;
-    uint16_t color;
+    epd->getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
-
+    int16_t cursorX = cx - (x1 + static_cast<int16_t>(w / 2));
-    getdisplay().getTextBounds(text, cx, cy, &x1, &y1, &w, &h); // Find text center
+    int16_t cursorY = cy - (y1 + static_cast<int16_t>(h / 2));
-    getdisplay().setCursor(cx - w/2, cy + h/2);                 // Set cursor to center
+    //epd->drawPixel(cx, cy, fg);                         // Debug pixel for center position
-    //getdisplay().drawPixel(cx, cy, fg);                         // Debug pixel for center position
     if (inverted) {
-        getdisplay().fillRoundRect(cx - sx / 2, cy - sy / 2, sx, sy, 5, fg); // Draw button
+        epd->fillRoundRect(cx - sx / 2, cy - sy / 2, sx, sy, 5, fg);
-        getdisplay().setTextColor(bg);
+        epd->setTextColor(bg);
-        getdisplay().print(text);                               // Draw text
+        epd->setCursor(cursorX, cursorY);
-     }
+        epd->print(text);
-     else{
+     } else {
-        getdisplay().drawRoundRect(cx - sx / 2, cy - sy / 2, sx, sy, 5, fg); // Draw button
+        epd->drawRoundRect(cx - sx / 2, cy - sy / 2, sx, sy, 5, fg); // Draw button
-        getdisplay().setTextColor(fg);
+        epd->setTextColor(fg);
-        getdisplay().print(text);                               // Draw text
+        epd->setCursor(cursorX, cursorY);
+        epd->print(text);
      }
 }
 
@@ -509,43 +511,42 @@ void drawButtonCenter(int16_t cx, int16_t cy, int8_t sx, int8_t sy, String text,
 void drawTextRalign(int16_t x, int16_t y, String text) {
     int16_t x1, y1;
     uint16_t w, h;
-    getdisplay().getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
+    epd->getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
-    getdisplay().setCursor(x - w - 1, y); // '-1' required since some strings wrap around w/o it
+    epd->setCursor(x - w, y);
-    getdisplay().print(text);
+    epd->print(text);
 }
 
 // Draw text inside box, normal or inverted
 void drawTextBoxed(Rect box, String text, uint16_t fg, uint16_t bg, bool inverted, bool border) {
     if (inverted) {
-        getdisplay().fillRect(box.x, box.y, box.w, box.h, fg);
+        epd->fillRect(box.x, box.y, box.w, box.h, fg);
-        getdisplay().setTextColor(bg);
+        epd->setTextColor(bg);
     } else {
         if (border) {
-            getdisplay().fillRect(box.x + 1, box.y + 1, box.w - 2, box.h - 2, bg);
+            epd->fillRect(box.x + 1, box.y + 1, box.w - 2, box.h - 2, bg);
-            getdisplay().drawRect(box.x, box.y, box.w, box.h, fg);
+            epd->drawRect(box.x, box.y, box.w, box.h, fg);
         }
-        getdisplay().setTextColor(fg);
+        epd->setTextColor(fg);
     }
     uint16_t border_offset = box.h / 4; // 25% of box height
-    getdisplay().setCursor(box.x + border_offset, box.y + box.h - border_offset);
+    epd->setCursor(box.x + border_offset, box.y + box.h - border_offset);
-    getdisplay().print(text);
+    epd->print(text);
-    getdisplay().setTextColor(fg);
+    epd->setTextColor(fg);
 }
 
 // Show a triangle for trend direction high (x, y is the left edge)
 void displayTrendHigh(int16_t x, int16_t y, uint16_t size, uint16_t color){
-    getdisplay().fillTriangle(x, y, x+size*2, y, x+size, y-size*2, color);
+    epd->fillTriangle(x, y, x+size*2, y, x+size, y-size*2, color);
 }
 
 // Show a triangle for trend direction low (x, y is the left edge)
 void displayTrendLow(int16_t x, int16_t y, uint16_t size, uint16_t color){
-    getdisplay().fillTriangle(x, y, x+size*2, y, x+size, y+size*2, color);
+    epd->fillTriangle(x, y, x+size*2, y, x+size, y+size*2, color);
 }
 
 // Show header informations
-void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop){
+void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop){
 
-    static bool heartbeat = false;
     static unsigned long usbRxOld = 0;
     static unsigned long usbTxOld = 0;
     static unsigned long serRxOld = 0;
@@ -557,31 +558,65 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
     static unsigned long n2kRxOld = 0;
     static unsigned long n2kTxOld = 0;
 
+    uint16_t symbol_x = 2;
+    static const uint16_t symbol_offset = 20;
+
+    // TODO invert and get rid of the if
     if(commonData.config->getBool(commonData.config->statusLine) == true){
 
         // Show status info
-        getdisplay().setTextColor(commonData.fgcolor);
+        epd->setTextColor(commonData.fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(0, 15);
+        epd->setCursor(0, 15);
-        if(commonData.status.wifiApOn){
+        if (commonData.status.wifiApOn) {
-        getdisplay().print(" AP ");
+            if (symbolmode) {
+                epd->drawXBitmap(symbol_x, 1, iconmap["AP"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                epd->print(" AP ");
+            }
         }
         // If receive new telegram data then display bus name
         if(commonData.status.tcpClRx != tcpClRxOld || commonData.status.tcpClTx != tcpClTxOld || commonData.status.tcpSerRx != tcpSerRxOld || commonData.status.tcpSerTx != tcpSerTxOld){
-        getdisplay().print("TCP ");
+            if (symbolmode) {
+                epd->drawXBitmap(symbol_x, 1, iconmap["TCP"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                epd->print("TCP ");
+            }
         }
         if(commonData.status.n2kRx != n2kRxOld || commonData.status.n2kTx != n2kTxOld){
-        getdisplay().print("N2K ");
+            if (symbolmode) {
+                epd->drawXBitmap(symbol_x, 1, iconmap["N2K"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                epd->print("N2K ");
+            }
         }
         if(commonData.status.serRx != serRxOld || commonData.status.serTx != serTxOld){
-        getdisplay().print("183 ");
+            if (symbolmode) {
+                epd->drawXBitmap(symbol_x, 1, iconmap["0183"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                epd->print("183 ");
+            }
         }
         if(commonData.status.usbRx != usbRxOld || commonData.status.usbTx != usbTxOld){
-        getdisplay().print("USB ");
+            if (symbolmode) {
+                epd->drawXBitmap(symbol_x, 1, iconmap["USB"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                epd->print("USB ");
+            }
         }
-        double gpshdop = formatValue(hdop, commonData).value;
+        double gpshdop = commonData.fmt->formatValue(hdop, commonData).value;
         if(commonData.config->getString(commonData.config->useGPS) != "off" &&  gpshdop <= commonData.config->getInt(commonData.config->hdopAccuracy) && hdop->valid == true){
-        getdisplay().print("GPS");
+            if (symbolmode) {
+                epd->drawXBitmap(symbol_x, 1, iconmap["GPS"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                epd->print("GPS");
+            }
         }
         // Save old telegram counter
         tcpClRxOld = commonData.status.tcpClRx;
@@ -598,26 +633,26 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
 #ifdef HARDWARE_V21
         // Display key lock status
         if (commonData.keylock) {
-            getdisplay().drawXBitmap(170, 1, lock_bits, icon_width, icon_height, commonData.fgcolor);
+            epd->drawXBitmap(170, 1, lock_bits, icon_width, icon_height, commonData.fgcolor);
         } else {
-            getdisplay().drawXBitmap(166, 1, swipe_bits, swipe_width, swipe_height, commonData.fgcolor);
+            epd->drawXBitmap(166, 1, swipe_bits, swipe_width, swipe_height, commonData.fgcolor);
         }
 #endif
 #ifdef LIPO_ACCU_1200
         if (commonData.data.BatteryChargeStatus == 1) {
-             getdisplay().drawXBitmap(170, 1, battery_loading_bits, battery_width, battery_height, commonData.fgcolor);
+             epd->drawXBitmap(170, 1, battery_loading_bits, battery_width, battery_height, commonData.fgcolor);
         } else {
 #ifdef VOLTAGE_SENSOR
             if (commonData.data.batteryLevelLiPo < 10) {
-                getdisplay().drawXBitmap(170, 1, battery_0_bits, battery_width, battery_height, commonData.fgcolor);
+                epd->drawXBitmap(170, 1, battery_0_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 25) {
-                getdisplay().drawXBitmap(170, 1, battery_25_bits, battery_width, battery_height, commonData.fgcolor);
+                epd->drawXBitmap(170, 1, battery_25_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 50) {
-                getdisplay().drawXBitmap(170, 1, battery_50_bits, battery_width, battery_height, commonData.fgcolor);
+                epd->drawXBitmap(170, 1, battery_50_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 75) {
-                getdisplay().drawXBitmap(170, 1, battery_75_bits, battery_width, battery_height, commonData.fgcolor);
+                epd->drawXBitmap(170, 1, battery_75_bits, battery_width, battery_height, commonData.fgcolor);
             } else {
-                getdisplay().drawXBitmap(170, 1, battery_100_bits, battery_width, battery_height, commonData.fgcolor);
+                epd->drawXBitmap(170, 1, battery_100_bits, battery_width, battery_height, commonData.fgcolor);
             }
 #endif // VOLTAGE_SENSOR
         }
@@ -625,33 +660,33 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
 
         // Heartbeat as page number
         if (heartbeat) {
-            getdisplay().setTextColor(commonData.bgcolor);
+            epd->setTextColor(commonData.bgcolor);
-            getdisplay().fillRect(201, 0, 23, 19, commonData.fgcolor);
+            epd->fillRect(201, 0, 23, 19, commonData.fgcolor);
         } else {
-            getdisplay().setTextColor(commonData.fgcolor);
+            epd->setTextColor(commonData.fgcolor);
-            getdisplay().drawRect(201, 0, 23, 19, commonData.fgcolor);
+            epd->drawRect(201, 0, 23, 19, commonData.fgcolor);
         }
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
         drawTextCenter(211, 9, String(commonData.data.actpage));
         heartbeat = !heartbeat;
 
         // Date and time
-        String fmttype = commonData.config->getString(commonData.config->dateFormat);
+        fmtDate fmttype = commonData.fmt->getDateFormat(commonData.config->getString(commonData.config->dateFormat));
         String timesource = commonData.config->getString(commonData.config->timeSource);
         double tz = commonData.config->getString(commonData.config->timeZone).toDouble();
-        getdisplay().setTextColor(commonData.fgcolor);
+        epd->setTextColor(commonData.fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(230, 15);
+        epd->setCursor(230, 15);
         if (timesource == "RTC" or timesource == "iRTC") {
             // TODO take DST into account
             if (commonData.data.rtcValid) {
                 time_t tv = mktime(&commonData.data.rtcTime) + (int)(tz * 3600);
                 struct tm *local_tm = localtime(&tv);
-                getdisplay().print(formatTime('m', local_tm->tm_hour, local_tm->tm_min, 0));
+                epd->print(formatTime(fmtTime::MMHH, local_tm->tm_hour, local_tm->tm_min, 0));
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(formatDate(fmttype, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
+                epd->print(formatDate(fmttype, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(tz == 0 ? "UTC" : "LOT");
+                epd->print(tz == 0 ? "UTC" : "LOT");
             } else {
                 drawTextRalign(396, 15, "RTC invalid");
             }
@@ -659,18 +694,18 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
         else if (timesource == "GPS") {
             // Show date and time if date present
             if(date->valid == true){
-                String acttime = formatValue(time, commonData).svalue;
+                String acttime = commonData.fmt->formatValue(time, commonData).svalue;
                 acttime = acttime.substring(0, 5);
-                String actdate = formatValue(date, commonData).svalue;
+                String actdate = commonData.fmt->formatValue(date, commonData).svalue;
-                getdisplay().print(acttime);
+                epd->print(acttime);
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(actdate);
+                epd->print(actdate);
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(tz == 0 ? "UTC" : "LOT");
+                epd->print(tz == 0 ? "UTC" : "LOT");
             }
             else{
                 if(commonData.config->getBool(commonData.config->useSimuData) == true){
-                    getdisplay().print("12:00 01.01.2024 LOT");
+                    epd->print("12:00 01.01.2024 LOT");
                 }
                 else{
                     drawTextRalign(396, 15, "No GPS data");
@@ -678,15 +713,15 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
             }
         } // timesource == "GPS"
         else {
-            getdisplay().print("No time source");
+            epd->print("No time source");
         }
     }
 }
 
 void displayFooter(CommonData &commonData) {
 
-    getdisplay().setFont(&Atari16px);
+    epd->setFont(&Atari16px);
-    getdisplay().setTextColor(commonData.fgcolor);
+    epd->setTextColor(commonData.fgcolor);
 
 #ifdef HARDWARE_V21
     // Frame around key icon area
@@ -695,14 +730,14 @@ void displayFooter(CommonData &commonData) {
         const uint16_t top = 280;
         const uint16_t bottom = 299;
         // horizontal stub lines
-        getdisplay().drawLine(commonData.keydata[0].x, top, commonData.keydata[0].x+10, top, commonData.fgcolor);
+        epd->drawLine(commonData.keydata[0].x, top, commonData.keydata[0].x+10, top, commonData.fgcolor);
         for (int i = 1; i <= 5; i++) {
-            getdisplay().drawLine(commonData.keydata[i].x-10, top, commonData.keydata[i].x+10, top, commonData.fgcolor);
+            epd->drawLine(commonData.keydata[i].x-10, top, commonData.keydata[i].x+10, top, commonData.fgcolor);
         }
-        getdisplay().drawLine(commonData.keydata[5].x + commonData.keydata[5].w - 10, top, commonData.keydata[5].x + commonData.keydata[5].w + 1, top, commonData.fgcolor);
+        epd->drawLine(commonData.keydata[5].x + commonData.keydata[5].w - 10, top, commonData.keydata[5].x + commonData.keydata[5].w + 1, top, commonData.fgcolor);
         // vertical key separators
         for (int i = 0; i <= 4; i++) {
-            getdisplay().drawLine(commonData.keydata[i].x + commonData.keydata[i].w, top, commonData.keydata[i].x + commonData.keydata[i].w, bottom, commonData.fgcolor);
+            epd->drawLine(commonData.keydata[i].x + commonData.keydata[i].w, top, commonData.keydata[i].x + commonData.keydata[i].w, bottom, commonData.fgcolor);
         }
         for (int i = 0; i < 6; i++) {
             uint16_t x, y;
@@ -713,7 +748,7 @@ void displayFooter(CommonData &commonData) {
                     if (iconmap.find(icon_name) != iconmap.end()) {
                         x = commonData.keydata[i].x + (commonData.keydata[i].w - icon_width) / 2;
                         y = commonData.keydata[i].y + (commonData.keydata[i].h - icon_height) / 2;
-                        getdisplay().drawXBitmap(x, y, iconmap[icon_name], icon_width, icon_height, commonData.fgcolor);
+                        epd->drawXBitmap(x, y, iconmap[icon_name], icon_width, icon_height, commonData.fgcolor);
                     } else {
                         // icon is missing, use name instead
                         x = commonData.keydata[i].x + commonData.keydata[i].w / 2;
@@ -728,8 +763,8 @@ void displayFooter(CommonData &commonData) {
             }
         }
     } else {
-        getdisplay().setCursor(65, 295);
+        epd->setCursor(65, 295);
-        getdisplay().print("Press 1 and 6 fast to unlock keys");
+        epd->print("Press 1 and 6 fast to unlock keys");
     }
 #endif
 #ifdef BOARD_OBP40S3
@@ -740,21 +775,21 @@ void displayFooter(CommonData &commonData) {
     uint16_t x0 = (GxEPD_WIDTH - w) / 2 + r * 2;
     for (int i = 0; i < commonData.data.maxpage; i++) {
         if (i == (commonData.data.actpage - 1)) {
-            getdisplay().fillCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
+            epd->fillCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
         } else {
-            getdisplay().drawCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
+            epd->drawCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
         }
     }
     // key indicators
     // left side = top key "menu"
-    getdisplay().drawLine(0, 280, 10, 280, commonData.fgcolor);
+    epd->drawLine(0, 280, 10, 280, commonData.fgcolor);
-    getdisplay().drawLine(55, 280, 65, 280, commonData.fgcolor);
+    epd->drawLine(55, 280, 65, 280, commonData.fgcolor);
-    getdisplay().drawLine(65, 280, 65, 299, commonData.fgcolor);
+    epd->drawLine(65, 280, 65, 299, commonData.fgcolor);
     drawTextCenter(33, 291, commonData.keydata[0].label);
     // right side = bottom key "exit"
-    getdisplay().drawLine(390, 280, 399, 280, commonData.fgcolor);
+    epd->drawLine(390, 280, 399, 280, commonData.fgcolor);
-    getdisplay().drawLine(335, 280, 345, 280, commonData.fgcolor);
+    epd->drawLine(335, 280, 345, 280, commonData.fgcolor);
-    getdisplay().drawLine(335, 280, 335, 399, commonData.fgcolor);
+    epd->drawLine(335, 280, 335, 399, commonData.fgcolor);
     drawTextCenter(366, 291, commonData.keydata[1].label);
 #endif
 }
@@ -767,31 +802,31 @@ void displayAlarm(CommonData &commonData) {
     const uint16_t w = 300;
     const uint16_t h = 150;
 
-    getdisplay().setFont(&Atari16px);
+    epd->setFont(&Atari16px);
-    getdisplay().setTextColor(commonData.fgcolor);
+    epd->setTextColor(commonData.fgcolor);
 
     // overlay
-    getdisplay().drawRect(x, y, w, h, commonData.fgcolor);
+    epd->drawRect(x, y, w, h, commonData.fgcolor);
-    getdisplay().fillRect(x + 1, y + 1, w - 1, h - 1, commonData.bgcolor);
+    epd->fillRect(x + 1, y + 1, w - 1, h - 1, commonData.bgcolor);
-    getdisplay().drawRect(x + 3, y + 3, w - 5, h - 5, commonData.fgcolor);
+    epd->drawRect(x + 3, y + 3, w - 5, h - 5, commonData.fgcolor);
 
     // exclamation icon in left top corner
-    getdisplay().drawXBitmap(x + 16, y + 16, exclamation_bits, exclamation_width, exclamation_height, commonData.fgcolor);
+    epd->drawXBitmap(x + 16, y + 16, exclamation_bits, exclamation_width, exclamation_height, commonData.fgcolor);
 
     // title
-    getdisplay().setCursor(x + 64, y + 30);
+    epd->setCursor(x + 64, y + 30);
-    getdisplay().print("A L A R M");
+    epd->print("A L A R M");
-    getdisplay().setCursor(x + 64, y + 48);
+    epd->setCursor(x + 64, y + 48);
-    getdisplay().print("#" + commonData.alarm.id);
+    epd->print("#" + commonData.alarm.id);
-    getdisplay().print(" from ");
+    epd->print(" from ");
-    getdisplay().print(commonData.alarm.source);
+    epd->print(commonData.alarm.source);
 
     // message, but maximum 4 lines
     std::vector<String> lines = wordwrap (commonData.alarm.message, w - 16 - 8 / 8);
     int n = 0;
     for (const auto& l : lines) {
-        getdisplay().setCursor(x + 16, y + 80 + n);
+        epd->setCursor(x + 16, y + 80 + n);
-        getdisplay().print(l);
+        epd->print(l);
         n += 16;
         if (n > 64) {
             break;
@@ -884,20 +919,20 @@ void batteryGraphic(uint x, uint y, float percent, int pcolor, int bcolor){
         }
         // Battery corpus 100x80 with fill level
         int level = int((100.0 - percent) * (80-(2*t)) / 100.0);
-        getdisplay().fillRect(xb, yb, 100, 80, pcolor);
+        epd->fillRect(xb, yb, 100, 80, pcolor);
         if(percent < 99){
-            getdisplay().fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
+            epd->fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
         }
         // Plus pol 20x15
         int xp = xb + 20;
         int yp = yb - 15 + t;
-        getdisplay().fillRect(xp, yp, 20, 15, pcolor);
+        epd->fillRect(xp, yp, 20, 15, pcolor);
-        getdisplay().fillRect(xp+t, yp+t, 20-(2*t), 15-(2*t), bcolor);
+        epd->fillRect(xp+t, yp+t, 20-(2*t), 15-(2*t), bcolor);
         // Minus pol 20x15
         int xm = xb + 60;
         int ym = yb -15 + t;
-        getdisplay().fillRect(xm, ym, 20, 15, pcolor);
+        epd->fillRect(xm, ym, 20, 15, pcolor);
-        getdisplay().fillRect(xm+t, ym+t, 20-(2*t), 15-(2*t), bcolor);
+        epd->fillRect(xm+t, ym+t, 20-(2*t), 15-(2*t), bcolor);
 }
 
 // Solar graphic with fill level
@@ -909,17 +944,17 @@ void solarGraphic(uint x, uint y, int pcolor, int bcolor){
         int percent = 0;
         // Solar corpus 100x80
         int level = int((100.0 - percent) * (80-(2*t)) / 100.0);
-        getdisplay().fillRect(xb, yb, 100, 80, pcolor);
+        epd->fillRect(xb, yb, 100, 80, pcolor);
         if(percent < 99){
-            getdisplay().fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
+            epd->fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
         }
         // Draw horizontel lines
-        getdisplay().fillRect(xb, yb+28-t, 100, t, pcolor);
+        epd->fillRect(xb, yb+28-t, 100, t, pcolor);
-        getdisplay().fillRect(xb, yb+54-t, 100, t, pcolor);
+        epd->fillRect(xb, yb+54-t, 100, t, pcolor);
         // Draw vertical lines
-        getdisplay().fillRect(xb+19+t, yb, t, 80, pcolor);
+        epd->fillRect(xb+19+t, yb, t, 80, pcolor);
-        getdisplay().fillRect(xb+39+2*t, yb, t, 80, pcolor);
+        epd->fillRect(xb+39+2*t, yb, t, 80, pcolor);
-        getdisplay().fillRect(xb+59+3*t, yb, t, 80, pcolor);
+        epd->fillRect(xb+59+3*t, yb, t, 80, pcolor);
 
 }
 
@@ -931,13 +966,86 @@ void generatorGraphic(uint x, uint y, int pcolor, int bcolor){
         int t = 4;      // Line thickness
 
         // Generator corpus with radius 45
-        getdisplay().fillCircle(xb, yb, 45, pcolor);
+        epd->fillCircle(xb, yb, 45, pcolor);
-        getdisplay().fillCircle(xb, yb, 41, bcolor);
+        epd->fillCircle(xb, yb, 41, bcolor);
         // Insert G
-        getdisplay().setTextColor(pcolor);
+        epd->setTextColor(pcolor);
-        getdisplay().setFont(&Ubuntu_Bold32pt8b);
+        epd->setFont(&Ubuntu_Bold32pt8b);
-        getdisplay().setCursor(xb-22, yb+20);
+        epd->setCursor(xb-22, yb+20);
-        getdisplay().print("G");
+        epd->print("G");
+}
+
+// Display rudder position as horizontal bargraph with configurable +/- range (degrees)
+void displayRudderPosition(int rudderPosition, uint8_t rangeDeg, uint16_t cx, uint16_t cy, uint16_t fg, uint16_t bg) {
+    const int w = 360;
+    const int h = 20;
+    const int t = 3; // Line thickness
+    const int halfw = w/2;
+    const int halfh = h/2;
+    // Calculate top-left of bar (cx,cy are center of 0°)
+    int left = int(cx) - halfw;
+    int top = int(cy) - halfh;
+
+    // clamp provided range to allowed bounds [10,45]
+    if (rangeDeg < 10) {
+        rangeDeg = 10;
+    } else if (rangeDeg > 45) {
+        rangeDeg = 45;
+    }
+
+    // Pixels per degree for +/-rangeDeg -> total span = 2*rangeDeg
+    const float pxPerDeg = float(w) / (2.0f * float(rangeDeg));
+
+    // Draw outer border (thickness t)
+    for (int i = 0; i < t; i++) {
+        epd->drawRect(left + i, top + i, w - 2 * i, h - 2 * i, fg);
+    }
+
+    // Fill inner area with background
+    epd->fillRect(left + t, top + t, w - 2 * t, h - 2 * t, bg);
+
+    // Draw center line
+    epd->drawRect(cx - 1, top + 1, 3 , h - 2, fg);
+
+    // Clamp rudder position to -rangeDeg..rangeDeg
+    if (rudderPosition > (int)rangeDeg) {
+        rudderPosition = (int)rangeDeg;
+    } else if (rudderPosition < -((int)rangeDeg)) {
+        rudderPosition = -((int)rangeDeg);
+    }
+
+    // Compute fill width in pixels
+    int fillPx = int(round(rudderPosition * pxPerDeg)); // positive -> right
+
+    // Fill area from center to position (if non-zero)
+    int centerx = cx;
+    int innerTop = top + t;
+    int innerH = h - 2 * t;
+    if (fillPx > 0) {
+        // Right side
+        epd->fillRect(centerx, innerTop, fillPx, innerH, fg);
+    } else if (fillPx < 0) {
+        // Left side
+        epd->fillRect(centerx + fillPx, innerTop, -fillPx, innerH, fg);
+    }
+
+    // Draw tick marks every 5° and labels outside the bar
+    epd->setTextColor(fg);
+    epd->setFont(&Ubuntu_Bold8pt8b);
+    for (int angle = -((int)rangeDeg); angle <= (int)rangeDeg; angle += 5) {
+        int xpos = int(round(centerx + angle * pxPerDeg));
+        // Vertical tick inside bar
+        epd->drawLine(xpos, top, xpos, top + h + 2, fg);
+        // Label outside: below the bar
+        String lbl = String(angle);
+        int16_t bx, by;
+        uint16_t bw, bh;
+        epd->getTextBounds(lbl, 0, 0, &bx, &by, &bw, &bh);
+        int16_t tx = xpos - bw/2;
+        int16_t ty = top + h + bh + 5; // A little spacing
+        epd->setCursor(tx, ty);
+        epd->print(lbl);
+    }
 }
 
 // Function to handle HTTP image request
@@ -951,7 +1059,7 @@ void doImageRequest(GwApi *api, int *pageno, const PageStruct pages[MAX_PAGE_NUM
 
     logger->logDebug(GwLog::LOG,"handle image request [%s]: %s", imgformat, filename);
 
-    uint8_t *fb = getdisplay().getBuffer(); // EPD framebuffer
+    uint8_t *fb = epd->getBuffer(); // EPD framebuffer
     std::vector<uint8_t> imageBuffer;       // image in webserver transferbuffer
     String mimetype;
 
@@ -974,37 +1082,11 @@ void doImageRequest(GwApi *api, int *pageno, const PageStruct pages[MAX_PAGE_NUM
         createPBM(fb, &imageBuffer, GxEPD_WIDTH, GxEPD_HEIGHT);
     }
 
-    AsyncWebServerResponse *response = request->beginResponse_P(200, mimetype, (const uint8_t*)imageBuffer.data(), imageBuffer.size());
+    AsyncWebServerResponse *response = request->beginResponse(200, mimetype, (const uint8_t*)imageBuffer.data(), imageBuffer.size());
     response->addHeader("Content-Disposition", "inline; filename=" + filename);
     request->send(response);
 
     imageBuffer.clear();
 }
 
-
-
-// Calculate the distance between two Geo coordinates
-double distanceBetweenCoordinates(double lat1, double lon1, double lat2, double lon2) {
-    // Grad → Radiant
-    double lat1Rad = lat1 * DEG_TO_RAD;
-    double lon1Rad = lon1 * DEG_TO_RAD;
-    double lat2Rad = lat2 * DEG_TO_RAD;
-    double lon2Rad = lon2 * DEG_TO_RAD;
-
-    // Differenzen
-    double dLat = lat2Rad - lat1Rad;
-    double dLon = lon2Rad - lon1Rad;
-
-    // Haversine-Formel
-    double a = sin(dLat / 2.0) * sin(dLat / 2.0) +
-               cos(lat1Rad) * cos(lat2Rad) *
-               sin(dLon / 2.0) * sin(dLon / 2.0);
-
-    double c = 2.0 * atan2(sqrt(a), sqrt(1.0 - a));
-
-    // Abstand in Metern
-    return double(EARTH_RADIUS) * c;
-}
-
-
 #endif

lib/obp60task/OBP60Extensions.h

@@ -1,13 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #ifndef _OBP60EXTENSIONPORT_H
 #define _OBP60EXTENSIONPORT_H
 
 #include <Arduino.h>
 #include "OBP60Hardware.h"
+#include "OBP60Formatter.h"
 #include "LedSpiTask.h"
 #include "Graphics.h"
 #include <GxEPD2_BW.h>                  // E-paper lib V2
 #include <Adafruit_FRAM_I2C.h>          // I2C FRAM
-#include <math.h>
 
 #ifdef BOARD_OBP40S3
 #include "esp_vfs_fat.h"
@@ -31,9 +32,6 @@
 #define FRAM_BAROGRAPH_START 0x0400
 #define FRAM_BAROGRAPH_END 0x13FF
 
-#define PI 3.1415926535897932384626433832795
-#define EARTH_RADIUS 6371000.0
-
 extern Adafruit_FRAM_I2C fram;
 extern bool hasFRAM;
 extern bool hasSDCard;
@@ -41,6 +39,8 @@ extern bool hasSDCard;
 extern sdmmc_card_t *sdcard;
 #endif
 
+extern bool heartbeat;
+
 // Fonts declarations for display (#includes see OBP60Extensions.cpp)
 extern const GFXfont DSEG7Classic_BoldItalic16pt7b;
 extern const GFXfont DSEG7Classic_BoldItalic20pt7b;
@@ -55,24 +55,22 @@ extern const GFXfont Ubuntu_Bold16pt8b;
 extern const GFXfont Ubuntu_Bold20pt8b;
 extern const GFXfont Ubuntu_Bold32pt8b;
 extern const GFXfont Atari16px;
-extern const GFXfont IBM8x8px;
+extern const GFXfont Atari6px;
 
 // Global functions
 #ifdef DISPLAY_GDEW042T2
-GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> & getdisplay();
+typedef GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> gxepd2display;
 #endif
-
 #ifdef DISPLAY_GDEY042T81
-GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> & getdisplay();
+typedef GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> gxepd2display;
 #endif
-
 #ifdef DISPLAY_GYE042A87
-GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> & getdisplay();
+typedef GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> gxepd2display;
 #endif
-
 #ifdef DISPLAY_SE0420NQ04
-GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> & getdisplay();
+typedef GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> gxepd2display;
 #endif
+extern gxepd2display *epd;
 
 // Page display return values
 #define PAGE_OK 0          // all ok, do nothing
@@ -106,7 +104,7 @@ void setBlinkingLED(bool on);                   // Set blinking flash LED active
 void buzzer(uint frequency, uint duration);     // Buzzer function
 void setBuzzerPower(uint power);                // Set buzzer power
 
-String xdrDelete(String input);                 // Delete xdr prefix from string
+String xdrDelete(String input, uint8_t maxlen = 0); // Delete xdr prefix from string and optional limit length
 
 void drawTextCenter(int16_t cx, int16_t cy, String text);
 void drawButtonCenter(int16_t cx, int16_t cy, int8_t sx, int8_t sy, String text, uint16_t fg, uint16_t bg, bool inverted);
@@ -116,7 +114,7 @@ void drawTextBoxed(Rect box, String text, uint16_t fg, uint16_t bg, bool inverte
 void displayTrendHigh(int16_t x, int16_t y, uint16_t size, uint16_t color);
 void displayTrendLow(int16_t x, int16_t y, uint16_t size, uint16_t color);
 
-void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop); // Draw display header
+void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop); // Draw display header
 void displayFooter(CommonData &commonData);
 void displayAlarm(CommonData &commonData);
 
@@ -128,6 +126,10 @@ void solarGraphic(uint x, uint y, int pcolor, int bcolor);                  // S
 void generatorGraphic(uint x, uint y, int pcolor, int bcolor);              // Generator graphic
 void startLedTask(GwApi *api);
 
+// Display rudder position as horizontal bargraph with configurable +/- range (degrees)
+// 'rangeDeg' is unsigned and will be clamped to [10,45]
+void displayRudderPosition(int rudderPosition, uint8_t rangeDeg, uint16_t cx, uint16_t cy, uint16_t fg, uint16_t bg);
+
 void doImageRequest(GwApi *api, int *pageno, const PageStruct pages[MAX_PAGE_NUMBER], AsyncWebServerRequest *request);
 
 // Icons
@@ -164,24 +166,62 @@ static unsigned char fram_bits[] PROGMEM = {
    0xff, 0xff, 0xf8, 0x1f, 0xf8, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x1f,
    0xf8, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x1f };
 
-static unsigned char ap_bits[] PROGMEM = {
+// Header symbols
+
+static unsigned char ap_bits[] PROGMEM= {
    0xe0, 0x03, 0x18, 0x0c, 0x04, 0x10, 0xc2, 0x21, 0x30, 0x06, 0x08, 0x08,
    0xc0, 0x01, 0x20, 0x02, 0x00, 0x00, 0x80, 0x00, 0xc0, 0x01, 0xc0, 0x01,
    0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00 };
 
-static unsigned char dish_bits[] PROGMEM = {
+static unsigned char gps_bits[] PROGMEM = {
    0x3c, 0x00, 0x42, 0x18, 0xfa, 0x1b, 0x02, 0x04, 0x02, 0x0a, 0x02, 0x09,
    0x82, 0x08, 0x06, 0x0a, 0x0e, 0x1b, 0x9c, 0x2b, 0x38, 0x2b, 0x74, 0x20,
    0xec, 0x1f, 0x1c, 0x00, 0xf4, 0x00, 0xfe, 0x03 };
 
+static unsigned char nmea_bits[] PROGMEM = {
+   0x00, 0x00, 0x22, 0x21, 0x26, 0x33, 0x26, 0x33, 0x2a, 0x2d, 0x32, 0x2d,
+   0x32, 0x21, 0x22, 0x21, 0x00, 0x00, 0x3c, 0x0c, 0x04, 0x0c, 0x04, 0x12,
+   0x3c, 0x12, 0x04, 0x1e, 0x04, 0x21, 0x3c, 0x21 };
+
+static unsigned char n2k_bits[] PROGMEM = {
+   0xe0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x02, 0x40, 0x32, 0x4c, 0x31, 0x8c,
+   0x01, 0x80, 0x81, 0x81, 0x81, 0x81, 0x01, 0x80, 0x31, 0x8c, 0x32, 0x4c,
+   0x02, 0x40, 0x04, 0x20, 0x98, 0x19, 0xe0, 0x07 };
+
+static unsigned char tcp_bits[] PROGMEM = {
+   0x00, 0x00, 0xe0, 0x03, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0xe0, 0x03,
+   0x80, 0x00, 0x80, 0x00, 0xff, 0xff, 0x08, 0x10, 0x08, 0x10, 0x3e, 0x7c,
+   0x22, 0x44, 0x22, 0x44, 0x22, 0x44, 0x3e, 0x7c };
+
+static unsigned char usb_bits[] PROGMEM = {
+   0x00, 0x00, 0x92, 0x39, 0x52, 0x4a, 0x52, 0x48, 0x92, 0x39, 0x12, 0x4a,
+   0x52, 0x4a, 0x8c, 0x39, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x04, 0x20,
+   0xf4, 0x2f, 0x04, 0x20, 0xf8, 0x1f, 0x00, 0x00 };
+
+static unsigned char sdcard_bits[] PROGMEM = {
+   0xf8, 0x07, 0x0c, 0x08, 0x04, 0x08, 0xc4, 0x09, 0x24, 0x1a, 0xe4, 0x13,
+   0x04, 0x20, 0x24, 0x21, 0xa4, 0x12, 0x44, 0x12, 0x04, 0x20, 0x04, 0x20,
+   0xc4, 0x23, 0x34, 0x2c, 0xd8, 0x1b, 0x00, 0x00 };
+
+static unsigned char bluetooth_bits[] PROGMEM = {
+   0x00, 0x00, 0x22, 0x21, 0x26, 0x33, 0x26, 0x33, 0x2a, 0x2d, 0x32, 0x2d,
+   0x32, 0x21, 0x22, 0x21, 0x00, 0x00, 0x3c, 0x0c, 0x04, 0x0c, 0x04, 0x12,
+   0x3c, 0x12, 0x04, 0x1e, 0x04, 0x21, 0x3c, 0x21 };
+
 static std::map<String, unsigned char *> iconmap = {
     {"LEFT", left_bits},
     {"RIGHT", right_bits},
     {"LOCK", lock_bits},
     {"PLUS", plus_bits},
     {"MINUS", minus_bits},
-    {"DISH", dish_bits},
+    {"GPS", gps_bits},
-    {"AP", ap_bits}
+    {"AP", ap_bits},
+    {"0183", nmea_bits},
+    {"N2K", n2k_bits},
+    {"TCP", tcp_bits},
+    {"USB", usb_bits},
+    {"SDCARD", sdcard_bits},
+    {"BLUE", bluetooth_bits}
 };
 
 // Battery

lib/obp60task/OBP60Formatter.cpp

@@ -3,115 +3,91 @@
 #include <Arduino.h>
 #include "GwApi.h"
 #include "Pagedata.h"
+#include "OBP60Formatter.h"
 
 // ToDo
 // simulation data
 // hold values by missing data
 
-String formatDate(String fmttype, uint16_t year, uint8_t month, uint8_t day) {
+Formatter::Formatter(GwConfigHandler *config) {
-    char buffer[12];
+    // Load configuration values
-    if (fmttype == "GB") {
+    // TODO do not use strings but enums, see header file
-        snprintf(buffer, 12, "%02d/%02d/%04d", day , month, year);
+    stimeZone = config->getString(config->timeZone);
+    timeZone = stimeZone.toDouble();
+    lengthFormat = config->getString(config->lengthFormat);
+    distanceFormat = config->getString(config->distanceFormat);
+    speedFormat = config->getString(config->speedFormat);
+    windspeedFormat = config->getString(config->windspeedFormat);
+    tempFormat = config->getString(config->tempFormat);
+    dateFormat = config->getString(config->dateFormat);
+    dateFmt = getDateFormat(dateFormat);
+    usesimudata = config->getBool(config->useSimuData);
+    precision = config->getString(config->valueprecision);
+
+    if (precision == "1") {
+        fmt_dec_1 = "%3.1f";
+        fmt_dec_10 = "%3.0f";
+        fmt_dec_100 = "%3.0f";
+    } else {
+        fmt_dec_1 = "%3.2f";
+        fmt_dec_10 = "%3.1f";
+        fmt_dec_100 = "%3.0f";
     }
-    else if (fmttype == "US") {
+
-        snprintf(buffer, 12, "%02d/%02d/%04d", month, day, year);
-    }
-    else if (fmttype == "ISO") {
-        snprintf(buffer, 12, "%04d-%02d-%02d", year, month, day);
-    }
-    else {
-        snprintf(buffer, 12, "%02d.%02d.%04d", day, month, year);
-    }
-    return String(buffer);
 }
 
-String formatTime(char fmttype, uint8_t hour, uint8_t minute, uint8_t second) {
+fmtType Formatter::stringToFormat(const char* formatStr) {
-    // fmttype: s: with seconds, m: only minutes
+    auto it = formatMap.find(formatStr);
-    char buffer[10];
+    if (it != formatMap.end()) {
-    if (fmttype == 'm') {
+        return it->second;
-        snprintf(buffer, 10, "%02d:%02d", hour , minute);
     }
-    else {
+    return fmtType::XDR_G; // generic as default
-        snprintf(buffer, 10, "%02d:%02d:%02d", hour, minute, second);
+}
+
+fmtDate Formatter::getDateFormat(String sformat) {
+    if (sformat == "DE") {
+        return fmtDate::DE;
     }
-    return String(buffer);
+    if (sformat == "GB") {
+        return fmtDate::GB;
+    }
+    if (sformat == "US") {
+        return fmtDate::US;
+    }
+    return fmtDate::ISO; // default
 }
 
-String formatLatitude(double lat) {
+fmtTime Formatter::getTimeFormat(String sformat) {
-    float degree = abs(int(lat));
+    if (sformat == "MMHH") {
-    float minute = abs((lat - int(lat)) * 60);
+        return fmtTime::MMHH;
-    return String(degree, 0) + "\x90 " + String(minute, 4) + "' " + ((lat > 0) ? "N" : "S");
+    }
+    if (sformat == "MMHHSS") {
+        return fmtTime::MMHHSS;
+    }
+    return fmtTime::MMHH; // default
 }
 
-String formatLongitude(double lon) {
+FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &commondata, bool ignoreSimuDataSetting) {
-    float degree = abs(int(lon));
-    float minute = abs((lon - int(lon)) * 60);
-    return String(degree, 0) + "\x90 " + String(minute, 4) + "' " + ((lon > 0) ? "E" : "W");
-}
-
-// Convert and format boat value from SI to user defined format (definition for compatibility purposes)
-FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata) {
-
-    return formatValue(value, commondata, false); // call <formatValue> with standard handling of user setting for simulation data
-}
-
-// Convert and format boat value from SI to user defined format
-// generate random simulation data; can be deselected to use conversion+formatting function even in simulation mode
-FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool ignoreSimuDataSetting){
     GwLog *logger = commondata.logger;
     FormattedData result;
     static int dayoffset = 0;
     double rawvalue = 0;
 
+    bool simulation;
+    if (ignoreSimuDataSetting) {
+        simulation = false; // ignore user setting for simulation data; we want to format the boat value passed to this function
+    } else {
+        simulation = usesimudata; // use setting from configuration
+    }
+
     result.cvalue = value->value;
 
-    // Load configuration values
-    String stimeZone = commondata.config->getString(commondata.config->timeZone);               // [UTC -14.00...+12.00]
-    double timeZone = stimeZone.toDouble();
-    String lengthFormat = commondata.config->getString(commondata.config->lengthFormat);        // [m|ft]
-    String distanceFormat = commondata.config->getString(commondata.config->distanceFormat);    // [m|km|nm]
-    String speedFormat = commondata.config->getString(commondata.config->speedFormat);          // [m/s|km/h|kn]
-    String windspeedFormat = commondata.config->getString(commondata.config->windspeedFormat);  // [m/s|km/h|kn|bft]
-    String tempFormat = commondata.config->getString(commondata.config->tempFormat);            // [K|°C|°F]
-    String dateFormat = commondata.config->getString(commondata.config->dateFormat);            // [DE|GB|US]
-    String precision = commondata.config->getString(commondata.config->valueprecision);         // [1|2]
-
-    bool usesimudata;
-    if (ignoreSimuDataSetting){
-        usesimudata = false; // ignore user setting for simulation data; we want to format the boat value passed to this function
-    } else {
-        usesimudata = commondata.config->getBool(commondata.config->useSimuData);              // [on|off]
-    }
-
     // If boat value not valid
-    if (! value->valid && !usesimudata){
+    if (! value->valid && !simulation){
-        result.svalue = "---";
+        result.svalue = placeholder;
         return result;
     }
 
-    const char* fmt_dec_1;
-    const char* fmt_dec_10;
-    const char* fmt_dec_100;
-    double limit_dec_10;
-    double limit_dec_100;
-    if (precision == "1") {
-	//
-	//All values are displayed using a DSEG7* font. In this font, ' ' is a very short space, and '.' takes up no space at all. 
-	//For a space that is as long as a number, '!' is used. For details see  https://www.keshikan.net/fonts-e.html
-	//
-        fmt_dec_1 = "!%1.1f";  //insert a blank digit and then display a two-digit number
-        fmt_dec_10 = "!%2.0f"; //insert a blank digit and then display a two-digit number
-        fmt_dec_100 = "%3.0f"; //dispay a three digit number
-	limit_dec_10=9.95; // use fmt_dec_1 below this number to avoid formatting 9.96 as 10.0 instead of 10
-	limit_dec_100=99.5; 
-    } else {
-        fmt_dec_1 = "%3.2f";
-        fmt_dec_10 = "%3.1f";
-        fmt_dec_100 = "%3.0f";
-	limit_dec_10=9.995;
-	limit_dec_100=99.95;
-    }
-
 //    LOG_DEBUG(GwLog::DEBUG,"formatValue init: getFormat: %s date->value: %f time->value: %f", value->getFormat(), commondata.date->value, commondata.time->value);
     static const int bsize = 30;
     char buffer[bsize+1];
@@ -131,7 +107,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
         tmElements_t parts;
         time_t tv=tNMEA0183Msg::daysToTime_t(value->value + dayoffset);
         tNMEA0183Msg::breakTime(tv,parts);
-        if (usesimudata == false) { 
+        if (simulation == false) { 
             if (String(dateFormat) == "DE") {
                 snprintf(buffer,bsize, "%02d.%02d.%04d", parts.tm_mday, parts.tm_mon+1, parts.tm_year+1900);
             }
@@ -151,12 +127,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
         else{
             snprintf(buffer, bsize, "01.01.2022"); 
         }
-        if(timeZone == 0){
+        result.unit = ((timeZone == 0) ? "UTC" : "LOT");
-            result.unit = "UTC";
-        }
-        else{
-            result.unit = "LOT";
-        }
     }
     //########################################################
     else if(value->getFormat() == "formatTime"){
@@ -170,7 +141,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
         if (timeInSeconds > 86400) {timeInSeconds = timeInSeconds - 86400;}
         if (timeInSeconds <  0) {timeInSeconds = timeInSeconds + 86400;}
 //        LOG_DEBUG(GwLog::DEBUG,"... formatTime value: %f tz: %f corrected timeInSeconds: %f ", value->value, timeZone, timeInSeconds);
-        if (usesimudata == false) {
+        if (simulation == false) {
             val = modf(timeInSeconds/3600.0, &inthr);
             val = modf(val*3600.0/60.0, &intmin);
             modf(val*60.0,&intsec);
@@ -188,16 +159,11 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             result.cvalue = sec;
             lasttime = millis();
         }
-        if(timeZone == 0){
+        result.unit = ((timeZone == 0) ? "UTC" : "LOT");
-            result.unit = "UTC";
-        }
-        else{
-            result.unit = "LOT";
-        }
     }
     //########################################################
     else if (value->getFormat() == "formatFixed0"){
-        if(usesimudata == false) {
+        if(simulation == false) {
             snprintf(buffer, bsize, "%3.0f", value->value);
             rawvalue = value->value;
         }
@@ -211,7 +177,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatCourse" || value->getFormat() == "formatWind"){
         double course = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             course = value->value;
             rawvalue = value->value;
         }
@@ -219,7 +185,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             course = M_PI_2 + float(random(-17, 17) / 100.0); // create random course/wind values with 90° +/- 10°
             rawvalue = course;
         }
-        course = course * RAD_TO_DEG;      // Unit conversion form rad to deg
+        course = course * 57.2958;      // Unit conversion form rad to deg
 
         // Format 3 numbers with prefix zero
         snprintf(buffer,bsize,"%03.0f",course);
@@ -229,7 +195,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatKnots" && (value->getName() == "SOG" || value->getName() == "STW")){
         double speed = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             speed = value->value;
             rawvalue = value->value;
         }
@@ -249,10 +215,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             speed = speed;              // Unit conversion form m/s to m/s
             result.unit = "m/s";
         }
-        if(speed < limit_dec_10) {
+        if(speed < 10) {
             snprintf(buffer, bsize, fmt_dec_1, speed);
         }
-        else if (speed < limit_dec_100) {
+        else if (speed < 100) {
             snprintf(buffer, bsize, fmt_dec_10, speed);
         }
         else {
@@ -263,7 +229,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatKnots" && (value->getName() == "AWS" || value->getName() == "TWS" || value->getName() == "MaxAws" || value->getName() == "MaxTws")){
         double speed = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             speed = value->value;
             rawvalue = value->value;
         }
@@ -329,10 +295,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             snprintf(buffer, bsize, "%2.0f", speed);
         }
         else{
-            if (speed < limit_dec_10){
+            if (speed < 10){
                 snprintf(buffer, bsize, fmt_dec_1, speed);
             }
-            else if (speed < limit_dec_100){
+            else if (speed < 100){
                 snprintf(buffer, bsize, fmt_dec_10, speed);
             }
             else {
@@ -344,7 +310,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatRot"){
         double rotation = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             rotation = value->value;
             rawvalue = value->value;
         }
@@ -357,13 +323,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
         if (rotation < -100){
             rotation = -99;
         }
-        if (rotation > 100){
+        else if (rotation > 100){
             rotation = 99;
         }
         if (rotation > -10 && rotation < 10){
             snprintf(buffer, bsize, "%3.2f", rotation);
         }
-        if (rotation <= -10 || rotation >= 10){
+        else {
             snprintf(buffer, bsize, "%3.0f", rotation);
         }
         result.cvalue = rotation;
@@ -371,7 +337,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatDop"){
         double dop = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             dop = value->value;
             rawvalue = value->value;
         }
@@ -383,10 +349,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
         if (dop > 99.9){
             dop = 99.9;
         }
-        if (dop < limit_dec_10){
+        if (dop < 10){
             snprintf(buffer, bsize, fmt_dec_1, dop);
         }
-        else if(dop < limit_dec_100){
+        else if(dop < 100){
             snprintf(buffer, bsize, fmt_dec_10, dop);
         }
         else {
@@ -396,19 +362,14 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     }
     //########################################################
     else if (value->getFormat() == "formatLatitude"){
-        if (usesimudata == false) {
+        if (simulation == false) {
             double lat = value->value;
             rawvalue = value->value;
             String latitude = "";
             String latdir = "";
             float degree = abs(int(lat));
             float minute = abs((lat - int(lat)) * 60);
-            if (lat > 0){
+            latdir = (lat > 0) ? "N" : "S";
-                latdir = "N";
-            }
-            else {
-                latdir = "S";
-            }
             latitude = String(degree,0) + "\x90 " + String(minute,4) + "' " + latdir;
             result.unit = "";
             strcpy(buffer, latitude.c_str());
@@ -421,19 +382,14 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     }
     //########################################################
     else if (value->getFormat() == "formatLongitude"){
-        if (usesimudata == false) {
+        if (simulation == false) {
             double lon = value->value;
             rawvalue = value->value;
             String longitude = "";
             String londir = "";
             float degree = abs(int(lon));
             float minute = abs((lon - int(lon)) * 60);
-            if (lon > 0){
+            londir = (lon > 0) ? "E" : "W";
-                londir = "E";
-            }
-            else {
-                londir = "W";
-            }
             longitude = String(degree,0) + "\x90 " + String(minute,4) + "' " + londir;
             result.unit = "";
             strcpy(buffer, longitude.c_str());
@@ -447,7 +403,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatDepth"){
         double depth = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             depth = value->value;
             rawvalue = value->value;
         }
@@ -456,16 +412,16 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             depth = rawvalue;
         }
         if(String(lengthFormat) == "ft"){
-            depth = depth * 3.28084;
+            depth = depth * 3.28084; // TODO use global defined factor
             result.unit = "ft";
         }
         else{
             result.unit = "m";
         }
-        if (depth < limit_dec_10) {
+        if (depth < 10) {
             snprintf(buffer, bsize, fmt_dec_1, depth);
         }
-        else if (depth < limit_dec_100){
+        else if (depth < 100){
             snprintf(buffer, bsize, fmt_dec_10, depth);
         }
         else {
@@ -476,40 +432,36 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXte"){
         double xte = 0;
-        if(usesimudata == false) {
+        if (simulation == false) {
             xte = value->value;
             rawvalue = value->value;
-        }
+        } else {
-        else{
             rawvalue = 6.0 + float(random(0, 4));
             xte = rawvalue;
         }
-        if(String(distanceFormat) == "km"){
+        if (distanceFormat == "km") {
             xte = xte * 0.001;
             result.unit = "km";
-        }
+        } else if (distanceFormat == "nm") {
-        else if(String(distanceFormat) == "nm"){
+            xte = xte * 0.000539957; // TODO use global defined factor
-            xte = xte * 0.000539957;
             result.unit = "nm";
-        }
+        } else {
-        else{;
             result.unit = "m";
         }
-        if(xte < 10){
+        if (xte < 10) {
-            snprintf(buffer,bsize,"%3.2f",xte);
+            snprintf(buffer, bsize, "%3.2f", xte);
-        }
+        } else if (xte < 100) {
-        if(xte >= 10 && xte < 100){
             snprintf(buffer,bsize,"%3.1f",xte);
         }
-        if(xte >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",xte);
+            snprintf(buffer, bsize, "%3.0f", xte);
         }
         result.cvalue = xte;
     }
     //########################################################
     else if (value->getFormat() == "kelvinToC"){
         double temp = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             temp = value->value;
             rawvalue = value->value;
         }
@@ -528,10 +480,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
         else{
             result.unit = "K";
         }
-        if(temp < limit_dec_10) {
+        if (temp < 10) {
             snprintf(buffer, bsize, fmt_dec_1, temp);
         }
-        else if (temp < limit_dec_100) {
+        else if (temp < 100) {
             snprintf(buffer, bsize, fmt_dec_10, temp);
         }
         else {
@@ -542,7 +494,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "mtr2nm"){
         double distance = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             distance = value->value;
             rawvalue = value->value;
         }
@@ -555,16 +507,16 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             result.unit = "km";
         }
         else if (String(distanceFormat) == "nm") {
-            distance = distance * 0.000539957;
+            distance = distance * 0.000539957; // TODO use global defined factor
             result.unit = "nm";
         }
         else {
             result.unit = "m";
         }
-        if (distance < limit_dec_10){
+        if (distance < 10){
             snprintf(buffer, bsize, fmt_dec_1, distance);
         }
-        else if (distance < limit_dec_100){
+        else if (distance < 100){
             snprintf(buffer, bsize, fmt_dec_10, distance);
         }
         else {
@@ -578,7 +530,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
      else if (value->getFormat() == "formatXdr:P:P"){
         double pressure = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             pressure = value->value;
             rawvalue = value->value;
             pressure = pressure / 100.0;        // Unit conversion form Pa to hPa
@@ -594,7 +546,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:P:B"){
         double pressure = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             pressure = value->value;
             rawvalue = value->value;
             pressure = pressure / 100.0;      // Unit conversion form Pa to mBar
@@ -610,7 +562,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:U:V"){
         double voltage = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             voltage = value->value;
             rawvalue = value->value;
         }
@@ -618,7 +570,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             rawvalue = 12 + float(random(0, 30)) / 10.0;
             voltage = rawvalue;
         }
-        if (voltage < limit_dec_10) {
+        if (voltage < 10) {
             snprintf(buffer, bsize, fmt_dec_1, voltage);
         }
         else {
@@ -630,7 +582,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:I:A"){
         double current = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             current = value->value;
             rawvalue = value->value;
         }
@@ -638,10 +590,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             rawvalue = 8.2 + float(random(0, 50)) / 10.0;
             current = rawvalue;
         }
-        if (current < limit_dec_10) {
+        if (current < 10) {
             snprintf(buffer, bsize, fmt_dec_1, current);
         }
-        else if(current < limit_dec_100) {
+        else if(current < 100) {
             snprintf(buffer, bsize, fmt_dec_10, current);
         }
         else {
@@ -653,7 +605,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:C:K"){
         double temperature = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             temperature = value->value - 273.15;    // Convert K to C
             rawvalue = value->value - 273.15;
         }
@@ -661,10 +613,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             rawvalue = 21.8 + float(random(0, 50)) / 10.0;
             temperature = rawvalue;
         }
-        if (temperature < limit_dec_10) {
+        if (temperature < 10) {
             snprintf(buffer, bsize, fmt_dec_1, temperature);
         }
-        else if (temperature < limit_dec_100) {
+        else if (temperature < 100) {
             snprintf(buffer, bsize, fmt_dec_10, temperature);
         }
         else {
@@ -676,7 +628,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:C:C"){
         double temperature = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             temperature = value->value;    // Value in C
             rawvalue = value->value;
         }
@@ -684,10 +636,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             rawvalue = 21.8 + float(random(0, 50)) / 10.0;
             temperature = rawvalue;
         }
-        if (temperature < limit_dec_10) {
+        if (temperature < 10) {
             snprintf(buffer, bsize, fmt_dec_1, temperature);
         }
-        else if(temperature < limit_dec_100) {
+        else if(temperature < 100) {
             snprintf(buffer, bsize, fmt_dec_10, temperature);
         }
         else {
@@ -699,7 +651,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:H:P"){
         double humidity = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             humidity = value->value;    // Value in %
             rawvalue = value->value;
         }
@@ -707,10 +659,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             rawvalue = 41.3 + float(random(0, 50)) / 10.0;
             humidity = rawvalue;
         }
-        if (humidity < limit_dec_10) {
+        if (humidity < 10) {
             snprintf(buffer, bsize, fmt_dec_1, humidity);
         }
-        else if(humidity < limit_dec_100) {
+        else if(humidity < 100) {
             snprintf(buffer, bsize, fmt_dec_10, humidity);
         }
         else {
@@ -722,7 +674,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:V:P"){
         double volume = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             volume = value->value;    // Value in %
             rawvalue = value->value;
         }
@@ -730,13 +682,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             rawvalue = 85.8 + float(random(0, 50)) / 10.0;
             volume = rawvalue;
         }
-        if (volume < limit_dec_10) {
+        if (volume < 10) {
             snprintf(buffer, bsize, fmt_dec_1, volume);
         }
-        else if (volume < limit_dec_100) {
+        else if (volume < 100) {
             snprintf(buffer, bsize, fmt_dec_10, volume);
         }
-        else if (volume >= limit_dec_100) {
+        else if (volume >= 100) {
             snprintf(buffer, bsize, fmt_dec_100, volume);
         }
         result.unit = "%";
@@ -745,7 +697,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:V:M"){
         double volume = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             volume = value->value;    // Value in l
             rawvalue = value->value;
         }
@@ -753,10 +705,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             rawvalue = 75.2 + float(random(0, 50)) / 10.0;
             volume = rawvalue;
         }
-        if (volume < limit_dec_10) {
+        if (volume < 10) {
             snprintf(buffer, bsize, fmt_dec_1, volume);
         }
-        else if (volume < limit_dec_100) {
+        else if (volume < 100) {
             snprintf(buffer, bsize, fmt_dec_10, volume);
         }
         else {
@@ -768,7 +720,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:R:I"){
         double flow = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             flow = value->value;    // Value in l/min
             rawvalue = value->value;
         }
@@ -776,10 +728,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             rawvalue = 7.5 + float(random(0, 20)) / 10.0;
             flow = rawvalue;
         }
-        if (flow < limit_dec_10) {
+        if (flow < 10) {
             snprintf(buffer, bsize, fmt_dec_1, flow);
         }
-        else if (flow < limit_dec_100) {
+        else if (flow < 100) {
             snprintf(buffer, bsize, fmt_dec_10, flow);
         }
         else {
@@ -791,7 +743,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:G:"){
         double generic = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             generic = value->value;
             rawvalue = value->value;
         }
@@ -799,10 +751,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             rawvalue = 18.5 + float(random(0, 20)) / 10.0;
             generic = rawvalue;
         }
-        if (generic < limit_dec_10) {
+        if (generic < 10) {
             snprintf(buffer, bsize, fmt_dec_1, generic);
         }
-        else if (generic < limit_dec_100) {
+        else if (generic < 100) {
             snprintf(buffer, bsize, fmt_dec_10, generic);
         }
         else {
@@ -814,7 +766,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:A:P"){
         double dplace = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             dplace = value->value;    // Value in %
             rawvalue = value->value;
         }
@@ -822,10 +774,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             rawvalue = 55.3 + float(random(0, 20)) / 10.0;
             dplace = rawvalue;
         }
-        if (dplace < limit_dec_10) {
+        if (dplace < 10) {
             snprintf(buffer, bsize, fmt_dec_1, dplace);
         }
-        else if (dplace < limit_dec_100) {
+        else if (dplace < 100) {
             snprintf(buffer, bsize, fmt_dec_10, dplace);
         }
         else {
@@ -835,9 +787,9 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
         result.cvalue = dplace;
     }
     //########################################################
-    else if (value->getFormat() == "formatXdr:A:D"){
+    else if ((value->getFormat() == "formatXdr:A:D") || ((value->getFormat() == "formatXdr:A:rd"))){
         double angle = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             angle = value->value;
             angle = angle * 57.2958;      // Unit conversion form rad to deg
             rawvalue = value->value;
@@ -858,7 +810,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     //########################################################
     else if (value->getFormat() == "formatXdr:T:R"){
         double rpm = 0;
-        if (usesimudata == false) {
+        if (simulation == false) {
             rpm = value->value;    // Value in rpm
             rawvalue = value->value;
         }
@@ -866,10 +818,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
             rawvalue = 2505 + random(0, 20);
             rpm = rawvalue;
         }
-        if (rpm < limit_dec_10) {
+        if (rpm < 10) {
             snprintf(buffer, bsize, fmt_dec_1, rpm);
         }
-        else if (rpm < limit_dec_100) {
+        else if (rpm < 100) {
             snprintf(buffer, bsize, fmt_dec_10, rpm);
         }
         else {
@@ -882,10 +834,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     // Default format
     //########################################################
     else {
-        if (value->value < limit_dec_10) {
+        if (value->value < 10) {
             snprintf(buffer, bsize, fmt_dec_1, value->value);
         }
-        else if (value->value < limit_dec_100) {
+        else if (value->value < 100) {
             snprintf(buffer, bsize, fmt_dec_10, value->value);
         }
         else {
@@ -900,8 +852,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool
     return result;
 }
 
+// Convert and format boat value from SI to user defined format (definition for compatibility purposes)
+FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &commondata) {
+    return formatValue(value, commondata, false); // call <formatValue> with standard handling of user setting for simulation data
+}
+
 // Helper method for conversion of any data value from SI to user defined format
-double convertValue(const double &value, const String &name, const String &format, CommonData &commondata)
+double Formatter::convertValue(const double &value, const String &name, const String &format, CommonData &commondata)
 {
     std::unique_ptr<GwApi::BoatValue> tmpBValue; // Temp variable to get converted data value from <OBP60Formatter::formatValue>
     double result; // data value converted to user defined target data format
@@ -918,7 +875,7 @@ double convertValue(const double &value, const String &name, const String &forma
 }
 
 // Helper method for conversion of any data value from SI to user defined format
-double convertValue(const double &value, const String &format, CommonData &commondata)
+double Formatter::convertValue(const double &value, const String &format, CommonData &commondata)
 {
     double result; // data value converted to user defined target data format
 
@@ -926,4 +883,49 @@ double convertValue(const double &value, const String &format, CommonData &commo
     return result;
 }
 
+String formatDate(fmtDate fmttype, uint16_t year, uint8_t month, uint8_t day) {
+    char buffer[12];
+    if (fmttype == fmtDate::GB) {
+        snprintf(buffer, 12, "%02d/%02d/%04d", day , month, year);
+    }
+    else if (fmttype == fmtDate::US) {
+        snprintf(buffer, 12, "%02d/%02d/%04d", month, day, year);
+    }
+    else if (fmttype == fmtDate::ISO) {
+        snprintf(buffer, 12, "%04d-%02d-%02d", year, month, day);
+    }
+    else if (fmttype == fmtDate::DE) {
+        snprintf(buffer, 12, "%02d.%02d.%04d", day, month, year);
+    } else {
+        snprintf(buffer, 12, "%04d-%02d-%02d", year, month, day);
+    }
+    return String(buffer);
+}
+
+String formatTime(fmtTime fmttype, uint8_t hour, uint8_t minute, uint8_t second) {
+    char buffer[10];
+    if (fmttype == fmtTime::MMHH) {
+        snprintf(buffer, 10, "%02d:%02d", hour , minute);
+    }
+    else if (fmttype == fmtTime::MMHHSS) {
+        snprintf(buffer, 10, "%02d:%02d:%02d", hour, minute, second);
+    }
+    else {
+        snprintf(buffer, 10, "%02d%02d%02d", hour, minute, second);
+    }
+    return String(buffer);
+}
+
+String formatLatitude(double lat) {
+    float degree = abs(int(lat));
+    float minute = abs((lat - int(lat)) * 60);
+    return String(degree, 0) + "\x90 " + String(minute, 4) + "' " + ((lat > 0) ? "N" : "S");
+}
+
+String formatLongitude(double lon) {
+    float degree = abs(int(lon));
+    float minute = abs((lon - int(lon)) * 60);
+    return String(degree, 0) + "\x90 " + String(minute, 4) + "' " + ((lon > 0) ? "E" : "W");
+}
+
 #endif

lib/obp60task/OBP60Formatter.h

@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#ifndef _OBP60FORMATTER_H
+#define _OBP60FORMATTER_H
+
+#include "GwApi.h"
+#include "Pagedata.h"
+#include <unordered_map>
+
+/*
+
+XDR types
+    A 	Angular displacement
+    C 	Temperature
+    D 	Linear displacement
+    F 	Frequency
+    G   Generic
+    H 	Humidity
+    I   Current
+    L   Salinity
+    N 	Force
+    P 	Pressure
+    R 	Flow
+    S   Switch or valve
+    T   Tachometer
+    U   Voltage
+    V   Volume
+
+XDR units
+    A   Ampere 
+    B 	Bar
+    C 	Celsius
+    D 	Degrees
+    H   Hertz
+    I   Liter per second?
+    M 	Meter / Cubic meter
+    N 	Newton
+    P 	Percent
+    R   RPM
+    V   Volt
+ 
+ */
+
+enum class fmtType {
+    // Formatter names as defined in BoatItemBase
+    COURSE,
+    KNOTS,
+    WIND,
+    LATITUDE,
+    LONGITUDE,
+    XTE,
+    FIXED0,
+    DEPTH,
+    DOP,       // dilution of precision
+    ROT,
+    DATE,
+    TIME,
+    NAME,
+
+    kelvinToC, // TODO not a format but conversion
+    mtr2nm,    // TODO not a format but conversion
+
+    // XDR Formatter names
+    XDR_PP,     // pressure percent
+    XDR_PB,     // pressure bar
+    XDR_UV,     // voltage volt
+    XDR_IA,     // current ampere
+    XDR_CK,     // temperature kelvin
+    XDR_CC,     // temperature celsius
+    XDR_HP,     // humidity percent
+    XDR_VP,     // volume percent
+    XDR_VM,     // volume cubic meters
+    XDR_RI,     // flow liter per second?
+    XDR_G,      // generic
+    XDR_AP,     // angle percent
+    XDR_AD,     // angle degrees
+    XDR_TR      // tachometer rpm
+};
+
+// Hint: String is not supported
+static std::unordered_map<const char*, fmtType> formatMap PROGMEM = {
+    {"formatCourse", fmtType::COURSE},
+    {"formatKnots", fmtType::KNOTS},
+    {"formatWind", fmtType::WIND},
+    {"formatLatitude", fmtType::LATITUDE},
+    {"formatLongitude", fmtType::LONGITUDE},
+    {"formatXte", fmtType::XTE},
+    {"formatFixed0", fmtType::FIXED0},
+    {"formatDepth", fmtType::DEPTH},
+    {"formatDop", fmtType::DOP},
+    {"formatRot", fmtType::ROT},
+    {"formatDate", fmtType::DATE},
+    {"formatTime", fmtType::TIME},
+    {"formatName", fmtType::NAME},
+    {"kelvinToC", fmtType::kelvinToC},
+    {"mtr2nm", fmtType::mtr2nm},
+    {"formatXdr:P:P", fmtType::XDR_PP},
+    {"formatXdr:P:B", fmtType::XDR_PB},
+    {"formatXdr:U:V", fmtType::XDR_UV},
+    {"formatXdr:I:A", fmtType::XDR_IA},
+    {"formatXdr:C:K", fmtType::XDR_CK},
+    {"formatXdr:C:C", fmtType::XDR_CC},
+    {"formatXdr:H:P", fmtType::XDR_HP},
+    {"formatXdr:V:P", fmtType::XDR_VP},
+    {"formatXdr:V:M", fmtType::XDR_VM},
+    {"formatXdr:R:I", fmtType::XDR_RI},
+    {"formatXdr:G:", fmtType::XDR_G},
+    {"formatXdr:A:P", fmtType::XDR_AP},
+    {"formatXdr:A:D", fmtType::XDR_AD},
+    {"formatXdr:T:R", fmtType::XDR_TR}
+};
+
+// Possible formats as scoped enums
+enum class fmtDate {DE, GB, US, ISO};
+enum class fmtTime {MMHH, MMHHSS};
+enum class fmtLength {METER, FEET, FATHOM, CABLE};
+enum class fmtDepth {METER, FEET, FATHOM};
+enum class fmtWind {KMH, MS, KN, BFT};
+enum class fmtCourse {DEG, RAD};
+enum class fmtRot {DEGS, RADS};
+enum class fmtXte {M, KM, NM, CABLE};
+enum class fmtPress {PA, BAR};
+enum class fmtTemp {KELVIN, CELSUIS, FAHRENHEIT};
+
+// Conversion factors
+#define CONV_M_FT 3.2808399 // meter too feet
+#define CONV_M_FM 0.5468    // meter to fathom
+#define CONV_M_CBL 0.0053961182483768 // meter to cable
+#define CONV_CBL_FT 608    // cable to feet
+#define CONV_FM_FT 6       // fathom to feet
+
+// Structure for formatted boat values
+typedef struct {
+    double value;  // SI value of boat data value
+    double cvalue; // value converted to target unit
+    String svalue; // value converted to target unit and formatted
+    String unit;   // target value unit
+} FormattedData;
+
+// Formatter for boat values
+class Formatter {
+private:
+    String stimeZone = "0";
+    double timeZone = 0.0;         // [UTC -14.00...+12.00]
+    String lengthFormat = "m";     // [m|ft]
+    String distanceFormat = "nm";  // [m|km|nm]
+    String speedFormat = "kn";     // [m/s|km/h|kn]
+    String windspeedFormat = "kn"; // [m/s|km/h|kn|bft]
+    String tempFormat = "C";       // [K|°C|°F]
+    String dateFormat = "ISO";     // [DE|GB|US|ISO]
+    fmtDate dateFmt;
+    bool usesimudata = false;      // [on|off]
+
+    String precision = "2";        // [1|2]
+    const char* fmt_dec_1;
+    const char* fmt_dec_10;
+    const char* fmt_dec_100;
+
+public:
+    Formatter(GwConfigHandler *config);
+    fmtType stringToFormat(const char* formatStr);
+    fmtDate getDateFormat(String sformat);
+    fmtTime getTimeFormat(String sformat);
+    FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool ignoreSimuDataSetting);
+    FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata);
+    double convertValue(const double &value, const String &name, const String &format, CommonData &commondata);
+    double convertValue(const double &value, const String &format, CommonData &commondata);
+    String placeholder = "---";
+};
+
+// Standard format functions without class and overhead
+String formatDate(fmtDate fmttype, uint16_t year, uint8_t month, uint8_t day);
+String formatTime(fmtTime fmttype, uint8_t hour, uint8_t minute, uint8_t second);
+String formatLatitude(double lat);
+String formatLongitude(double lon);
+
+#endif

lib/obp60task/OBP60Hardware.h

@@ -1,11 +1,11 @@
     // General hardware definitions
     // CAN and RS485 bus pin definitions see obp60task.h
 
-#ifdef HARDWARE_V21
+#if defined HARDWARE_V20 || HARDWARE_V21
     // Direction pin for RS485 NMEA0183
     #define OBP_DIRECTION_PIN 18
     // I2C
-    #define I2C_SPEED 10000UL       // 100kHz clock speed on I2C bus
+    #define I2C_SPEED 10000UL       // 10kHz clock speed on I2C bus
     #define I2C_SPEED_LOW 1000UL    // 10kHz clock speed on I2C bus for external bus
     #define OBP_I2C_SDA 47
     #define OBP_I2C_SCL 21
@@ -43,8 +43,6 @@
     #define OBP_SPI_DIN 48
     #define SHOW_TIME 6000        // Show time in [ms] for logo and WiFi QR code
     #define FULL_REFRESH_TIME 600 // Refresh cycle time in [s][600...3600] for full display update (very important healcy function)
-    #define GxEPD_WIDTH 400       // Display width
-    #define GxEPD_HEIGHT 300      // Display height
 
     // GPS (NEO-6M, NEO-M8N, ATGM336H)
     #define OBP_GPS_RX 2
@@ -123,8 +121,6 @@
     #define OBP_SPI_DIN 11
     #define SHOW_TIME 6000        // Show time in [ms] for logo and WiFi QR code
     #define FULL_REFRESH_TIME 600 // Refresh cycle time in [s][600...3600] for full display update (very important healcy function)
-    #define GxEPD_WIDTH 400       // Display width
-    #define GxEPD_HEIGHT 300      // Display height
     // SPI SD-Card
     #define SD_SPI_CS GPIO_NUM_10
     #define SD_SPI_MOSI GPIO_NUM_40

lib/obp60task/OBP60QRWiFi.h

@@ -26,20 +26,20 @@ void qrWiFi(String ssid, String passwd, uint16_t fgcolor, uint16_t bgcolor){
     // Each horizontal module
     for (uint8_t x = 0; x < qrcode.size; x++) {
       if(qrcode_getModule(&qrcode, x, y)){
-        getdisplay().fillRect(box_x, box_y, box_s, box_s, fgcolor);
+        epd->fillRect(box_x, box_y, box_s, box_s, fgcolor);
       } else {
-        getdisplay().fillRect(box_x, box_y, box_s, box_s, bgcolor);
+        epd->fillRect(box_x, box_y, box_s, box_s, bgcolor);
       }
       box_x = box_x + box_s;
     }
     box_y = box_y + box_s;
     box_x = init_x;
   }
-  getdisplay().setFont(&Ubuntu_Bold32pt8b);
+  epd->setFont(&Ubuntu_Bold32pt8b);
-  getdisplay().setTextColor(fgcolor);
+  epd->setTextColor(fgcolor);
-  getdisplay().setCursor(140, 285);
+  epd->setCursor(140, 285);
-  getdisplay().print("WiFi");
+  epd->print("WiFi");
-  getdisplay().nextPage();                 // Full Refresh
+  epd->nextPage();                 // Full Refresh
 }
 
 #endif

lib/obp60task/OBPDataOperations.cpp

@@ -1,3 +1,4 @@
+#include "OBP60Formatter.h"
 #include "OBPDataOperations.h"
 //#include "BoatDataCalibration.h" // Functions lib for data instance calibration
 
@@ -135,7 +136,7 @@ bool CalibrationData::calibrateInstance(GwApi::BoatValue* boatDataValue)
     double dataValue = 0;
     std::string format = "";
 
-    // we test this earlier, but for safety reason ...
+    // we test this earlier, but for safety reasons ...
     if (calibrationMap.find(instance) == calibrationMap.end()) {
         LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s not in calibration list", instance.c_str());
         return false;
@@ -151,7 +152,7 @@ bool CalibrationData::calibrateInstance(GwApi::BoatValue* boatDataValue)
     slope = calibrationMap[instance].slope;
     dataValue = boatDataValue->value;
     format = boatDataValue->getFormat().c_str();
-    LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: value: %f, format: %s", instance.c_str(), dataValue, format.c_str());
+    // LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: value: %f, format: %s", instance.c_str(), dataValue, format.c_str());
 
     if (format == "formatWind") { // instance is of type angle
         dataValue = (dataValue * slope) + offset;
@@ -174,7 +175,7 @@ bool CalibrationData::calibrateInstance(GwApi::BoatValue* boatDataValue)
     calibrationMap[instance].value = dataValue; // store the calibrated value in the list
     calibrationMap[instance].isCalibrated = true;
 
-    LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: Offset: %f, Slope: %f, Result: %f", instance.c_str(), offset, slope, calibrationMap[instance].value);
+    // LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: Offset: %f, Slope: %f, Result: %f", instance.c_str(), offset, slope, calibrationMap[instance].value);
     return true;
 }
 
@@ -189,7 +190,7 @@ bool CalibrationData::smoothInstance(GwApi::BoatValue* boatDataValue)
 
     // we test this earlier, but for safety reason ...
     if (calibrationMap.find(instance) == calibrationMap.end()) {
-        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s not in calibration list", instance.c_str());
+        // LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s not in calibration list", instance.c_str());
         return false;
     }
 
@@ -211,7 +212,7 @@ bool CalibrationData::smoothInstance(GwApi::BoatValue* boatDataValue)
     calibrationMap[instance].value = dataValue; // store the smoothed value in the list
     calibrationMap[instance].isCalibrated = true;
 
-    LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: smooth: %f, oldValue: %f, result: %f", instance.c_str(), smoothFactor, oldValue, calibrationMap[instance].value);
+    // LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: smooth: %f, oldValue: %f, result: %f", instance.c_str(), smoothFactor, oldValue, calibrationMap[instance].value);
 
     return true;
 }
@@ -241,7 +242,7 @@ void HstryBuf::add(double value)
 {
     if (value >= hstryMin && value <= hstryMax) {
         hstryBuf.add(value);
-        LOG_DEBUG(GwLog::DEBUG, "HstryBuf::add:  name: %s, value: %.3f", hstryBuf.getName(), value);
+        // LOG_DEBUG(GwLog::DEBUG, "HstryBuf::add:  name: %s, value: %.3f", hstryBuf.getName(), value);
     }
 }
 
@@ -264,7 +265,7 @@ void HstryBuf::handle(bool useSimuData, CommonData& common)
         add(boatValue->value);
 
     } else if (useSimuData) { // add simulated value to history buffer
-        double simSIValue = formatValue(tmpBVal.get(), common).value; // simulated value is generated at <formatValue>; here: retreive SI value
+        double simSIValue = common.fmt->formatValue(tmpBVal.get(), common).value; // simulated value is generated at <formatValue>; here: retreive SI value
         add(simSIValue);
     } else {
         // here we will add invalid (DBL_MAX) value; this will mark periods of missing data in buffer together with a timestamp
@@ -405,7 +406,7 @@ void WindUtils::calcTwdSA(const double* AWA, const double* AWS,
     double stw = -*STW;
     addPolar(AWD, AWS, CTW, &stw, TWD, TWS);
 
-    // Normalize TWD and TWA to 0-360°/2PI
+    // Normalize TWD to [0..360°] (2PI) and TWA to [-180..180] (PI)
     *TWD = to2PI(*TWD);
     *TWA = toPI(*TWD - *HDT);
 }
@@ -487,8 +488,8 @@ bool WindUtils::addWinds()
     double hdtVal = hdtBVal->valid ? hdtBVal->value : DBL_MAX;
     double hdmVal = hdmBVal->valid ? hdmBVal->value : DBL_MAX;
     double varVal = varBVal->valid ? varBVal->value : DBL_MAX;
-    LOG_DEBUG(GwLog::DEBUG, "WindUtils:addWinds: AWA %.1f, AWS %.1f, COG %.1f, STW %.1f, SOG %.2f, HDT %.1f, HDM %.1f, VAR %.1f", awaBVal->value * RAD_TO_DEG, awsBVal->value * 3.6 / 1.852,
+    //LOG_DEBUG(GwLog::DEBUG, "WindUtils:addWinds: AWA %.1f, AWS %.1f, COG %.1f, STW %.1f, SOG %.2f, HDT %.1f, HDM %.1f, VAR %.1f", awaBVal->value * RAD_TO_DEG, awsBVal->value * 3.6 / 1.852,
-        cogBVal->value * RAD_TO_DEG, stwBVal->value * 3.6 / 1.852, sogBVal->value * 3.6 / 1.852, hdtBVal->value * RAD_TO_DEG, hdmBVal->value * RAD_TO_DEG, varBVal->value * RAD_TO_DEG);
+    //     cogBVal->value * RAD_TO_DEG, stwBVal->value * 3.6 / 1.852, sogBVal->value * 3.6 / 1.852, hdtBVal->value * RAD_TO_DEG, hdmBVal->value * RAD_TO_DEG, varBVal->value * RAD_TO_DEG);
 
     // Check if TWD can be calculated from TWA and HDT/HDM
     if (twaBVal->valid) {
@@ -528,9 +529,9 @@ bool WindUtils::addWinds()
             }
         }
     }
-    LOG_DEBUG(GwLog::DEBUG, "WindUtils:addWinds: twCalculated %d, TWD %.1f, TWA %.1f, TWS %.2f kn, AWD: %.1f", twCalculated, twdBVal->value * RAD_TO_DEG,
+    // LOG_DEBUG(GwLog::DEBUG, "WindUtils:addWinds: twCalculated %d, TWD %.1f, TWA %.1f, TWS %.2f kn, AWD: %.1f", twCalculated, twdBVal->value * RAD_TO_DEG,
-        twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852, awdBVal->value * RAD_TO_DEG);
+    //     twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852, awdBVal->value * RAD_TO_DEG);
 
     return twCalculated;
 }
-// --- End Class WindUtils --------------
+// --- End Class WindUtils --------------

lib/obp60task/OBPKeyboardTask.cpp

@@ -1,9 +1,10 @@
-#ifndef _OBP60FUNCTIONS_H
+// SPDX-License-Identifier: GPL-2.0-or-later
-#define _OBP60FUNCTIONS_H
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
-
 #include <Arduino.h>
 #include "OBP60Hardware.h"
-  
+#include "OBP60Extensions.h" // for buzzer
+#include "OBPKeyboardTask.h"
+
 // Global vars
 
 // Touch keypad over ESP32 touch sensor inputs  
@@ -58,10 +59,10 @@ void initKeys(CommonData &commonData) {
     commonData.keydata[5].h = height;
 }
 
-  #ifdef HARDWARE_V21
+#ifdef HARDWARE_V21
-  // Keypad functions for original OBP60 hardware
+// Keypad functions for original OBP60 hardware
-  int readKeypad(GwLog* logger, uint thSensitivity, bool use_syspage) {
+int readKeypad(GwLog* logger, uint thSensitivity) {
-    
+
     // Touch sensor values
     // 35000 - Not touched
     // 50000 - Light toched with fingertip
@@ -233,35 +234,35 @@ void initKeys(CommonData &commonData) {
     keycodeold2 = keycode2;
 
     return keystatus;
-  }
+}
-  #endif
+#endif
 
-  #ifdef BOARD_OBP40S3
+#ifdef BOARD_OBP40S3
-  int readSensorpads(){
+int readSensorpads(){
-      // Read key code
+    // Read key code
-      if(digitalRead(UP) == LOW){
+    if (digitalRead(UP) == LOW) {
         keycode = 10; // Left swipe
-      }
-      else if(digitalRead(DOWN) == LOW){
-        keycode = 9;  // Right swipe
-      }
-      else if(digitalRead(CONF) == LOW){
-        keycode = 3;  // Key 3
-      }
-      else if(digitalRead(MENUE) == LOW){
-        keycode = 1;  // Key 1
-      }
-      else if(digitalRead(EXIT) == LOW){
-        keycode = 2;  // Key 2
-      }
-      else{
-        keycode = 0;  // No key activ
-      }
-      return keycode;
     }
+    else if (digitalRead(DOWN) == LOW) {
+        keycode = 9;  // Right swipe
+    }
+    else if (digitalRead(CONF) == LOW) {
+        keycode = 3;  // Key 3
+    }
+    else if (digitalRead(MENUE) == LOW) {
+        keycode = 1;  // Key 1
+    }
+    else if (digitalRead(EXIT) == LOW) {
+        keycode = 2;  // Key 2
+    }
+    else {
+        keycode = 0;  // No key activ
+    }
+    return keycode;
+}
 
-  // Keypad functions for OBP60 clone (thSensitivity is inactiv)
+// Keypad functions for OBP60 clone (thSensitivity is inactiv)
-  int readKeypad(GwLog* logger, uint thSensitivity, bool use_syspage) {
+int readKeypad(GwLog* logger, uint thSensitivity, bool use_syspage) {
     pinMode(UP, INPUT);
     pinMode(DOWN, INPUT);
     pinMode(CONF, INPUT);
@@ -273,31 +274,68 @@ void initKeys(CommonData &commonData) {
 
     // Detect key
     if (keycode > 0 ){
-      if(keycode != keycodeold){
+        if(keycode != keycodeold){
-        starttime = millis();   // Start key pressed
+            starttime = millis();   // Start key pressed
-        keycodeold = keycode;
+            keycodeold = keycode;
-      }
+        }
-      // If key pressed longer than 100ms
+        // If key pressed longer than 100ms
-      if(millis() > starttime + 100 && keycode == keycodeold) {
+        if(millis() > starttime + 100 && keycode == keycodeold) {
-        if (use_syspage and keycode == 3) {
+            if (use_syspage and keycode == 3) {
-            keystatus = 12;
+                keystatus = 12;
-        } else {
+            } else {
-            keystatus = keycode;
+                keystatus = keycode;
+            }
+            // Copy keycode
+            keycodeold = keycode;
+            // 100% Task-CPU RLY?
+            while(readSensorpads() > 0){} // Wait for pad release
+            delay(keydelay);
         }
-        // Copy keycode
-        keycodeold = keycode;
-        while(readSensorpads() > 0){} // Wait for pad release
-        delay(keydelay);
-      }
     }
-    else{
+    else {
-      keycode = 0;
+        keycode = 0;
-      keycodeold = 0;
+        keycodeold = 0;
-      keystatus = 0;
+        keystatus = 0;
     }
 
     return keystatus;
-  }
+}
-  #endif
+#endif
+
+void keyboardTask(void *param) {
+
+   // params needed: 
+   //   queue
+   //   logger
+   //   sensitivity
+   //   use_syspage  for deep sleep activation
+
+    KbTaskData *data = (KbTaskData *)param;
+
+    int keycode = 0;
+    data->logger->logDebug(GwLog::LOG, "Start keyboard task");
+
+    while (true) {
+#ifdef BOARD_OBP40S3
+        keycode = readKeypad(data->logger, data->sensitivity, data->use_syspage);
+#else
+        keycode = readKeypad(data->logger, data->sensitivity);
+#endif
+        //send a key event
+        if (keycode != 0) {
+            xQueueSend(data->queue, &keycode, 0);
+            data->logger->logDebug(GwLog::LOG,"kbtask: send keycode: %d", keycode);
+        }
+        delay(20);      // 50Hz update rate (20ms)
+    }
+    vTaskDelete(NULL);
+}
+
+void createKeyboardTask(KbTaskData *param) {
+    TaskHandle_t xHandle = NULL;
+    if (xTaskCreate(keyboardTask, "keyboard", configMINIMAL_STACK_SIZE + 1024, param, configMAX_PRIORITIES-1, &xHandle) != pdPASS) {
+        param->logger->logDebug(GwLog::ERROR, "Failed to create keyboard task!");
+    };
+}
 
 #endif

lib/obp60task/OBPKeyboardTask.h

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#include "GwLog.h"
+#include "Pagedata.h"
+
+typedef struct {
+    QueueHandle_t queue;
+    GwLog* logger = nullptr;
+    uint sensitivity = 100;
+#ifdef BOARD_OBP40S3
+    bool use_syspage = true;
+#endif
+} KbTaskData;
+
+void initKeys(CommonData &commonData);
+void createKeyboardTask(KbTaskData *param);

lib/obp60task/OBPSensorTask.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include <Adafruit_Sensor.h>            // Adafruit Lib for sensors
 #include <Adafruit_BME280.h>            // Adafruit Lib for BME280
@@ -90,16 +91,16 @@ void sensorTask(void *param){
     double voffset = (api->getConfig()->getConfigItem(api->getConfig()->vOffset,true)->asString()).toFloat();
     double vslope = (api->getConfig()->getConfigItem(api->getConfig()->vSlope,true)->asString()).toFloat();
     if(String(powsensor1) == "off"){
-        #ifdef VOLTAGE_SENSOR
+#ifdef VOLTAGE_SENSOR
         float rawVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.53) * 2;   // Vin = 1/2 for OBP40
-        #else
+#else
         float rawVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20;   // Vin = 1/20 for OBP60    
-        #endif
+#endif
         sensors.batteryVoltage = rawVoltage * vslope + voffset; // Calibration
-        #ifdef LIPO_ACCU_1200
+#ifdef LIPO_ACCU_1200
         sensors.BatteryChargeStatus = 0;    // Set to discharging
         sensors.batteryLevelLiPo = 0;       // Level 0...100%
-        #endif
+#endif
         sensors.batteryCurrent = 0;
         sensors.batteryPower = 0;
         // Fill average arrays with start values
@@ -456,6 +457,7 @@ void sensorTask(void *param){
         // Get current RTC date and time all 500ms
         if (millis() > starttime12 + 500) {
             starttime12 = millis();
+            // Send date and time from RTC chip if GPS not ready
             if (rtcOn == "DS1388" && RTC_ready) {
                 DateTime dt = ds1388.now();
                 sensors.rtcTime.tm_year  = dt.year() - 1900; // Save values in SensorData
@@ -495,28 +497,52 @@ void sensorTask(void *param){
             }
         }
 
-        // Send supply voltage value all 1s
+        // Send 1Wire data for all temperature sensors to N2K all 2s
+        if(millis() > starttime13 + 2000 && String(oneWireOn) == "DS18B20" && oneWire_ready == true){
+            starttime13 = millis();
+            float tempC;
+            ds18b20.requestTemperatures();  // Collect all temperature values (max.8)
+            for(int i=0;i<numberOfDevices; i++){
+                // Send only one 1Wire data per loop step (time reduction)
+                if(i == loopCounter % numberOfDevices){
+                    if(ds18b20.getAddress(tempDeviceAddress, i)){
+                        // Read temperature value in Celsius
+                        tempC = ds18b20.getTempC(tempDeviceAddress); 
+                    }
+                    // Send to NMEA200 bus for each sensor with instance number
+                    if(!isnan(tempC)){
+                        sensors.onewireTemp[i] = tempC; // Save values in SensorData
+                        api->getLogger()->logDebug(GwLog::DEBUG,"DS18B20-%1d Temp: %.1f",i,tempC);
+                        SetN2kPGN130316(N2kMsg, 0, i, N2kts_OutsideTemperature, CToKelvin(tempC), N2kDoubleNA);
+                        api->sendN2kMessage(N2kMsg);
+                    }
+                }    
+            }
+            loopCounter++;
+        }
+
+        // Send supply voltage value to N2K all 1s
         if(millis() > starttime5 + 1000 && String(powsensor1) == "off"){
             starttime5 = millis();
             float rawVoltage = 0;       // Default value
-            #ifdef BOARD_OBP40S3
+#ifdef BOARD_OBP40S3
             sensors.batteryVoltage = 0; // If no sensor then zero voltage
-            #endif
+#endif
-            #if defined(BOARD_OBP40S3)  && defined(VOLTAGE_SENSOR)
+#if defined(BOARD_OBP40S3)  && defined(VOLTAGE_SENSOR)
             rawVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.53) * 2;   // Vin = 1/2 for OBP40
             sensors.batteryVoltage = rawVoltage * vslope + voffset; // Calibration
-            #endif
+#endif
-            #ifdef BOARD_OBP60S3
+#ifdef BOARD_OBP60S3
             rawVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20;   // Vin = 1/20 for OBP60
             sensors.batteryVoltage = rawVoltage * vslope + voffset; // Calibration  
-            #endif
+#endif
             // Save new data in average array
             batV.reading(int(sensors.batteryVoltage * 100));
             // Calculate the average values for different time lines from integer values
             sensors.batteryVoltage10 = batV.getAvg(10) / 100.0;
             sensors.batteryVoltage60 = batV.getAvg(60) / 100.0;
             sensors.batteryVoltage300 = batV.getAvg(300) / 100.0;
-            #if BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
+#if BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
             // Polynomfit for LiPo capacity calculation for 3,7V LiPo accus, 0...100%
             sensors.batteryLevelLiPo = sensors.batteryVoltage60 * 203.8312 -738.1635;
             // Limiter
@@ -555,19 +581,24 @@ void sensorTask(void *param){
                 SetN2kDCBatStatus(N2kMsg, 10, sensors.batteryVoltage, N2kDoubleNA, N2kDoubleNA, 0);
                 api->sendN2kMessage(N2kMsg);
             }
-            #endif
+#endif
-            #ifdef BOARD_OBP60S3
+#ifdef BOARD_OBP60S3
             // Send to NMEA200 bus
             if(!isnan(sensors.batteryVoltage)){
                 SetN2kDCBatStatus(N2kMsg, 0, sensors.batteryVoltage, N2kDoubleNA, N2kDoubleNA, 1);
                 api->sendN2kMessage(N2kMsg);
             }
-            #endif
+#endif
         }
 
-        // Send data from environment sensor all 2s
+        // Send data from environment sensor to N2K all 2s
         if(millis() > starttime6 + 2000){
             starttime6 = millis();
+
+            // DEBUG
+            UBaseType_t stackfree = uxTaskGetStackHighWaterMark(NULL);
+            api->getLogger()->logDebug(GwLog::LOG, "obpSensortask Stack=%d", stackfree);
+
             unsigned char TempSource = 2;       // Inside temperature
             unsigned char PressureSource = 0;   // Atmospheric pressure
             unsigned char HumiditySource = 0;   // Inside humidity
@@ -630,7 +661,7 @@ void sensorTask(void *param){
             }                
         }
 
-        // Send rotation angle all 500ms
+        // Send rotation angle to N2K all 500ms
         if(millis() > starttime7 + 500){
             starttime7 = millis();
             double rotationAngle=0;
@@ -678,7 +709,7 @@ void sensorTask(void *param){
             }    
         }
 
-        // Send battery power value all 1s
+        // Send battery power value to N2K all 1s
         if(millis() > starttime8 + 1000 && (String(powsensor1) == "INA219" || String(powsensor1) == "INA226")){
             starttime8 = millis();
             if(String(powsensor1) == "INA226" && INA226_1_ready == true){
@@ -720,7 +751,7 @@ void sensorTask(void *param){
             }
         }
 
-        // Send solar power value all 1s
+        // Send solar power value to N2K all 1s
         if(millis() > starttime9 + 1000 && (String(powsensor2) == "INA219" || String(powsensor2) == "INA226")){
             starttime9 = millis();
             if(String(powsensor2) == "INA226" && INA226_2_ready == true){
@@ -750,7 +781,7 @@ void sensorTask(void *param){
             }
         }
 
-        // Send generator power value all 1s
+        // Send generator power value to N2K all 1s
         if(millis() > starttime10 + 1000 && (String(powsensor3) == "INA219" || String(powsensor3) == "INA226")){
             starttime10 = millis();
             if(String(powsensor3) == "INA226" && INA226_3_ready == true){
@@ -785,8 +816,12 @@ void sensorTask(void *param){
     vTaskDelete(NULL);
 }
 
-
+void createSensorTask(SharedData *shared) {
-void createSensorTask(SharedData *shared){
+    TaskHandle_t xHandle = NULL;
-    xTaskCreate(sensorTask,"readSensors",10000,shared,3,NULL);
+    GwLog *logger = shared->api->getLogger();
+    esp_err_t err = xTaskCreate(sensorTask, "readSensors", configMINIMAL_STACK_SIZE + 8192, shared, 3, &xHandle);
+    if ( err != pdPASS) {
+        logger->logDebug(GwLog::ERROR, "Failed to create sensor task! (err=%d)", err);
+    };
 }
 #endif

lib/obp60task/OBPSensorTask.h

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 #include "GwSynchronized.h"
 #include "GwApi.h"

lib/obp60task/OBPcharts.cpp

@@ -28,8 +28,9 @@ Chart::Chart(RingBuffer<uint16_t>& dataBuf, double dfltRng, CommonData& common,
     fgColor = commonData->fgcolor;
     bgColor = commonData->bgcolor;
 
-    dWidth = getdisplay().width();
+    // display dimensions (avoid calling width()/height() on incomplete LGFX type)
-    dHeight = getdisplay().height();
+    dWidth = epd->width();
+    dHeight = epd->height();
 
     dataBuf.getMetaData(dbName, dbFormat);
     dbMIN_VAL = dataBuf.getMinVal();
@@ -161,8 +162,8 @@ bool Chart::setChartDimensions(const char direction, const int8_t size)
             break;
         }
     }
-    LOG_DEBUG(GwLog::ERROR, "obp60:setChartDimensions %s: direction: %c, size: %d, dWidth: %d, dHeight: %d, timAxis: %d, valAxis: %d, cRoot{%d, %d}, top: %d, bottom: %d, hGap: %d, vGap: %d",
+    //LOG_DEBUG(GwLog::DEBUG, "obp60:setChartDimensions %s: direction: %c, size: %d, dWidth: %d, dHeight: %d, timAxis: %d, valAxis: %d, cRoot{%d, %d}, top: %d, bottom: %d, hGap: %d, vGap: %d",
-        dataBuf.getName(), direction, size, dWidth, dHeight, timAxis, valAxis, cRoot.x, cRoot.y, top, bottom, hGap, vGap);
+    //     dataBuf.getName(), direction, size, dWidth, dHeight, timAxis, valAxis, cRoot.x, cRoot.y, top, bottom, hGap, vGap);
     return true;
 }
 
@@ -176,7 +177,7 @@ void Chart::drawChrt(const char chrtDir, const int8_t chrtIntv, GwApi::BoatValue
     // LOG_DEBUG(GwLog::DEBUG, "Chart:drawChart: min: %.1f, mid: %.1f, max: %.1f, rng: %.1f", chrtMin, chrtMid, chrtMax, chrtRng);
     calcChrtBorders(chrtMin, chrtMid, chrtMax, chrtRng);
     chrtScale = double(valAxis) / chrtRng; // Chart scale: pixels per value step
-    LOG_DEBUG(GwLog::DEBUG, "Chart:drawChart: min: %.1f, mid: %.1f, max: %.1f, rng: %.1f", chrtMin, chrtMid, chrtMax, chrtRng);
+    // LOG_DEBUG(GwLog::DEBUG, "Chart:drawChart: min: %.1f, mid: %.1f, max: %.1f, rng: %.1f", chrtMin, chrtMid, chrtMax, chrtRng);
 
     // Do we have valid buffer data?
     if (dataBuf.getMax() == dbMAX_VAL) { // only <MAX_VAL> values in buffer -> no valid wind data available
@@ -261,8 +262,8 @@ void Chart::calcChrtBorders(double& rngMin, double& rngMid, double& rngMax, doub
                 }
                 recalcRngMid = false; // Reset flag for <rngMid> determination
 
-                LOG_DEBUG(GwLog::DEBUG, "calcChrtRange: rngMin: %.1f°, rngMid: %.1f°, rngMax: %.1f°, rng: %.1f°, rngStep: %.1f°", rngMin * RAD_TO_DEG, rngMid * RAD_TO_DEG, rngMax * RAD_TO_DEG,
+                // LOG_DEBUG(GwLog::DEBUG, "calcChrtRange: rngMin: %.1f°, rngMid: %.1f°, rngMax: %.1f°, rng: %.1f°, rngStep: %.1f°", rngMin * RAD_TO_DEG, rngMid * RAD_TO_DEG, rngMax * RAD_TO_DEG,
-                    rng * RAD_TO_DEG, rngStep * RAD_TO_DEG);
+                //     rng * RAD_TO_DEG, rngStep * RAD_TO_DEG);
             }
         }
 
@@ -287,8 +288,8 @@ void Chart::calcChrtBorders(double& rngMin, double& rngMid, double& rngMax, doub
 
         rng = halfRng * 2.0;
 
-        LOG_DEBUG(GwLog::DEBUG, "calcChrtBorders: rngMin: %.1f°, rngMid: %.1f°, rngMax: %.1f°, tmpRng: %.1f°, rng: %.1f°, rngStep: %.1f°", rngMin * RAD_TO_DEG, rngMid * RAD_TO_DEG, rngMax * RAD_TO_DEG,
+        // LOG_DEBUG(GwLog::DEBUG, "calcChrtBorders: rngMin: %.1f°, rngMid: %.1f°, rngMax: %.1f°, tmpRng: %.1f°, rng: %.1f°, rngStep: %.1f°", rngMin * RAD_TO_DEG, rngMid * RAD_TO_DEG, rngMax * RAD_TO_DEG,
-            tmpRng * RAD_TO_DEG, rng * RAD_TO_DEG, rngStep * RAD_TO_DEG);
+        //     tmpRng * RAD_TO_DEG, rng * RAD_TO_DEG, rngStep * RAD_TO_DEG);
 
     } else { // chart data is of any other type
 
@@ -320,8 +321,8 @@ void Chart::calcChrtBorders(double& rngMin, double& rngMid, double& rngMax, doub
         rngMid = (rngMin + rngMax) / 2.0;
         rng = rngMax - rngMin;
 
-        LOG_DEBUG(GwLog::DEBUG, "calcChrtRange-end: currMinVal: %.1f, currMaxVal: %.1f, rngMin: %.1f, rngMid: %.1f, rngMax: %.1f, rng: %.1f, rngStep: %.1f, zeroValue: %.1f, dbMIN_VAL: %.1f",
+        // LOG_DEBUG(GwLog::DEBUG, "calcChrtRange-end: currMinVal: %.1f, currMaxVal: %.1f, rngMin: %.1f, rngMid: %.1f, rngMax: %.1f, rng: %.1f, rngStep: %.1f, zeroValue: %.1f, dbMIN_VAL: %.1f",
-            currMinVal, currMaxVal, rngMin, rngMid, rngMax, rng, rngStep, zeroValue, dbMIN_VAL);
+        //     currMinVal, currMaxVal, rngMin, rngMid, rngMax, rng, rngStep, zeroValue, dbMIN_VAL);
     }
 }
 
@@ -397,6 +398,8 @@ void Chart::drawChartLines(const char direction, const int8_t chrtIntv, const do
             }
             break;
         }
+
+        taskYIELD(); // we run for 50-150ms; be polite to other tasks with same priority
     }
 }
 
@@ -436,15 +439,15 @@ void Chart::drawChrtTimeAxis(const char chrtDir, const int8_t chrtSz, const int8
     char sTime[6];
     int timeRng = chrtIntv * 4; // chart time interval: [1] 4 min., [2] 8 min., [3] 12 min., [4] 16 min., [8] 32 min.
 
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    epd->setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setTextColor(fgColor);
+    epd->setTextColor(fgColor);
 
     axSlots = 5; // number of axis labels
     intv = timAxis / (axSlots - 1); // minutes per chart axis interval (interval is 1 less than axSlots)
     i = timeRng; // Chart axis label start at -32, -16, -12, ... minutes
 
     if (chrtDir == HORIZONTAL) {
-        getdisplay().fillRect(0, cRoot.y, dWidth, 2, fgColor);
+        epd->fillRect(0, cRoot.y, dWidth, 2, fgColor);
 
         for (float j = 0; j < timAxis - 1; j += intv) { // fill time axis with values but keep area free on right hand side for value label
 
@@ -452,7 +455,7 @@ void Chart::drawChrtTimeAxis(const char chrtDir, const int8_t chrtSz, const int8
             int tOffset = j == 0 ? 13 : -4;
             snprintf(sTime, sizeof(sTime), "-%.0f", i);
             drawTextCenter(cRoot.x + j + tOffset, cRoot.y - 8, sTime);
-            getdisplay().drawLine(cRoot.x + j, cRoot.y, cRoot.x + j, cRoot.y + 5, fgColor); // draw short vertical time mark
+            epd->drawLine(cRoot.x + j, cRoot.y, cRoot.x + j, cRoot.y + 5, fgColor); // draw short vertical time mark
 
             i -= chrtIntv;
         }
@@ -463,12 +466,12 @@ void Chart::drawChrtTimeAxis(const char chrtDir, const int8_t chrtSz, const int8
 
             i -= chrtIntv; // we start not at top chart position
             snprintf(sTime, sizeof(sTime), "-%.0f", i);
-            getdisplay().drawLine(cRoot.x, cRoot.y + j, cRoot.x + valAxis, cRoot.y + j, fgColor); // Grid line
+            epd->drawLine(cRoot.x, cRoot.y + j, cRoot.x + valAxis, cRoot.y + j, fgColor); // Grid line
 
             if (chrtSz == FULL_SIZE) { // full size chart
-                getdisplay().fillRect(0, cRoot.y + j - 9, 32, 15, bgColor); // clear small area to remove potential chart lines
+                epd->fillRect(0, cRoot.y + j - 9, 32, 15, bgColor); // clear small area to remove potential chart lines
-                getdisplay().setCursor((4 - strlen(sTime)) * 7, cRoot.y + j + 3); // time value; print left screen; value right-formated
+                epd->setCursor((4 - strlen(sTime)) * 7, cRoot.y + j + 3); // time value; print left screen; value right-formated
-                getdisplay().printf("%s", sTime); // Range value
+                epd->printf("%s", sTime); // Range value
             } else if (chrtSz == HALF_SIZE_RIGHT) { // half size chart; right side
                 drawTextCenter(dWidth / 2, cRoot.y + j, sTime); // time value; print mid screen
             }
@@ -483,7 +486,7 @@ void Chart::drawChrtValAxis(const char chrtDir, const int8_t chrtSz, bool prntNa
     constexpr bool NO_LABEL = false;
     constexpr bool LABEL = true;
 
-    getdisplay().setTextColor(fgColor);
+    epd->setTextColor(fgColor);
 
     if (chrtDir == HORIZONTAL) {
 
@@ -492,7 +495,7 @@ void Chart::drawChrtValAxis(const char chrtDir, const int8_t chrtSz, bool prntNa
             font = &Ubuntu_Bold12pt8b;
 
             // print buffer data name on right hand side of time axis (max. size 5 characters)
-            getdisplay().setFont(font);
+            epd->setFont(font);
             drawTextRalign(cRoot.x + timAxis, cRoot.y - 3, dbName.substring(0, 5));
 
             if (chrtDataFmt == WIND) {
@@ -510,7 +513,7 @@ void Chart::drawChrtValAxis(const char chrtDir, const int8_t chrtSz, bool prntNa
 
             if (prntName) {
                 // print buffer data name on right hand side of time axis (max. size 5 characters)
-                getdisplay().setFont(font);
+                epd->setFont(font);
                 drawTextRalign(cRoot.x + timAxis, cRoot.y - 3, dbName.substring(0, 5));
             }
 
@@ -522,7 +525,7 @@ void Chart::drawChrtValAxis(const char chrtDir, const int8_t chrtSz, bool prntNa
 
         if (chrtSz == FULL_SIZE) {
             font = &Ubuntu_Bold12pt8b;
-            getdisplay().setFont(font); // use larger font
+            epd->setFont(font); // use larger font
             drawTextRalign(cRoot.x + (valAxis * 0.42), cRoot.y - 2, dbName.substring(0, 6)); // print buffer data name (max. size 5 characters)
 
         } else {
@@ -540,23 +543,23 @@ void Chart::prntCurrValue(const char direction, GwApi::BoatValue& currValue)
     const int xPosVal = (direction == HORIZONTAL) ? cRoot.x + (timAxis / 2) - 56 : cRoot.x + 32;
     const int yPosVal = (direction == HORIZONTAL) ? cRoot.y + valAxis - 7 : cRoot.y + timAxis - 7;
 
-    FormattedData frmtDbData = formatValue(&currValue, *commonData, NO_SIMUDATA);
+    FormattedData frmtDbData = commonData->fmt->formatValue(&currValue, *commonData, NO_SIMUDATA);
     String sdbValue = frmtDbData.svalue; // value as formatted string
     String dbUnit = frmtDbData.unit; // Unit of value; limit length to 3 characters
 
-    getdisplay().fillRect(xPosVal - 1, yPosVal - 35, 128, 41, bgColor); // Clear area for TWS value
+    epd->fillRect(xPosVal - 1, yPosVal - 35, 128, 41, bgColor); // Clear area for TWS value
-    getdisplay().drawRect(xPosVal, yPosVal - 34, 126, 40, fgColor); // Draw box for TWS value
+    epd->drawRect(xPosVal, yPosVal - 34, 126, 40, fgColor); // Draw box for TWS value
-    getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+    epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
-    getdisplay().setCursor(xPosVal + 1, yPosVal);
+    epd->setCursor(xPosVal + 1, yPosVal);
-    getdisplay().print(sdbValue); // value
+    epd->print(sdbValue); // value
 
-    getdisplay().setFont(&Ubuntu_Bold10pt8b);
+    epd->setFont(&Ubuntu_Bold10pt8b);
-    getdisplay().setCursor(xPosVal + 76, yPosVal - 17);
+    epd->setCursor(xPosVal + 76, yPosVal - 17);
-    getdisplay().print(dbName.substring(0, 3)); // Name, limited to 3 characters
+    epd->print(dbName.substring(0, 3)); // Name, limited to 3 characters
 
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    epd->setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setCursor(xPosVal + 76, yPosVal + 0);
+    epd->setCursor(xPosVal + 76, yPosVal + 0);
-    getdisplay().print(dbUnit); // Unit
+    epd->print(dbUnit); // Unit
 }
 
 // print message for no valid data availabletemplate <typename T>
@@ -564,7 +567,7 @@ void Chart::prntNoValidData(const char direction)
 {
     Pos p;
 
-    getdisplay().setFont(&Ubuntu_Bold10pt8b);
+    epd->setFont(&Ubuntu_Bold10pt8b);
 
     if (direction == HORIZONTAL) {
         p.x = cRoot.x + (timAxis / 2);
@@ -574,7 +577,7 @@ void Chart::prntNoValidData(const char direction)
         p.y = cRoot.y + (timAxis / 2) - 10;
     }
 
-    getdisplay().fillRect(p.x - 37, p.y - 10, 78, 24, bgColor); // Clear area for message
+    epd->fillRect(p.x - 37, p.y - 10, 78, 24, bgColor); // Clear area for message
     drawTextCenter(p.x, p.y, "No data");
 
     LOG_DEBUG(GwLog::LOG, "Page chart <%s>: No valid data available", dbName);
@@ -621,28 +624,28 @@ double Chart::getAngleRng(const double center, size_t amount)
     double cVal;
     char sVal[7];
 
-    getdisplay().fillRect(cRoot.x, cRoot.y, valAxis, 2, fgColor); // top chart line
+    epd->fillRect(cRoot.x, cRoot.y, valAxis, 2, fgColor); // top chart line
-    getdisplay().setFont(font);
+    epd->setFont(font);
 
     cVal = chrtMin;
-    cVal = convertValue(cVal, dbName, dbFormat, *commonData); // value (converted)
+    cVal = commonData->fmt->convertValue(cVal, dbName, dbFormat, *commonData); // value (converted)
     snprintf(sVal, sizeof(sVal), "%.0f", round(cVal));
-    getdisplay().setCursor(cRoot.x, cRoot.y - 2);
+    epd->setCursor(cRoot.x, cRoot.y - 2);
-    getdisplay().printf("%s", sVal); // Range low end
+    epd->printf("%s", sVal); // Range low end
 
     cVal = chrtMid;
-    cVal = convertValue(cVal, dbName, dbFormat, *commonData); // value (converted)
+    cVal = commonData->fmt->convertValue(cVal, dbName, dbFormat, *commonData); // value (converted)
     snprintf(sVal, sizeof(sVal), "%.0f", round(cVal));
     drawTextCenter(cRoot.x + (valAxis / 2), cRoot.y - 9, sVal); // Range mid end
 
     cVal = chrtMax;
-    cVal = convertValue(cVal, dbName, dbFormat, *commonData); // value (converted)
+    cVal = commonData->fmt->convertValue(cVal, dbName, dbFormat, *commonData); // value (converted)
     snprintf(sVal, sizeof(sVal), "%.0f", round(cVal));
     drawTextRalign(cRoot.x + valAxis - 2, cRoot.y - 2, sVal); // Range high end
 
     // draw vertical grid lines for each axis label
     for (int j = 0; j <= valAxis; j += (valAxis / 2)) {
-        getdisplay().drawLine(cRoot.x + j, cRoot.y, cRoot.x + j, cRoot.y + timAxis, fgColor);
+        epd->drawLine(cRoot.x + j, cRoot.y, cRoot.x + j, cRoot.y + timAxis, fgColor);
     }
 }
 
@@ -656,17 +659,17 @@ void Chart::prntHorizChartThreeValueAxisLabel(const GFXfont* font)
 
     if (font == &Ubuntu_Bold10pt8b) {
         xOffset = 39;
-        yOffset = 15;
+        yOffset = 16;
     } else if (font == &Ubuntu_Bold12pt8b) {
         xOffset = 51;
         yOffset = 18;
     }
-    getdisplay().setFont(font);
+    epd->setFont(font);
 
     // convert & round chart bottom+top label to next range step
-    chrtMin = convertValue(this->chrtMin, dbName, dbFormat, *commonData);
+    chrtMin = commonData->fmt->convertValue(this->chrtMin, dbName, dbFormat, *commonData);
-    chrtMid = convertValue(this->chrtMid, dbName, dbFormat, *commonData);
+    chrtMid = commonData->fmt->convertValue(this->chrtMid, dbName, dbFormat, *commonData);
-    chrtMax = convertValue(this->chrtMax, dbName, dbFormat, *commonData);
+    chrtMax = commonData->fmt->convertValue(this->chrtMax, dbName, dbFormat, *commonData);
     chrtMin = std::round(chrtMin * 100.0) / 100.0;
     chrtMid = std::round(chrtMid * 100.0) / 100.0;
     chrtMax = std::round(chrtMax * 100.0) / 100.0;
@@ -674,22 +677,22 @@ void Chart::prntHorizChartThreeValueAxisLabel(const GFXfont* font)
     // print top axis label
     axLabel = (chrtDataFmt == SPEED || chrtDataFmt == TEMPERATURE) ? chrtMax : chrtMin;
     sVal = formatLabel(axLabel);
-    getdisplay().fillRect(cRoot.x, cRoot.y + 2, xOffset + 3, yOffset, bgColor); // Clear small area to remove potential chart lines
+    epd->fillRect(cRoot.x, cRoot.y + 2, xOffset + 3, yOffset, bgColor); // Clear small area to remove potential chart lines
     drawTextRalign(cRoot.x + xOffset, cRoot.y + yOffset, sVal); // range value
 
     // print mid axis label
     axLabel = chrtMid;
     sVal = formatLabel(axLabel);
-    getdisplay().fillRect(cRoot.x, cRoot.y + (valAxis / 2) - 8, xOffset + 3, 16, bgColor); // Clear small area to remove potential chart lines
+    epd->fillRect(cRoot.x, cRoot.y + (valAxis / 2) - 8, xOffset + 3, 16, bgColor); // Clear small area to remove potential chart lines
     drawTextRalign(cRoot.x + xOffset, cRoot.y + (valAxis / 2) + 6, sVal); // range value
-    getdisplay().drawLine(cRoot.x + xOffset + 3, cRoot.y + (valAxis / 2), cRoot.x + timAxis, cRoot.y + (valAxis / 2), fgColor);
+    epd->drawLine(cRoot.x + xOffset + 3, cRoot.y + (valAxis / 2), cRoot.x + timAxis, cRoot.y + (valAxis / 2), fgColor);
 
     // print bottom axis label
     axLabel = (chrtDataFmt == SPEED || chrtDataFmt == TEMPERATURE) ? chrtMin : chrtMax;
     sVal = formatLabel(axLabel);
-    getdisplay().fillRect(cRoot.x, cRoot.y + valAxis - 14, xOffset + 3, 15, bgColor); // Clear small area to remove potential chart lines
+    epd->fillRect(cRoot.x, cRoot.y + valAxis - 14, xOffset + 3, 15, bgColor); // Clear small area to remove potential chart lines
     drawTextRalign(cRoot.x + xOffset, cRoot.y + valAxis, sVal); // range value
-    getdisplay().drawLine(cRoot.x + xOffset + 3, cRoot.y + valAxis, cRoot.x + timAxis, cRoot.y + valAxis, fgColor);
+    epd->drawLine(cRoot.x + xOffset + 3, cRoot.y + valAxis, cRoot.x + timAxis, cRoot.y + valAxis, fgColor);
 }
 
 // print value axis label with multiple axis lines for horizontal chart
@@ -705,12 +708,12 @@ void Chart::prntHorizChartMultiValueAxisLabel(const GFXfont* font)
     } else if (font == &Ubuntu_Bold12pt8b) {
         xOffset = 50;
     }
-    getdisplay().setFont(font);
+    epd->setFont(font);
 
-    chrtMin = convertValue(this->chrtMin, dbName, dbFormat, *commonData);
+    chrtMin = commonData->fmt->convertValue(this->chrtMin, dbName, dbFormat, *commonData);
     // chrtMin = std::floor(chrtMin / rngStep) * rngStep;
     chrtMin = std::round(chrtMin * 100.0) / 100.0;
-    chrtMax = convertValue(this->chrtMax, dbName, dbFormat, *commonData);
+    chrtMax = commonData->fmt->convertValue(this->chrtMax, dbName, dbFormat, *commonData);
     // chrtMax = std::ceil(chrtMax / rngStep) * rngStep;
     chrtMax = std::round(chrtMax * 100.0) / 100.0;
     chrtRng = std::round((chrtMax - chrtMin) * 100) / 100;
@@ -718,7 +721,7 @@ void Chart::prntHorizChartMultiValueAxisLabel(const GFXfont* font)
     axSlots = valAxis / static_cast<double>(VALAXIS_STEP); // number of axis labels (and we want to have a double calculation, no integer)
     axIntv = chrtRng / axSlots;
     axLabel = chrtMin + axIntv;
-    LOG_DEBUG(GwLog::DEBUG, "Chart::printHorizMultiValueAxisLabel: chrtRng: %.2f, th-chrtRng: %.2f, axSlots: %.2f, axIntv: %.2f, axLabel: %.2f, chrtMin: %.2f, chrtMid: %.2f, chrtMax: %.2f", chrtRng, this->chrtRng, axSlots, axIntv, axLabel, this->chrtMin, chrtMid, chrtMax);
+    // LOG_DEBUG(GwLog::DEBUG, "Chart::printHorizMultiValueAxisLabel: chrtRng: %.2f, th-chrtRng: %.2f, axSlots: %.2f, axIntv: %.2f, axLabel: %.2f, chrtMin: %.2f, chrtMid: %.2f, chrtMax: %.2f", chrtRng, this->chrtRng, axSlots, axIntv, axLabel, this->chrtMin, chrtMid, chrtMax);
 
     int loopStrt, loopEnd, loopStp;
     if (chrtDataFmt == SPEED || chrtDataFmt == TEMPERATURE || chrtDataFmt == OTHER) {
@@ -735,9 +738,9 @@ void Chart::prntHorizChartMultiValueAxisLabel(const GFXfont* font)
 
     for (int j = loopStrt; (loopStp > 0) ? (j < loopEnd) : (j > loopEnd); j += loopStp) {
         sVal = formatLabel(axLabel);
-        getdisplay().fillRect(cRoot.x, cRoot.y + j - 11, xOffset + 3, 21, bgColor); // Clear small area to remove potential chart lines
+        epd->fillRect(cRoot.x, cRoot.y + j - 11, xOffset + 3, 21, bgColor); // Clear small area to remove potential chart lines
         drawTextRalign(cRoot.x + xOffset, cRoot.y + j + 7, sVal); // range value
-        getdisplay().drawLine(cRoot.x + xOffset + 3, cRoot.y + j, cRoot.x + timAxis, cRoot.y + j, fgColor);
+        epd->drawLine(cRoot.x + xOffset + 3, cRoot.y + j, cRoot.x + timAxis, cRoot.y + j, fgColor);
 
         axLabel += axIntv;
     }
@@ -749,12 +752,12 @@ void Chart::drawBoldLine(const int16_t x1, const int16_t y1, const int16_t x2, c
     int16_t dx = std::abs(x2 - x1);
     int16_t dy = std::abs(y2 - y1);
 
-    getdisplay().drawLine(x1, y1, x2, y2, fgColor);
+    epd->drawLine(x1, y1, x2, y2, fgColor);
 
     if (dx >= dy) { // line has horizontal tendency
-        getdisplay().drawLine(x1, y1 - 1, x2, y2 - 1, fgColor);
+        epd->drawLine(x1, y1 - 1, x2, y2 - 1, fgColor);
     } else { // line has vertical tendency
-        getdisplay().drawLine(x1 - 1, y1, x2 - 1, y2, fgColor);
+        epd->drawLine(x1 - 1, y1, x2 - 1, y2, fgColor);
     }
 }
 
@@ -767,7 +770,7 @@ String Chart::convNformatLabel(const double& label)
     tmpBVal.setFormat(dbFormat);
     tmpBVal.valid = true;
     tmpBVal.value = label;
-    sVal = formatValue(&tmpBVal, *commonData, NO_SIMUDATA).svalue; // Formatted value as string including unit conversion and switching decimal places
+    sVal = commonData->fmt->formatValue(&tmpBVal, *commonData, NO_SIMUDATA).svalue; // Formatted value as string including unit conversion and switching decimal places
     if (sVal.length() > 0 && sVal[0] == '!') {
         sVal = sVal.substring(1); // cut leading "!" created at OBPFormatter; doesn't work for other fonts than 7SEG
     }

lib/obp60task/PageAIS.cpp

@@ -0,0 +1,178 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+
+/*
+  AIS Overview
+    - circle with certain range, e.g. 5nm
+    - AIS-Targets in range with speed and heading
+    - perhaps collision alarm
+  Data: LAT LON SOG HDT
+
+  Feature possibilities
+    - switch between North up / Heading up
+    - filter
+    - zoom
+    - special vessel symbols
+
+*/
+
+class PageAIS : public Page
+{
+private:
+
+    int scale = 5; // Radius of display circle in nautical miles
+
+    bool alarm = false;
+    bool alarm_enabled = false;
+    int alarm_range = 3;
+
+    char mode = 'N'; // (N)ormal, (C)onfig
+
+    void displayModeNormal(PageData &pageData) {
+
+        // TBD Boatvalues: ...
+
+        logger->logDebug(GwLog::DEBUG,"Drawing at PageAIS");
+
+        Point c = {200, 150}; // center = current boat position
+        uint16_t r = 125;
+
+        const std::vector<Point> pts_boat = { // polygon lines
+            {c.x - 5, c.y},
+            {c.x - 5, c.y - 10},
+            {c.x, c.y - 16},
+            {c.x + 5, c.y - 10},
+            {c.x + 5, c.y}
+        };
+        drawPoly(pts_boat, commonData->fgcolor);
+
+        // Title and corner value headings
+        epd->setTextColor(commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(8, 48);
+        epd->print("AIS");
+
+        // zoom scale
+        epd->drawLine(c.x + 10, c.y, c.x + r - 4, c.y, commonData->fgcolor);
+        // arrow left
+        epd->drawLine(c.x + 10, c.y, c.x + 16, c.y - 4, commonData->fgcolor);
+        epd->drawLine(c.x + 10, c.y, c.x + 16, c.y + 4, commonData->fgcolor);
+        // arrow right
+        epd->drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y - 4, commonData->fgcolor);
+        epd->drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y + 4, commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        drawTextCenter(c.x + r / 2, c.y + 8, String(scale) + "nm");
+ 
+    }
+
+    void displayModeConfig() {
+
+        epd->setTextColor(commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(8, 48);
+        epd->print("AIS configuration");
+
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        // TODO menu
+
+    }
+
+public:
+    PageAIS(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageAIS");
+        alarm_range = 3;
+    }
+
+    void setupKeys(){
+        Page::setupKeys();
+        commonData->keydata[0].label = "MODE";
+        commonData->keydata[1].label = "ALARM";
+    }
+
+#ifdef BOARD_OBP60S3
+    int handleKey(int key){
+        if (key == 1) { // Switch between normal and config mode
+            if (mode == 'N') {
+                mode = 'C';
+            } else {
+                mode = 'N';
+            }
+            return 0;
+        }
+        if (key == 11) { // Code for keylock
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+#endif
+#ifdef BOARD_OBP40S3
+    int handleKey(int key) {
+        if (key == 1) { // Switch between normal and config mode
+            if (mode == 'N') {
+                mode = 'C';
+            } else {
+                mode = 'N';
+            }
+            return 0;
+        }
+        if (key == 11) { // Code for keylock
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+#endif
+
+    void displayNew(PageData &pageData) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData){
+
+        // Logging boat values
+        logger->logDebug(GwLog::LOG, "Drawing at PageAIS; Mode=%c", mode);
+
+        // Set display in partial refresh mode
+        epd->setPartialWindow(0, 0, epd->width(), epd->height());
+
+       if (mode == 'N') {
+           displayModeNormal(pageData);
+       } else if (mode == 'C') {
+           displayModeConfig();
+       }
+
+        return PAGE_UPDATE;
+    };
+};
+
+static Page *createPage(CommonData &common){
+    return new PageAIS(common);
+}
+
+/**
+ * with the code below we make this page known to the PageTask
+ * we give it a type (name) that can be selected in the config
+ * we define which function is to be called
+ * and we provide the number of user parameters we expect
+ * this will be number of BoatValue pointers in pageData.values
+ */
+PageDescription registerPageAIS(
+    "AIS",      // Page name
+    createPage, // Action
+    0,          // Number of bus values depends on selection in Web configuration
+    {"LAT", "LON", "SOG", "HDT"}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
+    true        // Show display header on/off
+);
+
+#endif

lib/obp60task/PageAnchor.cpp

@@ -0,0 +1,432 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+#include "ConfigMenu.h"
+
+/*
+  Anchor overview with additional associated data
+  This page is in experimental stage so be warned!
+  North is up.
+
+  Boatdata used
+    DBS - Water depth
+    HDT - Boat heading
+    AWS - Wind strength; Boat not moving so we assume AWS=TWS and AWD=TWD
+    AWD - Wind direction
+    LAT/LON - Boat position, current
+    HDOP - Position error
+
+  This is the fist page to contain a configuration page with 
+  data entry option.
+  Also it will make use of the new alarm function.
+
+  Data
+    Anchor position lat/lon
+    Depth at anchor position
+    Chain length used
+    Boat position current
+    Depth at boat position
+    Boat heading
+    Wind direction
+    Wind strength
+    Alarm j/n
+    Alarm radius
+    GPS position error
+    Timestamp while dropping anchor
+
+   Drop / raise function in device OBP40 has to be done inside 
+   config mode because of limited number of buttons.
+
+   Save position in FRAM
+   Alarm: gps fix lost
+   switch unit feet/meter
+
+*/
+
+#define anchor_width 16
+#define anchor_height 16
+static unsigned char anchor_bits[] = {
+   0x80, 0x01, 0x40, 0x02, 0x40, 0x02, 0x80, 0x01, 0xf0, 0x0f, 0x80, 0x01,
+   0x80, 0x01, 0x88, 0x11, 0x8c, 0x31, 0x8e, 0x71, 0x84, 0x21, 0x86, 0x61,
+   0x86, 0x61, 0xfc, 0x3f, 0xf8, 0x1f, 0x80, 0x01 };
+
+class PageAnchor : public Page
+{
+private:
+    String lengthformat;
+
+    int scale = 50; // Radius of display circle in meter
+
+    bool alarm = false;
+    bool alarm_enabled = false;
+    uint8_t alarm_range;
+
+    uint8_t chain_length;
+    uint8_t chain;
+
+    bool anchor_set = false;
+    double anchor_lat;
+    double anchor_lon;
+    double anchor_depth;
+    int anchor_ts; // time stamp anchor dropped
+
+    char mode = 'N'; // (N)ormal, (C)onfig
+    int8_t editmode = -1; // marker for menu/edit/set function
+
+    ConfigMenu *menu;
+
+    void displayModeNormal(PageData &pageData) {
+
+        // Boatvalues: DBS, HDT, AWS, AWD, LAT, LON, HDOP
+        GwApi::BoatValue *bv_dbs = pageData.values[0]; // DBS
+        String sval_dbs = commonData->fmt->formatValue(bv_dbs, *commonData).svalue;
+        String sunit_dbs = commonData->fmt->formatValue(bv_dbs, *commonData).unit; 
+        GwApi::BoatValue *bv_hdt = pageData.values[1]; // HDT
+        String sval_hdt = commonData->fmt->formatValue(bv_hdt, *commonData).svalue;
+        GwApi::BoatValue *bv_aws = pageData.values[2]; // AWS
+        String sval_aws = commonData->fmt->formatValue(bv_aws, *commonData).svalue;
+        String sunit_aws = commonData->fmt->formatValue(bv_aws, *commonData).unit; 
+        GwApi::BoatValue *bv_awd = pageData.values[3]; // AWD
+        String sval_awd = commonData->fmt->formatValue(bv_awd, *commonData).svalue;
+        GwApi::BoatValue *bv_lat = pageData.values[4]; // LAT
+        String sval_lat = commonData->fmt->formatValue(bv_lat, *commonData).svalue;
+        GwApi::BoatValue *bv_lon = pageData.values[5]; // LON
+        String sval_lon = commonData->fmt->formatValue(bv_lon, *commonData).svalue;
+        GwApi::BoatValue *bv_hdop = pageData.values[6]; // HDOP
+        String sval_hdop = commonData->fmt->formatValue(bv_hdop, *commonData).svalue;
+        String sunit_hdop = commonData->fmt->formatValue(bv_hdop, *commonData).unit; 
+
+        logger->logDebug(GwLog::DEBUG, "Drawing at PageAnchor; DBS=%f, HDT=%f, AWS=%f", bv_dbs->value, bv_hdt->value, bv_aws->value);
+
+        Point c = {200, 150}; // center = anchor position
+        uint16_t r = 125;
+
+        Point b = {200, 180}; // boat position while dropping anchor
+
+        const std::vector<Point> pts_boat = { // polygon lines
+            {b.x - 5, b.y},
+            {b.x - 5, b.y - 10},
+            {b.x, b.y - 16},
+            {b.x + 5, b.y - 10},
+            {b.x + 5, b.y}
+        };
+        //rotatePoints und dann Linien zeichnen
+        // TODO rotate boat according to current heading
+        //drawPoly(rotatePoints(c, pts, RadToDeg(value2)), commonData->fgcolor);
+        drawPoly(pts_boat, commonData->fgcolor);
+
+        // Draw wind arrow
+        const std::vector<Point> pts_wind = {
+            {c.x, c.y - r + 25},
+            {c.x - 12, c.y - r - 4},
+            {c.x, c.y - r + 6},
+            {c.x + 12, c.y - r - 4}
+        };
+        if (bv_awd->valid) {
+            fillPoly4(rotatePoints(c, pts_wind, bv_awd->value), commonData->fgcolor);
+        }
+
+        // Title and corner value headings
+        epd->setTextColor(commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(8, 48);
+        epd->print("Anchor");
+
+        epd->setFont(&Ubuntu_Bold10pt8b);
+        epd->setCursor(8, 200);
+        epd->print("Depth");
+        drawTextRalign(392, 38, "Chain");
+        drawTextRalign(392, 200, "Wind");
+
+        // Units
+        epd->setCursor(8, 272);
+        epd->print(sunit_dbs);
+        drawTextRalign(392, 272, sunit_aws);
+        drawTextRalign(392, 100, lengthformat); // chain unit not implemented
+
+        // Corner values
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        epd->setCursor(8, 70);
+        epd->print("Alarm: ");
+        epd->print(alarm_enabled ? "On" : "Off");
+
+        epd->setCursor(8, 90);
+        epd->print("HDOP");
+        epd->setCursor(8, 106);
+        if (bv_hdop->valid) {
+            epd->print(round(bv_hdop->value), 0);
+            epd->print(sunit_hdop);
+        } else {
+            epd->print("n/a");
+        }
+
+        // Values
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        // Current chain used
+        epd->setCursor(328, 85);
+        epd->print("27");
+
+        // Depth
+        epd->setCursor(8, 250);
+        epd->print(sval_dbs);
+        // Wind
+        epd->setCursor(328, 250);
+        epd->print(sval_aws);
+
+        epd->drawCircle(c.x, c.y, r, commonData->fgcolor);
+        epd->drawCircle(c.x, c.y, r + 1, commonData->fgcolor);
+ 
+        // zoom scale
+        epd->drawLine(c.x + 10, c.y, c.x + r - 4, c.y, commonData->fgcolor);
+        // arrow left
+        epd->drawLine(c.x + 10, c.y, c.x + 16, c.y - 4, commonData->fgcolor);
+        epd->drawLine(c.x + 10, c.y, c.x + 16, c.y + 4, commonData->fgcolor);
+        // arrow right
+        epd->drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y - 4, commonData->fgcolor);
+        epd->drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y + 4, commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        drawTextCenter(c.x + r / 2, c.y + 8, String(scale) + "m");
+ 
+        // alarm range circle
+        if (alarm_enabled) {
+            // alarm range in meter has to be smaller than the scale in meter
+            // r and r_range are pixel values
+            uint16_t r_range = int(alarm_range * r / scale);
+            logger->logDebug(GwLog::LOG, "Drawing at PageAnchor; Alarm range = %d", r_range);
+            epd->drawCircle(c.x, c.y, r_range, commonData->fgcolor);
+        }
+ 
+        // draw anchor symbol (as bitmap)
+        epd->drawXBitmap(c.x - anchor_width / 2, c.y - anchor_height / 2,
+                                 anchor_bits, anchor_width, anchor_height, commonData->fgcolor);
+
+    }
+
+    void displayModeConfig() {
+
+        epd->setTextColor(commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(8, 48);
+        epd->print("Anchor configuration");
+        
+        // TODO
+        // show lat/lon for anchor pos
+        // show lat/lon for boat pos
+        // show distance anchor <-> boat
+
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        for (int i = 0 ; i < menu->getItemCount(); i++) {
+            ConfigMenuItem *itm = menu->getItemByIndex(i);
+            if (!itm) {
+                logger->logDebug(GwLog::ERROR, "Menu item not found: %d", i);
+            } else {
+                Rect r = menu->getItemRect(i);
+                bool inverted = (i == menu->getActiveIndex());
+                drawTextBoxed(r, itm->getLabel(), commonData->fgcolor, commonData->bgcolor, inverted, false);
+                if (inverted and editmode > 0) {
+                    // triangle as edit marker
+                    epd->fillTriangle(r.x + r.w + 20, r.y, r.x + r.w + 30, r.y + r.h / 2, r.x + r.w + 20, r.y + r.h,  commonData->fgcolor);
+                }
+                epd->setCursor(r.x + r.w + 40, r.y + r.h - 4);
+                if (itm->getType() == "int") {
+                    epd->print(itm->getValue());
+                    epd->print(itm->getUnit());
+                } else {
+                     epd->print(itm->getValue() == 0 ? "No" : "Yes");
+                }
+            }
+        } 
+
+    }
+
+public:
+    PageAnchor(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageAnchor");
+
+        // preload configuration data
+        lengthformat = config->getString(config->lengthFormat);
+        chain_length = config->getInt(config->chainLength);
+
+        chain = 0;
+        anchor_set = false;
+        alarm_range = 30;
+
+        // Initialize config menu
+        menu = new ConfigMenu("Options", 40, 80);
+        menu->setItemDimension(150, 20);
+
+        ConfigMenuItem *newitem;
+        newitem = menu->addItem("chain", "Chain out", "int", 0, "m");
+        if (! newitem) {
+            // Demo: in case of failure exit here, should never be happen
+            logger->logDebug(GwLog::ERROR, "Menu item creation failed");
+            return;
+        }
+        newitem->setRange(0, 200, {1, 5, 10});
+        newitem = menu->addItem("chainmax", "Chain max", "int", chain_length, "m");
+        newitem->setRange(0, 200, {1, 5, 10});
+        newitem = menu->addItem("zoom", "Zoom", "int", 50, "m");
+        newitem->setRange(0, 200, {1, });
+        newitem = menu->addItem("range", "Alarm range", "int", 40, "m");
+        newitem->setRange(0, 200, {1, 5, 10});
+        newitem = menu->addItem("alat", "Adjust anchor lat.", "int", 0, "m");
+        newitem->setRange(0, 200, {1, 5, 10});
+        newitem = menu->addItem("alon", "Adjust anchor lon.", "int", 0, "m");
+        newitem->setRange(0, 200, {1, 5, 10});
+#ifdef BOARD_OBP40S3
+        // Intodruced here because of missing keys for OBP40
+        newitem = menu->addItem("anchor", "Anchor down", "bool", 0, "");
+#endif
+        menu->setItemActive("zoom");
+     }
+
+    void setupKeys(){
+        Page::setupKeys();
+        commonData->keydata[0].label = "MODE";
+        commonData->keydata[1].label = "ALARM";
+    }
+
+#ifdef BOARD_OBP60S3
+    int handleKey(int key){
+        if (key == 1) { // Switch between normal and config mode
+            if (mode == 'N') {
+                mode = 'C';
+            } else {
+                mode = 'N';
+            }
+            return 0;
+        }
+        if (mode == 'N') {
+            if (key == 2) { // Toggle alarm
+                alarm_enabled = !alarm_enabled;
+                return 0;
+            }
+        } else { // Config mode
+            if (key == 3) {
+                // menu down
+                menu->goNext();
+                return 0;
+            }
+            if (key == 4) {
+                // menu up
+                menu->goPrev();
+                return 0;
+            }
+        }
+        if (key == 11) { // Code for keylock
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+#endif
+#ifdef BOARD_OBP40S3
+    int handleKey(int key){
+        if (key == 1) { // Switch between normal and config mode
+            if (mode == 'N') {
+                mode = 'C';
+                commonData->keydata[1].label = "EDIT";
+            } else {
+                mode = 'N';
+                commonData->keydata[1].label = "ALARM";
+            }
+            return 0;
+        }
+        if (mode == 'N') {
+            if (key == 2) { // Toggle alarm
+                alarm_enabled = !alarm_enabled;
+                return 0;
+            }
+        } else { // Config mode
+            // TODO different code for OBP40 / OBP60 
+            if (key == 9) {
+                // menu down
+                if (editmode > 0) {
+                    // decrease item value
+                    menu->getActiveItem()->decValue();
+                } else {
+                    menu->goNext();
+                }
+                return 0;
+            }
+            if (key == 10) {
+                // menu up or value up
+                if (editmode > 0) {
+                    // increase item value
+                    menu->getActiveItem()->incValue();
+                } else {
+                    menu->goPrev();
+                }
+                return 0;
+            }
+            if (key == 2) {
+                // enter / leave edit mode for current menu item
+                if (editmode > 0) {
+                    commonData->keydata[1].label = "EDIT";
+                    editmode = 0;
+                } else {
+                    commonData->keydata[1].label = "SET";
+                    editmode = 1;
+                }
+                return 0;
+            }
+        }
+        if (key == 11) { // Code for keylock
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+#endif
+
+    void displayNew(PageData &pageData){
+ #ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+   };
+
+    int displayPage(PageData &pageData){
+
+        // Logging boat values
+        logger->logDebug(GwLog::LOG, "Drawing at PageAnchor; Mode=%c", mode);
+
+        // Set display in partial refresh mode
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+
+       if (mode == 'N') {
+           displayModeNormal(pageData);
+       } else if (mode == 'C') {
+           displayModeConfig();
+       }
+
+        return PAGE_UPDATE;
+    };
+};
+
+static Page *createPage(CommonData &common){
+    return new PageAnchor(common);
+}
+
+/**
+ * with the code below we make this page known to the PageTask
+ * we give it a type (name) that can be selected in the config
+ * we define which function is to be called
+ * and we provide the number of user parameters we expect
+ * this will be number of BoatValue pointers in pageData.values
+ */
+PageDescription registerPageAnchor(
+    "Anchor",   // Page name
+    createPage, // Action
+    0,          // Number of bus values depends on selection in Web configuration
+    {"DBS", "HDT", "AWS", "AWD", "LAT", "LON", "HDOP"}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
+    true        // Show display header on/off
+);
+
+#endif

lib/obp60task/PageAutopilot.cpp

@@ -1,251 +1,126 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
-// These constants have to match the declaration below in :
+/*
-//  PageDescription registerPageAutopilot(
+  Autopilot
-//  {"HDM","HDT", "COG", "STW", "SOG", "DBT","XTE", "DTW", "BTW"}, // Bus values we need in the page
-const int HowManyValues = 9;
 
-const int AverageValues = 4;
+*/
-
-const int ShowHDM = 0;
-const int ShowHDT = 1;
-const int ShowCOG = 2;
-const int ShowSTW = 3;
-const int ShowSOG = 4;
-const int ShowDBT = 5;
-const int ShowXTE = 6;
-const int ShowDTW = 7;
-const int ShowBTW = 8;
-
-const int Compass_X0 = 200;         // X center point of compass band
-const int Compass_Y0 = 220;         // Y position of compass lines
-const int Compass_LineLength = 22;  // Length of compass lines
-const float Compass_LineDelta = 8.0;// Compass band: 1deg = 5 Pixels, 10deg = 50 Pixels 
 
 class PageAutopilot : public Page
 {
-    int WhichDataCompass = ShowHDM; // Start value
+private:
-    int WhichDataDisplay = ShowHDM; // Start value
+    char mode = 'N'; // (N)ormal, (C)onfig
+
+    void displayModeNormal(PageData &pageData) {
+
+        // TBD Boatvalues: ...
+
+        logger->logDebug(GwLog::DEBUG, "Drawing at PageAutopilot");
+
+        // Title and corner value headings
+        epd->setTextColor(commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(8, 48);
+        epd->print("Autopilot");
 
-    public:
-    PageAutopilot(CommonData &common){
-        commonData = &common;
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageAutopilot");
     }
 
-    virtual void setupKeys(){
+    void displayModeConfig() {
-        Page::setupKeys();
-        commonData->keydata[0].label = "CMP";
-        commonData->keydata[1].label = "SRC";
-   }
-    
-    virtual int handleKey(int key){
-        // Code for keylock
-   
-        if ( key == 1 ) {
-            WhichDataCompass += 1;
-            if ( WhichDataCompass > ShowCOG)
-                 WhichDataCompass = ShowHDM;
-           return 0;
-            }
-      if ( key == 2 ) {
-            WhichDataDisplay += 1;
-            if ( WhichDataDisplay > ShowDBT)
-                 WhichDataDisplay = ShowHDM;
-             }
 
-        if(key == 11){
+        epd->setTextColor(commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(8, 48);
+        epd->print("Autopilot configuration");
+
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        // TODO menu
+
+    }
+
+public:
+    PageAutopilot(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageAutopilot");
+    }
+
+    void setupKeys() {
+        Page::setupKeys();
+        commonData->keydata[0].label = "MODE";
+    }
+
+#ifdef BOARD_OBP60S3
+    int handleKey(int key) {
+        if (key == 1) { // Switch between normal and config mode
+            if (mode == 'N') {
+                mode = 'C';
+            } else {
+                mode = 'N';
+            }
+            return 0;
+        }
+        if (key == 11) { // Code for keylock
             commonData->keylock = !commonData->keylock;
-            return 0;                   // Commit the key
+            return 0;
         }
         return key;
     }
+#endif
+#ifdef BOARD_OBP40S3
+    int handleKey(int key){
+        if (key == 1) { // Switch between normal and config mode
+            if (mode == 'N') {
+                mode = 'C';
+                commonData->keydata[1].label = "EDIT";
+            } else {
+                mode = 'N';
+                commonData->keydata[1].label = "ALARM";
+            }
+            return 0;
+        }
+        if (key == 11) { // Code for keylock
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+#endif
+
+    void displayNew(PageData &pageData){
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
 
     int displayPage(PageData &pageData){
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
-    
-        // Old values for hold function
-        static String OldDataText[HowManyValues] = {"", "", "","", "", "","", "", ""};
-        static String OldDataUnits[HowManyValues] = {"", "", "","", "", "","", "", ""};
 
-        // Get config data
+        // Logging boat values
-        String lengthformat = config->getString(config->lengthFormat);
+        logger->logDebug(GwLog::LOG, "Drawing at PageAutopilot; Mode=%c", mode);
-        // bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        
-        GwApi::BoatValue *bvalue;
-        String DataName[HowManyValues];
-        double DataValue[HowManyValues];
-        bool DataValid[HowManyValues];
-        String DataText[HowManyValues];
-        String DataUnits[HowManyValues];
-        String DataFormat[HowManyValues];
-        FormattedData TheFormattedData;
-
-        for (int i = 0; i < HowManyValues; i++){
-            bvalue = pageData.values[i];
-            TheFormattedData = formatValue(bvalue, *commonData);   
-            DataName[i] = xdrDelete(bvalue->getName());
-            DataName[i] = DataName[i].substring(0, 6);  // String length limit for value name
-            DataUnits[i] = formatValue(bvalue, *commonData).unit;   
-            DataText[i] = TheFormattedData.svalue;  // Formatted value as string including unit conversion and switching decimal places
-            DataValue[i] = TheFormattedData.value;  // Value as double in SI unit
-            DataValid[i] = bvalue->valid;
-            DataFormat[i] = bvalue->getFormat();    // Unit of value
-            LOG_DEBUG(GwLog::LOG,"Drawing at PageAutopilot: %d %s %f %s %s",  i,  DataName[i], DataValue[i], DataFormat[i], DataText[i] );
-        }
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
-
-        if (bvalue == NULL) return PAGE_OK; // WTF why this statement?
-        
-        //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height());
-        getdisplay().setTextColor(commonData->fgcolor);
 
-        // Horizontal line 2 pix top & bottom
+       if (mode == 'N') {
-        // Print data on top half
+           displayModeNormal(pageData);
-        getdisplay().fillRect(0, 130, 400, 2, commonData->fgcolor); 
+       } else if (mode == 'C') {
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+           displayModeConfig();
-        getdisplay().setCursor(10, 70);
+       }
-        getdisplay().print(DataName[WhichDataDisplay]);                         // Page name
-        // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 120);
-        getdisplay().print(DataUnits[WhichDataDisplay]); 
-        getdisplay().setCursor(190, 120);
-        getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
-  
-        if(holdvalues == false){
-            getdisplay().print(DataText[WhichDataDisplay]);                     // Real value as formated string
-        }
-        else{
-            getdisplay().print(OldDataText[WhichDataDisplay]);                  // Old value as formated string
-        }
-        if(DataValid[WhichDataDisplay] == true){
-            OldDataText[WhichDataDisplay] = DataText[WhichDataDisplay];         // Save the old value
-            OldDataUnits[WhichDataDisplay] = DataUnits[WhichDataDisplay];       // Save the old unit
-        }
-
-        // Now draw compass band                
-        // Get the data
-        double TheAngle = DataValue[WhichDataCompass];
-        static double AvgAngle = 0;
-        AvgAngle = ( AvgAngle * AverageValues + TheAngle ) / (AverageValues + 1 );
-
-        int TheTrend = round( ( TheAngle - AvgAngle) * 180.0 / M_PI );
-
-        static const int bsize = 30;
-        char buffer[bsize+1];
-        buffer[0]=0;              
-
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(10, Compass_Y0-60);
-        getdisplay().print(DataName[WhichDataCompass]);                         // Page name
- 
-     
-        // Draw compass base line and pointer
-        getdisplay().fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);            
-        getdisplay().fillTriangle(Compass_X0,Compass_Y0-40,Compass_X0-10,Compass_Y0-80,Compass_X0+10,Compass_Y0-80,commonData->fgcolor);
-        // Draw trendlines
-        for ( int i = 1; i < abs(TheTrend) / 2; i++){
-            int x1;
-            if ( TheTrend < 0 )
-                    x1 = Compass_X0 +  20 * i;
-            else
-                    x1 = Compass_X0 - 20 * ( i + 1 );
-
-            getdisplay().fillRect(x1, Compass_Y0 -55, 10, 6, commonData->fgcolor);            
-                }          
-        // Central line +  satellite lines
-        double NextSector = round(TheAngle / ( M_PI / 9 )) * ( M_PI / 9 );  // Get the next 20degree value
-        double Offset = - ( NextSector -  TheAngle);                        // Offest of the center line compared to TheAngle in Radian
-        
-        int Delta_X = int (  Offset * 180.0 / M_PI  * Compass_LineDelta );
-        for ( int i = 0; i <=4; i++ ){
-                int x0;
-                x0 = Compass_X0 + Delta_X + 2 * i * 5 * Compass_LineDelta;
-                getdisplay().fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
-                x0 = Compass_X0 + Delta_X + ( 2 * i + 1 ) * 5 * Compass_LineDelta;
-                getdisplay().fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
-
-                x0 = Compass_X0 + Delta_X - 2 * i * 5 * Compass_LineDelta;
-                getdisplay().fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
-                x0 = Compass_X0 + Delta_X - ( 2 * i + 1 ) * 5 * Compass_LineDelta;
-                getdisplay().fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
-            }
-
-        getdisplay().fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);
-        // Add the numbers to the compass band
-        int x0;
-        float AngleToDisplay = NextSector * 180.0 / M_PI;
-
-        x0 = Compass_X0 + Delta_X;
-        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-
-        do {
-                getdisplay().setCursor(x0 - 40, Compass_Y0 + 40);
-                snprintf(buffer,bsize,"%03.0f", AngleToDisplay);
-                getdisplay().print(buffer);
-                AngleToDisplay += 20;
-                if ( AngleToDisplay >= 360.0 )
-                    AngleToDisplay -= 360.0;
-                x0 -= 4 * 5 * Compass_LineDelta;
-        } while (  x0 >= 0 - 60  );
-        
-        AngleToDisplay = NextSector * 180.0 / M_PI - 20;
-        if ( AngleToDisplay < 0 )
-            AngleToDisplay += 360.0;
-
-        x0 = Compass_X0 + Delta_X + 4 * 5 * Compass_LineDelta;
-        do {
-            getdisplay().setCursor(x0 - 40, Compass_Y0 + 40);
-            snprintf(buffer,bsize,"%03.0f", AngleToDisplay);
-            // Quick and dirty way to prevent wrapping text in next line
-            if ( ( x0 - 40 ) > 380 )
-                buffer[0] = 0;
-            else if ( ( x0 - 40 )  > 355 )
-                    buffer[1] = 0;
-            else if ( ( x0 - 40 )  >  325 ) 
-                buffer[2] = 0;
-                
-            getdisplay().print(buffer);             
-
-            AngleToDisplay -= 20;
-            if ( AngleToDisplay < 0 )
-                AngleToDisplay += 360.0;
-            x0 += 4 * 5 * Compass_LineDelta;
-        } while (x0 < ( 400 - 20 -40 ) );
-
-        // static int x_test = 320;
-        // x_test += 2;
-
-        // snprintf(buffer,bsize,"%03d", x_test);
-        // getdisplay().setCursor(x_test, Compass_Y0 - 60);
-        // getdisplay().print(buffer);
-        // if ( x_test > 390)
-        //     x_test = 320;
 
         return PAGE_UPDATE;
     };
-
 };
 
 static Page *createPage(CommonData &common){
     return new PageAutopilot(common);
-}/**
+}
+
+/**
  * with the code below we make this page known to the PageTask
  * we give it a type (name) that can be selected in the config
  * we define which function is to be called
@@ -256,8 +131,8 @@ PageDescription registerPageAutopilot(
     "Autopilot",    // Page name
     createPage,     // Action
     0,              // Number of bus values depends on selection in Web configuration
-    {"HDM","HDT", "COG", "STW", "SOG", "DBT","XTE", "DTW", "BTW"}, // Bus values we need in the page
+    {},             // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
-   true            // Show display header on/off
+    false           // Show display header on/off
 );
 
 #endif

lib/obp60task/PageBME280.cpp

@@ -1,17 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
+/***************************************************************************
+ * Page to display internal environment data
+ *   - Internal device temperature
+ *   - Athmospheric pressure
+ *   - Humidity
+ * 
+ * Supportet Sensors: BME280, BMP280, BMP180
+ * 
+ */
+
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
 class PageBME280 : public Page
 {
-    public:
+private:
-    PageBME280(CommonData &common){
+    String tempformat;
-        commonData = &common;
+    String useenvsensor;
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageBME280");
+
+public:
+    PageBME280(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageBME280");
+
+        // Get config data
+        tempformat = config->getString(config->tempFormat);
+        useenvsensor = config->getString(config->useEnvSensor);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -20,9 +39,17 @@ class PageBME280 : public Page
         return key;
     }
 
+    void displayNew(PageData &pageData) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
     int displayPage(PageData &pageData){
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
 
         double value1 = 0;
         double value2 = 0;
@@ -30,151 +57,133 @@ class PageBME280 : public Page
         String svalue1 = "";
         String svalue2 = "";
         String svalue3 = "";
-
-        // Get config data
-        String tempformat = config->getString(config->tempFormat);
-        bool simulation = config->getBool(config->useSimuData);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        String useenvsensor = config->getString(config->useEnvSensor);
         
         // Get sensor values #1
         String name1 = "Temp";                          // Value name
-        name1 = name1.substring(0, 6);                  // String length limit for value name
+        if (simulation == false) {
-        if(simulation == false){
             value1 = commonData->data.airTemperature;    // Value as double in SI unit
-        }
+        } else {
-        else{
             value1 = 23.0 + float(random(0, 10)) / 10.0;
         }
         // Display data when sensor activated
-        if((useenvsensor == "BME280") or (useenvsensor == "BMP280") or (useenvsensor == "BMP180")){
+        if ((useenvsensor == "BME280") or (useenvsensor == "BMP280")
+            or (useenvsensor == "BMP180"))
+        {
             svalue1 = String(value1, 1);                // Formatted value as string including unit conversion and switching decimal places
-        }
+        } else {
-        else{
+            svalue1 = commonData->fmt->placeholder;
-            svalue1 = "---";
         }
         String unit1 = "Deg C";                         // Unit of value
 
         // Get sensor values #2
         String name2 = "Humid";                         // Value name
-        name2 = name2.substring(0, 6);                  // String length limit for value name
+        if (simulation == false) {
-        if(simulation == false){
             value2 = commonData->data.airHumidity;       // Value as double in SI unit
-        }
+        } else {
-        else{
             value2 = 43 + float(random(0, 4));
         }
         // Display data when sensor activated
-        if(useenvsensor == "BME280"){
+        if (useenvsensor == "BME280") {
             svalue2 = String(value2, 0);                // Formatted value as string including unit conversion and switching decimal places
-        }
+        } else {
-        else{
+            svalue2 = commonData->fmt->placeholder;
-            svalue2 = "---";
         }
         String unit2 = "%";                             // Unit of value
 
         // Get sensor values #3
         String name3 = "Press";                         // Value name
-        name3 = name3.substring(0, 6);                  // String length limit for value name
+        if (simulation == false) {
-         if(simulation == false){
             value3 = commonData->data.airPressure;       // Value as double in SI unit
-        }
+        } else {
-        else{
             value3 = 1006 + float(random(0, 5));
         }
         // Display data when sensor activated
-        if((useenvsensor == "BME280") or (useenvsensor == "BMP280") or (useenvsensor == "BMP180")){
+        if ((useenvsensor == "BME280") or (useenvsensor == "BMP280")
+            or (useenvsensor == "BMP180"))
+        {
             svalue3 = String(value3 / 100, 1);          // Formatted value as string including unit conversion and switching decimal places
-        }
+        } else {
-        else{
+            svalue3 = commonData->fmt->placeholder;
-            svalue3 = "---";
         }
         String unit3 = "hPa";                          // Unit of value
 
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
-
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageBME280, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3);
+        logger->logDebug(GwLog::LOG, "Drawing at PageBME280, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 55);
+        epd->setCursor(20, 55);
-        getdisplay().print(name1);                           // Page name
+        epd->print(name1);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 90);
+        epd->setCursor(20, 90);
-        getdisplay().print(unit1);                           // Unit
+        epd->print(unit1);                           // Unit
 
         // Switch font if format for any values
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 90);
+        epd->setCursor(180, 90);
 
         // Show bus data
-        getdisplay().print(svalue1);                         // Real value as formated string
+        epd->print(svalue1);                         // Real value as formated string
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 145);
+        epd->setCursor(20, 145);
-        getdisplay().print(name2);                           // Page name
+        epd->print(name2);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 180);
+        epd->setCursor(20, 180);
-        getdisplay().print(unit2);                           // Unit
+        epd->print(unit2);                           // Unit
 
         // Switch font if format for any values
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 180);
+        epd->setCursor(180, 180);
 
         // Show bus data
-        getdisplay().print(svalue2);                         // Real value as formated string
+        epd->print(svalue2);                         // Real value as formated string
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 235);
+        epd->setCursor(20, 235);
-        getdisplay().print(name3);                           // Page name
+        epd->print(name3);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 270);
+        epd->setCursor(20, 270);
-        getdisplay().print(unit3);                           // Unit
+        epd->print(unit3);                           // Unit
 
         // Switch font if format for any values
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(140, 270);
+        epd->setCursor(140, 270);
 
         // Show bus data
-        getdisplay().print(svalue3);                         // Real value as formated string
+        epd->print(svalue3);                         // Real value as formated string
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageBarograph.cpp

@@ -0,0 +1,238 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+/*
+ * Barograph WIP
+ *   - Zoom feature
+ *   - Saves data in FRAM if available
+ */
+
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+
+class PageBarograph : public Page
+{
+private:
+    bool keylock = false;
+    bool has_fram = false;
+    String flashLED;
+    String useenvsensor;
+
+    char source = 'I'; // (I)nternal, e(X)ternal
+    const int series[5] = {75, 150, 300, 600, 900};
+    const int zoom[5] = {1, 2, 3, 6, 12};
+    int zoomindex = 4;
+    uint16_t data[336] = {0}; // current data to display
+
+    // y-axis
+    uint16_t vmin;
+    uint16_t vmax;
+    uint16_t scalemin = 1000;
+    uint16_t scalemax = 1020;
+    uint16_t scalestep = 5;
+    int hist1 = 0;  // one hour trend
+    int hist3 = 0;  // three hours trend
+
+    long refresh = 0; // millis
+
+    void loadData() {
+        // Transfer data from history to page buffer,
+        // set y-axis according to data
+        int i = zoom[zoomindex];
+
+        // get min and max values of measured data
+        vmin = data[0];
+        vmax = data[0];
+        for (int x = 0; x < 336; x++) {
+            if (data[x] != 0) {
+                if (data[x] < vmin) {
+                    vmin = data[x];
+                } else if (data[x] > vmax) {
+                    vmax = data[x];
+                }
+            }
+        }
+
+        // calculate y-axis scale
+        uint16_t diff = vmax - vmin;
+        if (diff < 20) {
+            scalestep = 5;
+        } else if (diff < 40) {
+            scalestep = 10;
+        } else {
+            scalestep = 15;
+        }
+        scalemin = vmin - (vmin % scalestep);
+        scalemax = vmax + scalestep - (vmax % scalestep);
+
+        // TODO implement history buffer
+    };
+
+public:
+    PageBarograph(CommonData &common): Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageBarograph");
+
+        // Get config data
+        useenvsensor = config->getString(common.config->useEnvSensor);
+        // possible values for internal sensor
+        static std::vector<String> sensorList = {
+            "BME280", "BMP280", "BMP180", "BMP085", "HTU21", "SHT21"
+            };
+        if (std::find(sensorList.begin(), sensorList.end(), useenvsensor) != sensorList.end()) {
+            source = 'I';
+        } else {
+            // "off" means user external data if available
+            source = 'X';
+        }
+        //common.logger->logDebug(GwLog::LOG,"Source=%s (%s)", source, useenvsensor);
+        loadData(); // initial load
+    }
+
+    int handleKey(int key) {
+        if (key == 1) {
+            // zoom in
+            if (zoomindex > 0) {
+                zoomindex -= 1;
+            }
+            return 0;
+        }
+        if (key == 2) {
+            // zoom out
+            if (zoomindex < sizeof(zoom)) {
+                zoomindex += 1;
+            }
+            return 0;
+        }
+        if (key == 11) {
+            keylock = !keylock;
+            return 0;
+        }
+        return key;
+    }
+
+    void displayNew(PageData &pageData) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
+
+        // Logging boat values
+        logger->logDebug(GwLog::LOG, "Drawing at PageBarograph");
+
+        // Draw page
+        //***********************************************************
+
+        // Set display in partial refresh mode
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+
+        // Frames 
+        epd->fillRect(0, 75, 400, 2, commonData->fgcolor);  // fillRect: x, y, w, h
+        epd->fillRect(130, 20, 2, 55, commonData->fgcolor);
+        epd->fillRect(270, 20, 2, 55, commonData->fgcolor);
+        epd->fillRect(325, 20, 2, 55, commonData->fgcolor);
+
+        epd->setTextColor(commonData->fgcolor);
+
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        if (source == 'I') {
+            drawTextCenter(360, 40, useenvsensor);
+        } else {
+            drawTextCenter(360, 40, "ext.");
+        }
+
+        // Trend
+        drawTextCenter(295, 62, "0.0");
+
+        // Alarm placeholder
+        drawTextCenter(70, 62, "Alarm Off");
+
+        // Zoom
+        int datastep = series[zoomindex];
+        String fmt;
+        if (datastep > 120) {
+            if (datastep % 60 == 0) {
+                fmt = String(datastep / 60.0, 0) + " min";
+            } else {
+                fmt = String(datastep / 60.0, 1) + " min";
+            }
+        } else {
+            fmt = String(datastep) + " s";
+        }
+        drawTextCenter(360, 62, fmt);
+
+        // Current measurement
+        epd->setFont(&Ubuntu_Bold16pt8b);
+        drawTextCenter(200, 40, String(commonData->data.airPressure / 100, 1));
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        drawTextCenter(200, 62, "hPa"); // Unit
+
+        // Diagram
+        const int xstep = 48; // x-axis-grid
+        const int x0 = 350;   // origin
+        const int y0 = 270;
+        const int w = 7 * 48;
+        const int h = 180;
+
+        // epd->drawRect(x0 - w, y0 - h, w, h, commonData->fgcolor);
+
+        // x-axis are hours
+        for (int i = 1; i <= 6; i++) {
+            String label = String(-1 * zoom[zoomindex] * i);
+            epd->drawLine(x0 - i * xstep, y0, x0 - i * xstep, y0 - h, commonData->fgcolor);
+            drawTextCenter(x0 - i * xstep, y0 - 10, label);
+        }
+
+        // y-axis
+        epd->drawLine(x0 + 5, y0, x0 + 5, y0 - h, commonData->fgcolor);  // drawLine: x1, y1, x2, y2
+        epd->drawLine(x0 - w, y0, x0 - w, y0 - h, commonData->fgcolor);
+        epd->drawLine(x0 - w - 5, y0, x0 - w - 5, y0 - h, commonData->fgcolor);
+        epd->drawLine(x0, y0, x0, y0 - h, commonData->fgcolor);
+
+        int16_t dy = 9; // px for one hPa
+        int16_t y = y0;
+        int16_t ys = scalemin;
+        while (y >= y0 - h) {
+            if (y % scalestep == 0) {
+                // big step, show label and long line
+                epd->setCursor(x0 + 10, y + 5);
+                epd->print(String(ys));
+                epd->drawLine(x0 + 5, y, x0 - w - 5, y, commonData->fgcolor);
+            } else {
+                // small step, only short lines left and right
+                epd->drawLine(x0 + 5, y, x0, y, commonData->fgcolor);
+                epd->drawLine(x0 - w - 5, y, x0 - w, y, commonData->fgcolor);
+            }
+            y -= dy;
+            ys += 1;
+        }
+
+        return PAGE_UPDATE;
+    };
+};
+
+static Page* createPage(CommonData &common){
+    return new PageBarograph(common);
+}
+
+/**
+ * with the code below we make this page known to the PageTask
+ * we give it a type (name) that can be selected in the config
+ * we define which function is to be called
+ * and we provide the number of user parameters we expect
+ * this will be number of BoatValue pointers in pageData.values
+ */
+PageDescription registerPageBarograph(
+    "Barograph",    // Page name
+    createPage,     // Action
+    0,              // No bus values needed
+    true            // Show display header on/off
+);
+
+#endif

lib/obp60task/PageBattery.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -5,20 +6,25 @@
 
 class PageBattery : public Page
 {
+private:
+    String powsensor1;
     int average = 0; // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
 
-    public:
+public:
-    PageBattery(CommonData &common){
+    PageBattery(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageBattery");
+        logger->logDebug(GwLog::LOG, "Instantiate PageBattery");
+
+        // Get config data
+        String powsensor1 = config->getString(config->usePowSensor1);
     }
 
-    virtual void setupKeys(){
+    void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "AVG";
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Change average
         if(key == 1){
             average ++;
@@ -34,10 +40,18 @@ class PageBattery : public Page
         return key;
     }
 
+    void displayNew(PageData &pageData) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
     int displayPage(PageData &pageData){
-        GwConfigHandler *config = commonData->config;
+
-        GwLog *logger = commonData->logger;
-        
         // Old values for hold function
         double value1 = 0;
         static String svalue1old = "";
@@ -48,15 +62,7 @@ class PageBattery : public Page
         double value3 = 0;
         static String svalue3old = "";
         static String unit3old = "";
-
+       
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        // bool simulation = config->getBool(config->useSimuData);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        String powsensor1 = config->getString(config->usePowSensor1);
-        bool simulation = config->getBool(config->useSimuData);
-        
         // Get voltage value
         String name1 = "VBat";                       // Value name
         if(String(powsensor1) == "INA219" || String(powsensor1) == "INA226"){
@@ -145,147 +151,141 @@ class PageBattery : public Page
         String svalue3 = String(value3);                // Formatted value as string including unit conversion and switching decimal places
         String unit3 = "W";                             // Unit of value
 
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
-
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageBattery, %s: %f, %s: %f, %s: %f, Avg: %d", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, average);
+        logger->logDebug(GwLog::LOG, "Drawing at PageBattery, %s: %f, %s: %f, %s: %f, Avg: %d", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, average);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
         // Show average settings
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
         switch (average) {
             case 0:
-                getdisplay().setCursor(60, 90);
+                epd->setCursor(60, 90);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
-                getdisplay().setCursor(60, 180);
+                epd->setCursor(60, 180);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
-                getdisplay().setCursor(60, 270);
+                epd->setCursor(60, 270);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
                 break;
             case 1:
-                getdisplay().setCursor(60, 90);
+                epd->setCursor(60, 90);
-                getdisplay().print("Avg: 10s");
+                epd->print("Avg: 10s");
-                getdisplay().setCursor(60, 180);
+                epd->setCursor(60, 180);
-                getdisplay().print("Avg: 10s");
+                epd->print("Avg: 10s");
-                getdisplay().setCursor(60, 270);
+                epd->setCursor(60, 270);
-                getdisplay().print("Avg: 10s");
+                epd->print("Avg: 10s");
                 break;
             case 2:
-                getdisplay().setCursor(60, 90);
+                epd->setCursor(60, 90);
-                getdisplay().print("Avg: 60s");
+                epd->print("Avg: 60s");
-                getdisplay().setCursor(60, 180);
+                epd->setCursor(60, 180);
-                getdisplay().print("Avg: 60s");
+                epd->print("Avg: 60s");
-                getdisplay().setCursor(60, 270);
+                epd->setCursor(60, 270);
-                getdisplay().print("Avg: 60s");
+                epd->print("Avg: 60s");
                 break;
             case 3:
-                getdisplay().setCursor(60, 90);
+                epd->setCursor(60, 90);
-                getdisplay().print("Avg: 300s");
+                epd->print("Avg: 300s");
-                getdisplay().setCursor(60, 180);
+                epd->setCursor(60, 180);
-                getdisplay().print("Avg: 300s");
+                epd->print("Avg: 300s");
-                getdisplay().setCursor(60, 270);
+                epd->setCursor(60, 270);
-                getdisplay().print("Avg: 300s");
+                epd->print("Avg: 300s");
                 break;
             default:
-                getdisplay().setCursor(60, 90);
+                epd->setCursor(60, 90);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
-                getdisplay().setCursor(60, 180);
+                epd->setCursor(60, 180);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
-                getdisplay().setCursor(60, 270);
+                epd->setCursor(60, 270);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
                 break;
         } 
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 55);
+        epd->setCursor(20, 55);
-        getdisplay().print(name1);                           // Value name
+        epd->print(name1);                           // Value name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 90);
+        epd->setCursor(20, 90);
-        getdisplay().print(unit1);                           // Unit
+        epd->print(unit1);                           // Unit
 
         // Show value
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 90);
+        epd->setCursor(180, 90);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            getdisplay().print(value1,2);                    // Real value as formated string
+            epd->print(value1,2);                    // Real value as formated string
         }
         else{
-            getdisplay().print("---");                       // No sensor data (sensor is off)
+            epd->print(commonData->fmt->placeholder);  // No sensor data (sensor is off)
         }
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 145);
+        epd->setCursor(20, 145);
-        getdisplay().print(name2);                           // Value name
+        epd->print(name2);                           // Value name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 180);
+        epd->setCursor(20, 180);
-        getdisplay().print(unit2);                           // Unit
+        epd->print(unit2);                           // Unit
 
         // Show value
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 180);
+        epd->setCursor(180, 180);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            getdisplay().print(value2,1);                    // Real value as formated string
+            epd->print(value2,1);                    // Real value as formated string
         }
         else{
-            getdisplay().print("---");                       // No sensor data (sensor is off)
+            epd->print(commonData->fmt->placeholder); // No sensor data (sensor is off)
         }
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 235);
+        epd->setCursor(20, 235);
-        getdisplay().print(name3);                           // Value name
+        epd->print(name3);                           // Value name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 270);
+        epd->setCursor(20, 270);
-        getdisplay().print(unit3);                           // Unit
+        epd->print(unit3);                           // Unit
 
         // Show value
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 270);
+        epd->setCursor(180, 270);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            getdisplay().print(value3,1);                    // Real value as formated string
+            epd->print(value3,1);                    // Real value as formated string
         }
         else{
-            getdisplay().print("---");                       // No sensor data (sensor is off)
+            epd->print(commonData->fmt->placeholder);  // No sensor data (sensor is off)
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageBattery2.cpp

@@ -1,28 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
+/***************************************************************************
+ * External battery sensors
+ */
+
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 #include "movingAvg.h"              // Lib for moving average building
 
 class PageBattery2 : public Page
 {
-bool init = false;                  // Marker for init done
+private:
-int average = 0;                    // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
+    String batVoltage;
-bool trend = true;                  // Trend indicator [0|1], 0=off, 1=on
+    int batCapacity;
-double raw = 0;
+    String batType;
+    String powerSensor;
+    bool init = false;  // Marker for init done
+    int average = 0;    // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
+    bool trend = true;  // Trend indicator [0|1], 0=off, 1=on
+    double raw = 0;
 
 public:
-    PageBattery2(CommonData &common){
+    PageBattery2(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageBattery2");
+        logger->logDebug(GwLog::LOG, "Instantiate PageBattery2");
+
+        // Get config data
+        batVoltage = config->getString(config->batteryVoltage);
+        batCapacity = config->getInt(config->batteryCapacity);
+        batType = config->getString(config->batteryType);
+        powerSensor = config->getString(config->usePowSensor1);
     }
 
-    virtual void setupKeys(){
+    void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "AVG";
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
          // Change average
         if(key == 1){
             average ++;
@@ -44,11 +60,17 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData)
+    void displayNew(PageData &pageData) {
-    {
+#ifdef BOARD_OBP60S3
-        GwConfigHandler *config = commonData->config;
+        // Clear optical warning
-        GwLog *logger = commonData->logger;
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
 
+    int displayPage(PageData &pageData) {
         // Polynominal coefficients second order for battery energy level calculation
         // index 0 = Pb, 1 = Gel, 2 = AGM, 3 = LiFePo4
         float x0[4] = {+3082.5178, +1656.1571, +1316.8766, +14986.9336};    // Offset
@@ -57,16 +79,6 @@ public:
         int batPercentage = 0;      // Battery level
         float batRange = 0;         // Range in hours
         
-        // Get config data
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String batVoltage = config->getString(config->batteryVoltage);
-        int batCapacity = config->getInt(config->batteryCapacity);
-        String batType = config->getString(config->batteryType);
-        String backlightMode = config->getString(config->backlight);
-        String powerSensor = config->getString(config->usePowSensor1);
-
         double value1 = 0;  // Battery voltage
         double value2 = 0;  // Battery current
         double value3 = 0;  // Battery power consumption
@@ -76,11 +88,11 @@ public:
         String name1 = "VBat";
 
         // Create trend value
-        if(init == false){          // Load start values for first page run
+        if (init == false) {         // Load start values for first page run
             valueTrend = commonData->data.batteryVoltage10;
             init = true;
         }
-        else{                       // Reading trend value
+        else {                       // Reading trend value
             valueTrend = commonData->data.batteryVoltage10;
         }
 
@@ -118,221 +130,224 @@ public:
         bool valid1 = true;
 
         // Battery energy level calculation
-        if(String(batType) == "Pb"){
+        if (String(batType) == "Pb") {
             batPercentage = (value1 * value1 * x2[0]) + (value1 * x1[0]) + x0[0];
-        }
+        } else if (String(batType) == "Gel") {
-        if(String(batType) == "Gel"){
             batPercentage = (value1 * value1 * x2[1]) + (value1 * x1[1]) + x0[1];
-        }
+        } else if (String(batType) == "AGM") {
-        if(String(batType) == "AGM"){
             batPercentage = (value1 * value1 * x2[2]) + (value1 * x1[2]) + x0[2];
-        }
+        } else if (String(batType) == "LiFePo4") {
-        if(String(batType) == "LiFePo4"){
             batPercentage = (value1 * value1 * x2[3]) + (value1 * x1[3]) + x0[3];
         }
+
         // Limits for battery level
-        if(batPercentage < 0) batPercentage = 0;
+        if (batPercentage < 0) {
-        if(batPercentage > 99) batPercentage = 99;
+            batPercentage = 0;
+        } else if (batPercentage > 99) {
+            batPercentage = 99;
+        }
 
         // Battery range calculation
-        if(value2 <= 0) value2 = 0.0000001; // Limiting current
+        if (value2 <= 0) {
+            value2 = 0.0000001; // Limiting current
+        }
         batRange = batCapacity * batPercentage / 100 / value2;
+
         // Limits for battery range
-        if(batRange < 0) batRange = 0;
+        if (batRange < 0) {
-        if(batRange > 99) batRange = 99;
+            batRange = 0;
+        } else if (batRange > 99) {
+            batRange = 99;
+        }
 
         // Optical warning by limit violation
-        if(String(flashLED) == "Limit Violation"){
+        if (flashLED == "Limit Violation") {
-            // Limits for Pb battery
+            bool violation = false;
-            if(String(batType) == "Pb" && (raw < 11.8 || raw > 14.8)){
+            if (batType == "Pb") {
+                violation = (raw < 11.8 || raw > 14.8);
+            } else if (batType == "Gel") {
+                violation = (raw < 11.8 || raw > 14.4);
+            } else if (batType == "AGM") {
+                violation = (raw < 11.8 || raw > 14.7);
+            } else if (batType == "LiFePo4") {
+                violation = (raw < 12.0 || raw > 14.6);
+            }
+            if (violation) {
                 setBlinkingLED(true);
-            }
+            } else {
-            if(String(batType) == "Pb" && (raw >= 11.8 && raw <= 14.8)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for Gel battery
-            if(String(batType) == "Gel" && (raw < 11.8 || raw > 14.4)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "Gel" && (raw >= 11.8 && raw <= 14.4)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for AGM battery
-            if(String(batType) == "AGM" && (raw < 11.8 || raw > 14.7)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "AGM" && (raw >= 11.8 && raw <= 14.7)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for LiFePo4 battery
-            if(String(batType) == "LiFePo4" && (raw < 12.0 || raw > 14.6)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "LiFePo4" && (raw >= 12.0 && raw <= 14.6)){
                 setBlinkingLED(false);
                 setFlashLED(false);
             }
         }
-        
+
         // Logging voltage value
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageBattery2, Type:%s %s:=%f", batType.c_str(), name1.c_str(), raw);
+        logger->logDebug(GwLog::LOG, "Drawing at PageBattery2, Type:%s %s:=%f", batType.c_str(), name1.c_str(), raw);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print("Bat.");
+        epd->print("Bat.");
 
          // Show battery type
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(90, 65);
+        epd->setCursor(90, 65);
-        getdisplay().print(batType);
+        epd->print(batType);
 
         // Show voltage type
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 140);
+        epd->setCursor(10, 140);
-        int bvoltage = 0;
+        epd->print(batVoltage == "12V" ? "12" : "24");
-        if(String(batVoltage) == "12V") bvoltage = 12;
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        else bvoltage = 24;
+        epd->print("V");
-        getdisplay().print(bvoltage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
 
         // Show battery capacity
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 200);
+        epd->setCursor(10, 200);
-        if(batCapacity <= 999) getdisplay().print(batCapacity, 0);
+        String unit = "Ah";
-        if(batCapacity > 999) getdisplay().print(float(batCapacity/1000.0), 1);
+        if (batCapacity <= 999) {
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+            epd->print(batCapacity, 0);
-        if(batCapacity <= 999) getdisplay().print("Ah");
+        } else if (batCapacity > 999) {
-        if(batCapacity > 999) getdisplay().print("kAh");
+            epd->print(float(batCapacity/1000.0), 1);
+            unit = "kAh";
+        }
+        epd->setFont(&Ubuntu_Bold16pt8b);
+        epd->print(unit);
 
         // Show info
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 235);
+        epd->setCursor(10, 235);
-        getdisplay().print("Installed");
+        epd->print("Installed");
-        getdisplay().setCursor(10, 255);
+        epd->setCursor(10, 255);
-        getdisplay().print("Battery Type");
+        epd->print("Battery Type");
 
         // Show battery with fill level
         batteryGraphic(150, 45, batPercentage, commonData->fgcolor, commonData->bgcolor);
 
         // Show average settings
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(150, 145);
+        epd->setCursor(150, 145);
         switch (average) {
             case 0:
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
                 break;
             case 1:
-                getdisplay().print("Avg: 10s");
+                epd->print("Avg: 10s");
                 break;
             case 2:
-                getdisplay().print("Avg: 60s");
+                epd->print("Avg: 60s");
                 break;
             case 3:
-                getdisplay().print("Avg: 300s");
+                epd->print("Avg: 300s");
                 break;
             default:
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
                 break;
         } 
 
         // Show fill level in percent
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(150, 200);
+        epd->setCursor(150, 200);
-        getdisplay().print(batPercentage);
+        epd->print(batPercentage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("%");
+        epd->print("%");
 
         // Show time to full discharge
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(150, 260);
+        epd->setCursor(150, 260);
-        if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
+        if ((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false) {
-            if(batRange < 9.9) getdisplay().print(batRange, 1);
+            if (batRange < 9.9) {
-            else getdisplay().print(batRange, 0);
+                epd->print(batRange, 1);
+            } else {
+                epd->print(batRange, 0);
+            }
+        } else {
+            epd->print("--");
         }
-        else  getdisplay().print("--");
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->print("h");
-        getdisplay().print("h");
 
         // Show sensor type info
         String i2cAddr = "";
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(270, 60);
+        epd->setCursor(270, 60);
-        if(powerSensor == "off") getdisplay().print("Internal");
+        if (powerSensor == "off") {
-        if(powerSensor == "INA219"){
+            epd->print("Internal");
-            getdisplay().print("INA219");
+        } else if (powerSensor == "INA219") {
-        }
+            epd->print("INA219");
-        if(powerSensor == "INA226"){
+        } else if(powerSensor == "INA226") {
-            getdisplay().print("INA226");
+            epd->print("INA226");
             i2cAddr = " (0x" + String(INA226_I2C_ADDR1, HEX) + ")";
         }
-        getdisplay().print(i2cAddr);
+        epd->print(i2cAddr);
-        getdisplay().setCursor(270, 80);
+        epd->setCursor(270, 80);
-        getdisplay().print("Sensor Modul");
+        epd->print("Sensor Modul");
 
         // Reading bus data or using simulation data
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 140);
+        epd->setCursor(260, 140);
-        if(simulation == true){
+        if (simulation == true) {
-            if(batVoltage == "12V"){
+            value1 = batVoltage == "12V" ? 12.0 : 24.0;
-                value1 = 12.0;
-            }
-            if(batVoltage == "24V"){
-                value1 = 24.0;
-            }
             value1 += float(random(0, 5)) / 10;         // Simulation data
-            getdisplay().print(value1,1);
+            epd->print(value1,1);
-        }
+        } else {
-        else{
             // Check for valid real data, display also if hold values activated
-            if(valid1 == true || holdvalues == true){
+            if (valid1 == true || holdvalues == true) {
                 // Resolution switching
-                if(value1 <= 9.9) getdisplay().print(value1, 2);
+                if (value1 <= 9.9) {
-                if(value1 > 9.9 && value1 <= 99.9)getdisplay().print(value1, 1);
+                    epd->print(value1, 2);
-                if(value1 > 99.9) getdisplay().print(value1, 0);
+                } else if (value1 > 9.9 && value1 <= 99.9) {
-            }
+                    epd->print(value1, 1);
-            else{
+                } else if (value1 > 99.9) {
-            getdisplay().print("---");                       // Missing bus data
+                    epd->print(value1, 0);
+                }
+            } else {
+                epd->print(commonData->fmt->placeholder); // Missing bus data
             }
         }
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
+        epd->print("V");
 
         // Show actual current in A
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 200);
+        epd->setCursor(260, 200);
-        if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
+        if ((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false) {
-            if(value2 <= 9.9) getdisplay().print(value2, 2);
+            if (value2 <= 9.9) {
-            if(value2 > 9.9 && value2 <= 99.9)getdisplay().print(value2, 1);
+                epd->print(value2, 2);
-            if(value2 > 99.9) getdisplay().print(value2, 0);
+            } else if (value2 > 9.9 && value2 <= 99.9) {
+                epd->print(value2, 1);
+            } else if (value2 > 99.9) {
+                epd->print(value2, 0);
+            }
+        } else {
+            epd->print(commonData->fmt->placeholder);
         }
-        else  getdisplay().print("---");
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->print("A");
-        getdisplay().print("A");
 
         // Show actual consumption in W
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 260);
+        epd->setCursor(260, 260);
-        if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
+        if ((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false) {
-            if(value3 <= 9.9) getdisplay().print(value3, 2);
+            if(value3 <= 9.9) {
-            if(value3 > 9.9 && value3 <= 99.9)getdisplay().print(value3, 1);
+                epd->print(value3, 2);
-            if(value3 > 99.9) getdisplay().print(value3, 0);
+            } else if (value3 > 9.9 && value3 <= 99.9) {
+                epd->print(value3, 1);
+            } else if (value3 > 99.9) {
+                epd->print(value3, 0);
+            }
+        } else {
+            epd->print(commonData->fmt->placeholder);
         }
-        else  getdisplay().print("---");
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->print("W");
-        getdisplay().print("W");
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageClock.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -16,30 +17,41 @@
 
 class PageClock : public Page
 {
-bool simulation = false;
+private:
-int simtime;
+    fmtDate dateformat;
-bool keylock = false;
+    int simtime;
-char source = 'R';  // time source (R)TC | (G)PS | (N)TP
+    bool keylock = false;
-char mode = 'A';    // display mode (A)nalog | (D)igital | race (T)imer
+    char source = 'R';  // time source (R)TC | (G)PS | (N)TP
-char tz = 'L';      // time zone (L)ocal | (U)TC
+    char mode = 'A';    // display mode (A)nalog | (D)igital | race (T)imer
-double timezone = 0; // there are timezones with non int offsets, e.g. 5.5 or 5.75
+    char tz = 'L';      // time zone (L)ocal | (U)TC
-double homelat;
+    double timezone = 0; // there are timezones with non int offsets, e.g. 5.5 or 5.75
-double homelon;
+    double homelat;
-bool homevalid = false; // homelat and homelon are valid
+    double homelon;
+    bool homevalid = false; // homelat and homelon are valid
 
-    public:
+public:
-    PageClock(CommonData &common){
+    PageClock(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageClock");
+        logger->logDebug(GwLog::LOG, "Instantiate PageClock");
-        simulation = common.config->getBool(common.config->useSimuData);
+
-        timezone = common.config->getString(common.config->timeZone).toDouble();
+        // Get config data
-        homelat = common.config->getString(common.config->homeLAT).toDouble();
+        dateformat = common.fmt->getDateFormat(config->getString(config->dateFormat));
-        homelon = common.config->getString(common.config->homeLON).toDouble();
+        timezone = config->getString(config->timeZone).toDouble();
+        homelat = config->getString(config->homeLAT).toDouble();
+        homelon = config->getString(config->homeLON).toDouble();
         homevalid = homelat >= -180.0 and homelat <= 180 and homelon >= -90.0 and homelon <= 90.0;
         simtime = 38160; // time value 11:36
+
+#ifdef BOARD_OBP60S3
+        // WIP time source
+        String use_rtc = config->getString(config->useRTC);
+        if (use_rtc == "off") {
+            source = 'G';
+        }
+#endif
     }
 
-    virtual void setupKeys(){
+    void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "SRC";
         commonData->keydata[1].label = "MODE";
@@ -47,7 +59,7 @@ bool homevalid = false; // homelat and homelon are valid
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Time source
         if (key == 1) {
             if (source == 'G') {
@@ -85,10 +97,17 @@ bool homevalid = false; // homelat and homelon are valid
         return key;
     }
 
-    int displayPage(PageData &pageData)
+    void displayNew(PageData &pageData) {
-    {
+#ifdef BOARD_OBP60S3
-        GwConfigHandler *config = commonData->config;
+        // Clear optical warning
-        GwLog *logger = commonData->logger;
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         static String svalue1old = "";
         static String unit1old = "";
@@ -100,16 +119,10 @@ bool homevalid = false; // homelat and homelon are valid
         static String svalue5old = "";
         static String svalue6old = "";
 
-        double value1 = 0;
+        double value1 = 0; // GPS time
-        double value2 = 0;
+        double value2 = 0; // GPS date FIXME date defined as uint32_t!
-        double value3 = 0;
+        double value3 = 0; // HDOP
-
+        bool gpsvalid = false;
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        String dateformat = config->getString(config->dateFormat);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
 
         // Get boat values for GPS time
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
@@ -122,8 +135,8 @@ bool homevalid = false; // homelat and homelon are valid
             value1 = simtime++;                         // Simulation data for time value 11:36 in seconds
         }                                               // Other simulation data see OBP60Formatter.cpp
         bool valid1 = bvalue1->valid;                   // Valid information 
-        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
+        String unit1 = commonData->fmt->formatValue(bvalue1, *commonData).unit;        // Unit of value
         if(valid1 == true){
             svalue1old = svalue1;                       // Save old value
             unit1old = unit1;                           // Save old unit
@@ -135,8 +148,8 @@ bool homevalid = false; // homelat and homelon are valid
         name2 = name2.substring(0, 6);                  // String length limit for value name
         value2 = bvalue2->value;                        // Value as double in SI unit
         bool valid2 = bvalue2->valid;                   // Valid information 
-        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
+        String unit2 = commonData->fmt->formatValue(bvalue2, *commonData).unit;        // Unit of value
         if(valid2 == true){
             svalue2old = svalue2;                       // Save old value
             unit2old = unit2;                           // Save old unit
@@ -148,13 +161,16 @@ bool homevalid = false; // homelat and homelon are valid
         name3 = name3.substring(0, 6);                  // String length limit for value name
         value3 = bvalue3->value;                        // Value as double in SI unit
         bool valid3 = bvalue3->valid;                   // Valid information 
-        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
         if(valid3 == true){
             svalue3old = svalue3;                       // Save old value
             unit3old = unit3;                           // Save old unit
         }
 
+        // GPS date and time are valid and can be used
+        gpsvalid = (valid1 && valid2 && valid3);
+
         // Optical warning by limit violation (unused)
         if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
@@ -163,108 +179,108 @@ bool homevalid = false; // homelat and homelon are valid
 
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageClock, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
+        logger->logDebug(GwLog::LOG, "Drawing at PageClock, %s:%f,  %s:%f, %s:%f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         time_t tv = mktime(&commonData->data.rtcTime) + timezone * 3600;
         struct tm *local_tm = localtime(&tv);
 
         // Show values GPS date
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
         if (holdvalues == false) {
             if (source == 'G') {
                  // GPS value
-                 getdisplay().print(svalue2);
+                 epd->print(svalue2);
             } else if (commonData->data.rtcValid) {
                 // RTC value
                  if (tz == 'L') {
-                     getdisplay().print(formatDate(dateformat, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
+                     epd->print(formatDate(dateformat, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
                  }
                  else {
-                     getdisplay().print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday));
+                     epd->print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday));
                  }
             } else {
-                getdisplay().print("---");
+                epd->print(commonData->fmt->placeholder);
             }
         } else {
-            getdisplay().print(svalue2old);
+            epd->print(svalue2old);
         }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 95);
+        epd->setCursor(10, 95);
-        getdisplay().print("Date");                          // Name
+        epd->print("Date");                          // Name
 
         // Horizintal separator left
-        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
+        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show values GPS time
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 250);
+        epd->setCursor(10, 250);
         if (holdvalues == false) {
             if (source == 'G') {
-                getdisplay().print(svalue1); // Value
+                epd->print(svalue1); // Value
             }
             else if (commonData->data.rtcValid) {
                  if (tz == 'L') {
-                      getdisplay().print(formatTime('s', local_tm->tm_hour, local_tm->tm_min, local_tm->tm_sec));
+                      epd->print(formatTime(fmtTime::MMHHSS, local_tm->tm_hour, local_tm->tm_min, local_tm->tm_sec));
                  }
                  else {
-                      getdisplay().print(formatTime('s', commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec));
+                      epd->print(formatTime(fmtTime::MMHHSS, commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec));
                  }
             } else {
-                getdisplay().print("---");
+                epd->print(commonData->fmt->placeholder);
             }
         }
         else {
-             getdisplay().print(svalue1old);
+             epd->print(svalue1old);
         }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 220);
+        epd->setCursor(10, 220);
-        getdisplay().print("Time");                          // Name
+        epd->print("Time");                          // Name
 
         // Show values sunrise
-        String sunrise = "---";
+        String sunrise = commonData->fmt->placeholder;
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
+        if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
             sunrise = String(commonData->sundata.sunriseHour) + ":" + String(commonData->sundata.sunriseMinute + 100).substring(1);
             svalue5old = sunrise;
         } else if (simulation) {
             sunrise = String("06:42");
         }
 
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 65);
+        epd->setCursor(335, 65);
-        if(holdvalues == false) getdisplay().print(sunrise); // Value
+        if(holdvalues == false) epd->print(sunrise); // Value
-        else getdisplay().print(svalue5old);
+        else epd->print(svalue5old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 95);
+        epd->setCursor(335, 95);
-        getdisplay().print("SunR");                          // Name
+        epd->print("SunR");                          // Name
 
         // Horizintal separator right
-        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
+        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show values sunset
-        String sunset = "---";
+        String sunset = commonData->fmt->placeholder;
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
+        if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
             sunset = String(commonData->sundata.sunsetHour) + ":" +  String(commonData->sundata.sunsetMinute + 100).substring(1);
             svalue6old = sunset;
         } else if (simulation) {
             sunset = String("21:03");
         }
 
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 250);
+        epd->setCursor(335, 250);
-        if(holdvalues == false) getdisplay().print(sunset);  // Value
+        if(holdvalues == false) epd->print(sunset);  // Value
-        else getdisplay().print(svalue6old);
+        else epd->print(svalue6old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 220);
+        epd->setCursor(335, 220);
-        getdisplay().print("SunS");                          // Name
+        epd->print("SunS");                          // Name
 
 //*******************************************************************************************
 
@@ -272,8 +288,8 @@ bool homevalid = false; // homelat and homelon are valid
         int rInstrument = 110;     // Radius of clock
         float pi = 3.141592;
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
 
         for(int i=0; i<360; i=i+1)
         {
@@ -301,11 +317,11 @@ bool homevalid = false; // homelat and homelon are valid
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            getdisplay().setCursor(x-w/2, y+h/2);
+            epd->setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
-                getdisplay().print(ii);
+                epd->print(ii);
             }
 
             // Draw sub scale with dots
@@ -314,7 +330,7 @@ bool homevalid = false; // homelat and homelon are valid
              if(i % 6 == 0){
                 float x1c = 200 + rInstrument*sin(i/180.0*pi);
                 float y1c = 150 - rInstrument*cos(i/180.0*pi);
-                getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+                epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
                 sinx=sin(i/180.0*pi);
                 cosx=cos(i/180.0*pi);
              }
@@ -326,31 +342,31 @@ bool homevalid = false; // homelat and homelon are valid
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                         200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
             }
         }
 
         // Print Unit in clock
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(175, 110);
+        epd->setCursor(175, 110);
         if(holdvalues == false){
-            getdisplay().print(tz == 'L' ? "LOT" : "UTC");
+            epd->print(tz == 'L' ? "LOT" : "UTC");
         }
         else{
-            getdisplay().print(unit2old); // date unit
+            epd->print(unit2old); // date unit
         }
 
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(185, 190);
+        epd->setCursor(185, 190);
         if (source == 'G') {
-            getdisplay().print("GPS");
+            epd->print("GPS");
         } else {
-            getdisplay().print("RTC");
+            epd->print("RTC");
         }
 
         // Clock values
@@ -380,7 +396,7 @@ bool homevalid = false; // homelat and homelon are valid
         if (hour > 12) {
             hour -= 12.0;
         }
-        LOG_DEBUG(GwLog::DEBUG,"... PageClock, value1: %f hour: %f minute:%f", value1, hour, minute);
+        logger->logDebug(GwLog::DEBUG, "... PageClock, value1: %f hour: %f minute:%f", value1, hour, minute);
 
         // Draw hour pointer
         float startwidth = 8;       // Start width of pointer
@@ -393,7 +409,7 @@ bool homevalid = false; // homelat and homelon are valid
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.5);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -403,7 +419,7 @@ bool homevalid = false; // homelat and homelon are valid
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.5);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
@@ -419,7 +435,7 @@ bool homevalid = false; // homelat and homelon are valid
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument - 15);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -429,14 +445,14 @@ bool homevalid = false; // homelat and homelon are valid
             float ix2 = -endwidth;
             float iy1 = -(rInstrument - 15);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageCompass.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -17,65 +18,65 @@ const int ShowSTW = 3;
 const int ShowSOG = 4;
 const int ShowDBS = 5;
 
-const int Compass_X0 = 200;         // X center point of compass band
+const int Compass_X0 = 200;         // center point of compass band
-const int Compass_Y0 = 220;         // Y position of compass lines
+const int Compass_Y0 = 220;         // position of compass lines
-const int Compass_LineLength = 22;  // Length of compass lines
+const int Compass_LineLength = 22;  // length of compass lines
-const float Compass_LineDelta = 8.0;// Compass band: 1deg = 5 Pixels, 10deg = 50 Pixels 
+const float Compass_LineDelta = 8.0;// compass band: 1deg = 5 Pixels, 10deg = 50 Pixels 
 
 class PageCompass : public Page
 {
+private:
     int WhichDataCompass = ShowHDM; 
     int WhichDataDisplay = ShowHDM; 
 
-    public:
+public:
-    PageCompass(CommonData &common){
+    PageCompass(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageCompass");
+        logger->logDebug(GwLog::LOG, "Instantiate PageCompass");
     }
 
-    virtual void setupKeys(){
+    void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "CMP";
         commonData->keydata[1].label = "SRC";
-   }
+    }
     
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
-   
+        if (key == 1) {
-        if ( key == 1 ) {
             WhichDataCompass += 1;
             if ( WhichDataCompass > ShowCOG)
                  WhichDataCompass = ShowHDM;
            return 0;
-            }
+        }
-      if ( key == 2 ) {
+        if (key == 2) {
             WhichDataDisplay += 1;
-            if ( WhichDataDisplay > ShowDBS)
+            if (WhichDataDisplay > ShowDBS)
                  WhichDataDisplay = ShowHDM;
-             }
+        }
-
+        if (key == 11) {
-        if(key == 11){
             commonData->keylock = !commonData->keylock;
             return 0;                   // Commit the key
         }
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
-    
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
+
         // Old values for hold function
         static String OldDataText[HowManyValues] = {"", "", "","", "", ""};
         static String OldDataUnits[HowManyValues] = {"", "", "","", "", ""};
 
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        // bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        
         GwApi::BoatValue *bvalue;
         String DataName[HowManyValues];
         double DataValue[HowManyValues];
@@ -87,21 +88,15 @@ class PageCompass : public Page
 
         for (int i = 0; i < HowManyValues; i++){
             bvalue = pageData.values[i];
-            TheFormattedData = formatValue(bvalue, *commonData);   
+            TheFormattedData = commonData->fmt->formatValue(bvalue, *commonData);   
             DataName[i] = xdrDelete(bvalue->getName());
             DataName[i] = DataName[i].substring(0, 6);  // String length limit for value name
-            DataUnits[i] = formatValue(bvalue, *commonData).unit;   
+            DataUnits[i] = commonData->fmt->formatValue(bvalue, *commonData).unit;   
             DataText[i] = TheFormattedData.svalue;  // Formatted value as string including unit conversion and switching decimal places
             DataValue[i] = TheFormattedData.value;  // Value as double in SI unit
             DataValid[i] = bvalue->valid;
             DataFormat[i] = bvalue->getFormat();    // Unit of value
-            LOG_DEBUG(GwLog::LOG,"Drawing at PageCompass: %d %s %f %s %s",  i,  DataName[i], DataValue[i], DataFormat[i], DataText[i] );
+            logger->logDebug(GwLog::LOG, "Drawing at PageCompass: %d %s %f %s %s",  i,  DataName[i], DataValue[i], DataFormat[i], DataText[i] );
-        }
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
         }
 
         if (bvalue == NULL) return PAGE_OK; // WTF why this statement?
@@ -109,27 +104,27 @@ class PageCompass : public Page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Horizontal line 2 pix top & bottom
         // Print data on top half
-        getdisplay().fillRect(0, 130, 400, 2, commonData->fgcolor); 
+        epd->fillRect(0, 130, 400, 2, commonData->fgcolor); 
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(10, 70);
+        epd->setCursor(10, 70);
-        getdisplay().print(DataName[WhichDataDisplay]);                         // Page name
+        epd->print(DataName[WhichDataDisplay]);                         // Page name
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 120);
+        epd->setCursor(10, 120);
-        getdisplay().print(DataUnits[WhichDataDisplay]); 
+        epd->print(DataUnits[WhichDataDisplay]); 
-        getdisplay().setCursor(190, 120);
+        epd->setCursor(190, 120);
-        getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
   
         if(holdvalues == false){
-            getdisplay().print(DataText[WhichDataDisplay]);                     // Real value as formated string
+            epd->print(DataText[WhichDataDisplay]);                     // Real value as formated string
         }
         else{
-            getdisplay().print(OldDataText[WhichDataDisplay]);                  // Old value as formated string
+            epd->print(OldDataText[WhichDataDisplay]);                  // Old value as formated string
         }
         if(DataValid[WhichDataDisplay] == true){
             OldDataText[WhichDataDisplay] = DataText[WhichDataDisplay];         // Save the old value
@@ -148,14 +143,14 @@ class PageCompass : public Page
         char buffer[bsize+1];
         buffer[0]=0;              
 
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(10, Compass_Y0-60);
+        epd->setCursor(10, Compass_Y0-60);
-        getdisplay().print(DataName[WhichDataCompass]);                         // Page name
+        epd->print(DataName[WhichDataCompass]);                         // Page name
  
      
         // Draw compass base line and pointer
-        getdisplay().fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);            
+        epd->fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);            
-        getdisplay().fillTriangle(Compass_X0,Compass_Y0-40,Compass_X0-10,Compass_Y0-80,Compass_X0+10,Compass_Y0-80,commonData->fgcolor);
+        epd->fillTriangle(Compass_X0,Compass_Y0-40,Compass_X0-10,Compass_Y0-80,Compass_X0+10,Compass_Y0-80,commonData->fgcolor);
         // Draw trendlines
         for ( int i = 1; i < abs(TheTrend) / 2; i++){
             int x1;
@@ -164,7 +159,7 @@ class PageCompass : public Page
             else
                     x1 = Compass_X0 - 20 * ( i + 1 );
 
-            getdisplay().fillRect(x1, Compass_Y0 -55, 10, 6, commonData->fgcolor);            
+            epd->fillRect(x1, Compass_Y0 -55, 10, 6, commonData->fgcolor);            
                 }          
         // Central line +  satellite lines
         double NextSector = round(TheAngle / ( M_PI / 9 )) * ( M_PI / 9 );  // Get the next 20degree value
@@ -174,28 +169,28 @@ class PageCompass : public Page
         for ( int i = 0; i <=4; i++ ){
                 int x0;
                 x0 = Compass_X0 + Delta_X + 2 * i * 5 * Compass_LineDelta;
-                getdisplay().fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
+                epd->fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
                 x0 = Compass_X0 + Delta_X + ( 2 * i + 1 ) * 5 * Compass_LineDelta;
-                getdisplay().fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
+                epd->fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
 
                 x0 = Compass_X0 + Delta_X - 2 * i * 5 * Compass_LineDelta;
-                getdisplay().fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
+                epd->fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
                 x0 = Compass_X0 + Delta_X - ( 2 * i + 1 ) * 5 * Compass_LineDelta;
-                getdisplay().fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
+                epd->fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
             }
 
-        getdisplay().fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);
         // Add the numbers to the compass band
         int x0;
         float AngleToDisplay = NextSector * 180.0 / M_PI;
 
         x0 = Compass_X0 + Delta_X;
-        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
 
         do {
-                getdisplay().setCursor(x0 - 40, Compass_Y0 + 40);
+                epd->setCursor(x0 - 40, Compass_Y0 + 40);
                 snprintf(buffer,bsize,"%03.0f", AngleToDisplay);
-                getdisplay().print(buffer);
+                epd->print(buffer);
                 AngleToDisplay += 20;
                 if ( AngleToDisplay >= 360.0 )
                     AngleToDisplay -= 360.0;
@@ -208,7 +203,7 @@ class PageCompass : public Page
 
         x0 = Compass_X0 + Delta_X + 4 * 5 * Compass_LineDelta;
         do {
-            getdisplay().setCursor(x0 - 40, Compass_Y0 + 40);
+            epd->setCursor(x0 - 40, Compass_Y0 + 40);
             snprintf(buffer,bsize,"%03.0f", AngleToDisplay);
             // Quick and dirty way to prevent wrapping text in next line
             if ( ( x0 - 40 ) > 380 )
@@ -218,7 +213,7 @@ class PageCompass : public Page
             else if ( ( x0 - 40 )  >  325 ) 
                 buffer[2] = 0;
                 
-            getdisplay().print(buffer);             
+            epd->print(buffer);             
 
             AngleToDisplay -= 20;
             if ( AngleToDisplay < 0 )
@@ -230,8 +225,8 @@ class PageCompass : public Page
         // x_test += 2;
 
         // snprintf(buffer,bsize,"%03d", x_test);
-        // getdisplay().setCursor(x_test, Compass_Y0 - 60);
+        // epd->setCursor(x_test, Compass_Y0 - 60);
-        // getdisplay().print(buffer);
+        // epd->print(buffer);
         // if ( x_test > 390)
         //     x_test = 320;
 

lib/obp60task/PageDST810.cpp

@@ -1,17 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
+/***************************************************************************
+ * Page similar to Raymarine DST810 smart transducer
+ *   - Depth
+ *   - Speed
+ *   - Temperature
+ */
+
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
 class PageDST810 : public Page
 {
+private:
+    String lengthformat;
+
 public:
-    PageDST810(CommonData &common){
+    PageDST810(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageDST810");
+        logger->logDebug(GwLog::LOG, "Instantiate PageDST810");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -20,9 +34,17 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Old values for hold function
         static String svalue1old = "";
@@ -34,96 +56,81 @@ public:
         static String svalue4old = "";
         static String unit4old = "";
 
-        // Get config data
+        // Get boat values #1 DBT
-        String lengthformat = config->getString(config->lengthFormat);
+        GwApi::BoatValue *bvalue1 = pageData.values[0];
-        // bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        
-        // Get boat values #1
-        GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
         name1 = name1.substring(0, 6);                  // String length limit for value name
         double value1 = bvalue1->value;                 // Value as double in SI unit
         bool valid1 = bvalue1->valid;                   // Valid information 
-        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
+        String unit1 = commonData->fmt->formatValue(bvalue1, *commonData).unit;        // Unit of value
 
-        // Get boat values #2
+        // Get boat values #2 STW
-        GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list (only one value by PageOneValue)
+        GwApi::BoatValue *bvalue2 = pageData.values[1];
         String name2 = xdrDelete(bvalue2->getName());   // Value name
         name2 = name2.substring(0, 6);                  // String length limit for value name
         double value2 = bvalue2->value;                 // Value as double in SI unit
         bool valid2 = bvalue2->valid;                   // Valid information 
-        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
+        String unit2 = commonData->fmt->formatValue(bvalue2, *commonData).unit;        // Unit of value
 
-        // Get boat values #3
+        // Get boat values #3 Log
-        GwApi::BoatValue *bvalue3 = pageData.values[2]; // Second element in list (only one value by PageOneValue)
+        GwApi::BoatValue *bvalue3 = pageData.values[2];
         String name3 = xdrDelete(bvalue3->getName());   // Value name
         name3 = name3.substring(0, 6);                  // String length limit for value name
         double value3 = bvalue3->value;                 // Value as double in SI unit
         bool valid3 = bvalue3->valid;                   // Valid information 
-        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
 
-        // Get boat values #4
+        // Get boat values #4 WTemp
-        GwApi::BoatValue *bvalue4 = pageData.values[3]; // Second element in list (only one value by PageOneValue)
+        GwApi::BoatValue *bvalue4 = pageData.values[3];
         String name4 = xdrDelete(bvalue4->getName());   // Value name
         name4 = name4.substring(0, 6);                  // String length limit for value name
         double value4 = bvalue4->value;                 // Value as double in SI unit
         bool valid4 = bvalue4->valid;                   // Valid information 
-        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue4 = commonData->fmt->formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit4 = formatValue(bvalue4, *commonData).unit;        // Unit of value
+        String unit4 = commonData->fmt->formatValue(bvalue4, *commonData).unit;        // Unit of value
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
 
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageDST810, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
+        logger->logDebug(GwLog::LOG, "Drawing at PageDST810, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 55);
+        epd->setCursor(20, 55);
-        getdisplay().print("Depth");                         // Page name
+        epd->print("Depth");
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 90);
+        epd->setCursor(20, 90);
-        if(holdvalues == false){
+        if (holdvalues == false){
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);
-        }
+        } else {
-        else{
+            epd->print(unit1old);
-            getdisplay().print(unit1old);
         }
 
         // Set font
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 90);
+        epd->setCursor(180, 90);
 
         // Show bus data
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(svalue1);                                     // Real value as formated string
+            epd->print(svalue1);                                     // Real value as formated string
+        } else {
+            epd->print(svalue1old);                                  // Old value as formated string
         }
-        else{
+        if (valid1 == true) {
-            getdisplay().print(svalue1old);                                  // Old value as formated string
-        }
-        if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
             unit1old = unit1;                                           // Save the old unit
         }
@@ -131,37 +138,35 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 145);
+        epd->setCursor(20, 145);
-        getdisplay().print("Speed");                         // Page name
+        epd->print("Speed");
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 180);
+        epd->setCursor(20, 180);
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(unit2);                       // Unit
+            epd->print(unit2);
-        }
+        } else {
-        else{
+            epd->print(unit2old);
-            getdisplay().print(unit2old);
         }
 
         // Setfont
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 180);
+        epd->setCursor(180, 180);
 
         // Show bus data
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(svalue2);                                     // Real value as formated string
+            epd->print(svalue2);                                     // Real value as formated string
+        } else {
+            epd->print(svalue2old);                                  // Old value as formated string
         }
-        else{
+        if (valid2 == true) {
-            getdisplay().print(svalue2old);                                  // Old value as formated string
-        }
-        if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
             unit2old = unit2;                                           // Save the old unit
         }
@@ -169,37 +174,35 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 220);
+        epd->setCursor(20, 220);
-        getdisplay().print("Log");                           // Page name
+        epd->print("Log");
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 240);
+        epd->setCursor(20, 240);
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(unit3);                       // Unit
+            epd->print(unit3);
-        }
+        } else {
-        else{
+            epd->print(unit3old);
-            getdisplay().print(unit3old);
         }
 
         // Set font
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(80, 270);
+        epd->setCursor(80, 270);
 
         // Show bus data
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(svalue3);                                     // Real value as formated string
+            epd->print(svalue3);                                     // Real value as formated string
+        } else {
+            epd->print(svalue3old);                                  // Old value as formated string
         }
-        else{
+        if (valid3 == true) {
-            getdisplay().print(svalue3old);                                  // Old value as formated string
-        }
-        if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
             unit3old = unit3;                                           // Save the old unit
         }
@@ -207,37 +210,35 @@ public:
         // ############### Vertical Line ################
 
         // Vertical line 3 pix
-        getdisplay().fillRect(200, 195, 3, 75, commonData->fgcolor);
+        epd->fillRect(200, 195, 3, 75, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(220, 220);
+        epd->setCursor(220, 220);
-        getdisplay().print("Temp");                           // Page name
+        epd->print("Temp");
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(220, 240);
+        epd->setCursor(220, 240);
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(unit4);                       // Unit
+            epd->print(unit4);
-        }
+        } else {
-        else{
+            epd->print(unit4old);
-            getdisplay().print(unit4old);
         }
 
         // Set font
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(280, 270);
+        epd->setCursor(280, 270);
 
         // Show bus data
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(svalue4);                                     // Real value as formated string
+            epd->print(svalue4);                                     // Real value as formated string
+        } else {
+            epd->print(svalue4old);                                  // Old value as formated string
         }
-        else{
+        if (valid4 == true) {
-            getdisplay().print(svalue4old);                                  // Old value as formated string
-        }
-        if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value
             unit4old = unit4;                                           // Save the old unit
         }

lib/obp60task/PageDigitalOut.cpp

@@ -1,31 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include <PCF8574.h>                  // PCF8574 modules from Horter
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
-#include "images/OBP_400x300.xbm"     // OBP Logo
-#ifdef BOARD_OBP60S3
-#include "images/OBP60_400x300.xbm"   // MFD with logo
-#endif
-#ifdef BOARD_OBP40S3
-#include "images/OBP40_400x300.xbm"   // MFD with logo
-#endif
-
 class PageDigitalOut : public Page
 {
+private:
+    // Status values
+    bool button1 = false;
+    bool button2 = false;
+    bool button3 = false;
+    bool button4 = false;
+    bool button5 = false;
 
-// Status values
+    // Button labels
-bool button1 = false;
+    String name1;
-bool button2 = false;
+    String name2;
-bool button3 = false;
+    String name3;
-bool button4 = false;
+    String name4;
-bool button5 = false;
+    String name5;
 
-    public:
+public:
-    PageDigitalOut(CommonData &common){
+    PageDigitalOut(CommonData &common) : Page(common) 
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageDigitalOut");
+        logger->logDebug(GwLog::LOG, "Instantiate PageDigitalOut");
+
+        // Get config data
+        String lengthformat = config->getString(config->lengthFormat);
+        name1 = config->getString(config->mod1Out1);
+        name2 = config->getString(config->mod1Out2);
+        name3 = config->getString(config->mod1Out3);
+        name4 = config->getString(config->mod1Out4);
+        name5 = config->getString(config->mod1Out5);
     }
 
     // Set botton labels
@@ -40,64 +48,54 @@ bool button5 = false;
 
     virtual int handleKey(int key){
         // Code for keylock
-        if(key == 11){
+        if (key == 11) {
             commonData->keylock = !commonData->keylock;
-            return 0;                       // Commit the key
+            return 0;
         }
         // Code for button 1 
-        if(key == 1){
+        if (key == 1) {
             button1 = !button1;
             setPCF8574PortPinModul1(0, button1 ? 0 : 1); // Attention! Inverse logic for PCF8574
-            return 0;                       // Commit the key
+            return 0;
         }
         // Code for button 2
-        if(key == 2){
+        if (key == 2) {
             button2 = !button2;
             setPCF8574PortPinModul1(1, button2 ? 0 : 1); // Attention! Inverse logic for PCF8574
-            return 0;                       // Commit the key
+            return 0;
         }
         // Code for button 3
-        if(key == 3){
+        if (key == 3) {
             button3 = !button3;
             setPCF8574PortPinModul1(2, button3 ? 0 : 1); // Attention! Inverse logic for PCF8574
-            return 0;                       // Commit the key
+            return 0;
         }
         // Code for button 4
-        if(key == 4){
+        if (key == 4) {
             button4 = !button4;
             setPCF8574PortPinModul1(3, button4 ? 0 : 1); // Attention! Inverse logic for PCF8574
-            return 0;                       // Commit the key
+            return 0;
         }
         // Code for button 5
-        if(key == 5){
+        if (key == 5) {
             button5 = !button5;
             setPCF8574PortPinModul1(4, button5 ? 0 : 1); // Attention! Inverse logic for PCF8574
-            return 0;                       // Commit the key
+            return 0;
         }
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
-
+        if (flashLED == "Limit Violation") {
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        String name1 = config->getString(config->mod1Out1);
-        String name2 = config->getString(config->mod1Out2);
-        String name3 = config->getString(config->mod1Out3);
-        String name4 = config->getString(config->mod1Out4);
-        String name5 = config->getString(config->mod1Out5);
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
-            setFlashLED(false); 
+            setFlashLED(false);
         }
+#endif
+    };
+
+    int displayPage(PageData &pageData){
 
         // Logging boat values
         LOG_DEBUG(GwLog::LOG,"Drawing at PageDigitalOut");
@@ -106,20 +104,23 @@ bool button5 = false;
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-        getdisplay().setTextColor(commonData->fgcolor);
+
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setTextColor(commonData->fgcolor);
-        // Write text
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(100, 50 + 8);
+
-        getdisplay().print(name1);
+        // Draw labels
-        getdisplay().setCursor(100, 100 + 8);
+        epd->setCursor(100, 50 + 8);
-        getdisplay().print(name2);
+        epd->print(name1);
-        getdisplay().setCursor(100, 150 + 8);
+        epd->setCursor(100, 100 + 8);
-        getdisplay().print(name3);
+        epd->print(name2);
-        getdisplay().setCursor(100,200 + 8);
+        epd->setCursor(100, 150 + 8);
-        getdisplay().print(name4);
+        epd->print(name3);
-        getdisplay().setCursor(100, 250 + 8);
+        epd->setCursor(100,200 + 8);
-        getdisplay().print(name5);
+        epd->print(name4);
+        epd->setCursor(100, 250 + 8);
+        epd->print(name5);
+
         // Draw bottons
         drawButtonCenter(50, 50, 40, 27, "1", commonData->fgcolor, commonData->bgcolor, button1);
         drawButtonCenter(50, 100, 40, 27, "2", commonData->fgcolor, commonData->bgcolor, button2);

lib/obp60task/PageEPropulsion.cpp

@@ -0,0 +1,144 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+/***************************************************************************
+ * Electric propulsion (WIP)
+ *
+ *  - Current, voltage, power 
+ *  - 12, 24, 48 etc. Voltage
+ *  - rpm
+ *  - throttle position
+ *  - controller state
+ *  - error codes
+ *  - temperature engine, controller, batteries
+ */
+
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+
+class PageEPropulsion : public Page
+{
+private:
+    char mode = 'N'; // (N)ormal, (C)onfig
+
+    void displayModeNormal(PageData &pageData) {
+
+        // TBD Boatvalues: ...
+
+        logger->logDebug(GwLog::DEBUG, "Drawing at PageEPropulsion");
+
+        // Title and corner value headings
+        epd->setTextColor(commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(8, 48);
+        epd->print("Electric propulsion");
+ 
+    }
+
+    void displayModeConfig() {
+
+        epd->setTextColor(commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(8, 48);
+        epd->print("EPropulsion configuration");
+
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        // TODO menu
+
+    }
+
+public:
+    PageEPropulsion(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG,"Instantiate PageEPropulsion");
+    }
+
+    void setupKeys(){
+        Page::setupKeys();
+    }
+
+#ifdef BOARD_OBP60S3
+    int handleKey(int key){
+        if (key == 1) { // Switch between normal and config mode
+            if (mode == 'N') {
+                mode = 'C';
+            } else {
+                mode = 'N';
+            }
+            return 0;
+        }
+        if (key == 11) { // Code for keylock
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+#endif
+#ifdef BOARD_OBP40S3
+    int handleKey(int key){
+        if (key == 1) { // Switch between normal and config mode
+            if (mode == 'N') {
+                mode = 'C';
+                commonData->keydata[1].label = "EDIT";
+            } else {
+                mode = 'N';
+                commonData->keydata[1].label = "ALARM";
+            }
+            return 0;
+        }
+        if (key == 11) { // Code for keylock
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+#endif
+
+    void displayNew(PageData &pageData){
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData){
+
+        // Logging boat values
+        logger->logDebug(GwLog::LOG,"Drawing at PageEPropulsion; Mode=%c", mode);
+
+        // Set display in partial refresh mode
+        epd->setPartialWindow(0, 0, epd->width(), epd->height());
+
+       if (mode == 'N') {
+           displayModeNormal(pageData);
+       } else if (mode == 'C') {
+           displayModeConfig();
+       }
+
+        return PAGE_UPDATE;
+    };
+};
+
+static Page *createPage(CommonData &common){
+    return new PageEPropulsion(common);
+}
+
+/**
+ * with the code below we make this page known to the PageTask
+ * we give it a type (name) that can be selected in the config
+ * we define which function is to be called
+ * and we provide the number of user parameters we expect
+ * this will be number of BoatValue pointers in pageData.values
+ */
+PageDescription registerPageEPropulsion(
+    "EPropulsion",      // Page name
+    createPage, // Action
+    0,          // Number of bus values depends on selection in Web configuration
+    {}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
+    true        // Show display header on/off
+);
+
+#endif

lib/obp60task/PageFluid.cpp

@@ -1,27 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
+/***************************************************************************
+ * Analog fluid display for different types
+ *   0: Fuel
+ *   1: Water
+ *   2: Gray Water
+ *   3: Live Well
+ *   4: Oil
+ *   5: Black Water
+ *   6: Fuel Gasoline
+ *   14: Error
+ *   15: Unavailable
+ * 
+ * TODO 
+ *   - Check fluid type against connected XDR-value
+ */
+
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 #include "GwXDRMappings.h"
 
-/*
-  Fluid level view
-
-    0: "Fuel",
-    1: "Water",
-    2: "Gray Water",
-    3: "Live Well",
-    4: "Oil",
-    5: "Black Water",
-    6: "Fuel Gasoline",
-    14: "Error",
-    15: "Unavailable"
-
-TODO 
-  - Check fluid type against connected XDR-value
-
-*/
-
 #define fuel_width 16
 #define fuel_height 16
 static unsigned char fuel_bits[] = {
@@ -66,25 +65,22 @@ static unsigned char fish_bits[] = {
 
 class PageFluid : public Page
 {
-    bool simulation = false;
+private:
     double simgoto;
     double simval;
     double simstep;
-    bool holdvalues = false;
     int fluidtype;
 
-    public:
+public:
-    PageFluid(CommonData &common){
+    PageFluid(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageFluid");
+        logger->logDebug(GwLog::LOG, "Instantiate PageFluid");
-        simulation = common.config->getBool(common.config->useSimuData);
-        holdvalues = common.config->getBool(common.config->holdvalues);
         simval = double(random(0, 100));
         simgoto = double(random(0, 100));
         simstep = (simgoto - simval) / 20.0;
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -93,27 +89,22 @@ class PageFluid : public Page
         return key;
     }
 
-    virtual void displayNew(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        fluidtype = commonData->config->getInt("page" + String(pageData.pageNumber) + "fluid", 0);
+        fluidtype = config->getInt("page" + String(pageData.pageNumber) + "fluid", 0);
-        commonData->logger->logDebug(GwLog::LOG,"New PageFluid: fluidtype=%d", fluidtype);
+        logger->logDebug(GwLog::LOG, "New PageFluid: fluidtype=%d", fluidtype);
-    }
+#ifdef BOARD_OBP60S3
-
+        // Clear optical warning
-    int displayPage(PageData &pageData){
+        if (flashLED == "Limit Violation") {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
-
-        // Old values for hold function
-        static double value1old;
-
-        // Get config data
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
             setFlashLED(false);
         }
+#endif
+    }
+
+    int displayPage(PageData &pageData) {
+
+        // Old values for hold function
+        static double value1old;
 
         GwApi::BoatValue *bvalue1 = pageData.values[0];
         String name1 = bvalue1->getName();
@@ -132,23 +123,23 @@ class PageFluid : public Page
         }
 
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageFluid: value=%f", bvalue1->value);
+        logger->logDebug(GwLog::LOG, "Drawing at PageFluid: value=%f", bvalue1->value);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height());
+        epd->setPartialWindow(0, 0, epd->width(), epd->height());
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // descriptions
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 60);
+        epd->setCursor(20, 60);
-        getdisplay().print("Fluid");
+        epd->print("Fluid");
 
-        getdisplay().setCursor(300, 60);
+        epd->setCursor(300, 60);
-        getdisplay().print(xdrDelete(name1).substring(0, 6));
+        epd->print(xdrDelete(name1).substring(0, 6));
 
         // analog instrument
         // scale from -120 to 120
@@ -158,11 +149,11 @@ class PageFluid : public Page
         uint8_t r = 110;
 
         // circular frame
-        getdisplay().drawCircle(c.x, c.y, r+5, commonData->fgcolor);
+        epd->drawCircle(c.x, c.y, r+5, commonData->fgcolor);
-        getdisplay().fillCircle(c.x, c.y, r+2, commonData->fgcolor);
+        epd->fillCircle(c.x, c.y, r+2, commonData->fgcolor);
-        getdisplay().fillCircle(c.x, c.y, r-1, commonData->bgcolor);
+        epd->fillCircle(c.x, c.y, r-1, commonData->bgcolor);
         // center of pointer as dot 
-        getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
+        epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
 
         // value down centered
         char buffer[6];
@@ -176,32 +167,32 @@ class PageFluid : public Page
         // draw symbol (as bitmap)
         switch (fluidtype) {
             case 0:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, fuel_bits, fuel_width, fuel_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, fuel_bits, fuel_width, fuel_height, commonData->fgcolor);
                 break;
             case 1:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, water_bits, water_width, water_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, water_bits, water_width, water_height, commonData->fgcolor);
                 break;
             case 2: // gray water no symbol yet
-                // getdisplay().drawXBitmap(c.x-8, c.y-50, gray_bits, gray_width, gray_height, commonData->fgcolor);
+                // epd->drawXBitmap(c.x-8, c.y-50, gray_bits, gray_width, gray_height, commonData->fgcolor);
                 break;
             case 3:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, fish_bits, fish_width, fish_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, fish_bits, fish_width, fish_height, commonData->fgcolor);
                 break;
             case 4:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, oil_bits, oil_width, oil_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, oil_bits, oil_width, oil_height, commonData->fgcolor);
                 break;
             case 5:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, waste_bits, waste_width, waste_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, waste_bits, waste_width, waste_height, commonData->fgcolor);
                 break;
             case 6:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, gasoline_bits, gasoline_width, gasoline_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, gasoline_bits, gasoline_width, gasoline_height, commonData->fgcolor);
                 break;
         }
 
         Point p, pr;
 
         // scale texts
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
         p = {c.x, c.y - r + 30};
         drawTextCenter(p.x, p.y, "1/2");
         pr = rotatePoint(c, p, -60);
@@ -210,7 +201,7 @@ class PageFluid : public Page
         drawTextCenter(pr.x, pr.y, "3/4");
 
         // empty and full
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
         p = rotatePoint(c, {c.x, c.y - r + 30}, -130);
         drawTextCenter(p.x, p.y, "E");
         p = rotatePoint(c, {c.x, c.y - r + 30}, 130);
@@ -236,7 +227,7 @@ class PageFluid : public Page
                 continue;
             }
             p = rotatePoint(c, {c.x, c.y - r + 10}, angle);
-            getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
+            epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
         }
 
         // pointer
@@ -249,7 +240,7 @@ class PageFluid : public Page
             };
             fillPoly4(rotatePoints(c, pts, -120 + fluidlevel * 2.4), commonData->fgcolor);
             // Pointer axis is white
-            getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
+            epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
         }
  
         return PAGE_UPDATE;

lib/obp60task/PageFourValues.cpp

@@ -1,28 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
+/***************************************************************************
+ * Display four values vertical stacked
+ */
+
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
+#ifdef ENABLE_CALIBRATION
+#include "BoatDataCalibration.h"
+#endif
+
 class PageFourValues : public Page
 {
-    public:
+private:
-    PageFourValues(CommonData &common){
+    String lengthformat;
-        commonData = &common;
+
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageFourValues");
+public:
+    PageFourValues(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageFourValues");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
-        if(key == 11){
+        if(key == 11) {
             commonData->keylock = !commonData->keylock;
-            return 0;                   // Commit the key
+            return 0;
         }
         return key;
     }
 
+    void displayNew(PageData &pageData) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
     int displayPage(PageData &pageData){
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
 
         // Old values for hold function
         static String svalue1old = "";
@@ -33,22 +56,15 @@ class PageFourValues : public Page
         static String unit3old = "";
         static String svalue4old = "";
         static String unit4old = "";
-
+       
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        // bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        
         // Get boat values #1
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
         name1 = name1.substring(0, 6);                  // String length limit for value name
         double value1 = bvalue1->value;                 // Value as double in SI unit
         bool valid1 = bvalue1->valid;                   // Valid information 
-        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
+        String unit1 = commonData->fmt->formatValue(bvalue1, *commonData).unit;        // Unit of value
 
         // Get boat values #2
         GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list
@@ -56,8 +72,8 @@ class PageFourValues : public Page
         name2 = name2.substring(0, 6);                  // String length limit for value name
         double value2 = bvalue2->value;                 // Value as double in SI unit
         bool valid2 = bvalue2->valid;                   // Valid information 
-        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
+        String unit2 = commonData->fmt->formatValue(bvalue2, *commonData).unit;        // Unit of value
 
         // Get boat values #3
         GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third element in list
@@ -65,8 +81,8 @@ class PageFourValues : public Page
         name3 = name3.substring(0, 6);                  // String length limit for value name
         double value3 = bvalue3->value;                 // Value as double in SI unit
         bool valid3 = bvalue3->valid;                   // Valid information 
-        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
 
         // Get boat values #4
         GwApi::BoatValue *bvalue4 = pageData.values[3]; // Fourth element in list
@@ -74,66 +90,58 @@ class PageFourValues : public Page
         name4 = name4.substring(0, 6);                  // String length limit for value name
         double value4 = bvalue4->value;                 // Value as double in SI unit
         bool valid4 = bvalue4->valid;                   // Valid information 
-        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue4 = commonData->fmt->formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit4 = formatValue(bvalue4, *commonData).unit;        // Unit of value
+        String unit4 = commonData->fmt->formatValue(bvalue4, *commonData).unit;        // Unit of value
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
 
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageFourValues, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
+        logger->logDebug(GwLog::LOG, "Drawing at PageFourValues, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(20, 45);
+        epd->setCursor(20, 45);
-        getdisplay().print(name1);                           // Page name
+        epd->print(name1);
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 65);
+        epd->setCursor(20, 65);
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);
-        }
+        } else {
-        else{
+            epd->print(unit1old);
-            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
-        if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
+        if (bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(120, 55);
+            epd->setCursor(120, 55);
         }
-        else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
+        else if (bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(150, 58);
+            epd->setCursor(150, 58);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(180, 65);
+            epd->setCursor(180, 65);
         }
 
         // Show bus data
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(svalue1);                                     // Real value as formated string
+            epd->print(svalue1);                                     // Real value as formated string
+        } else {
+            epd->print(svalue1old);                                  // Old value as formated string
         }
-        else{
+        if (valid1 == true) {
-            getdisplay().print(svalue1old);                                  // Old value as formated string
-        }
-        if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
             unit1old = unit1;                                           // Save the old unit
         }
@@ -141,47 +149,45 @@ class PageFourValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 80, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 80, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(20, 113);
+        epd->setCursor(20, 113);
-        getdisplay().print(name2);                           // Page name
+        epd->print(name2);
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 133);
+        epd->setCursor(20, 133);
-        if(holdvalues == false){
+        if (holdvalues == false){
-            getdisplay().print(unit2);                       // Unit
+            epd->print(unit2);
-        }
+        } else {
-        else{
+            epd->print(unit2old);
-            getdisplay().print(unit2old);
         }
 
         // Switch font if format for any values
-        if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
+        if (bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(120, 123);
+            epd->setCursor(120, 123);
         }
-        else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
+        else if (bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(150, 123);
+            epd->setCursor(150, 123);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(180, 133);
+            epd->setCursor(180, 133);
         }
 
         // Show bus data
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(svalue2);                                     // Real value as formated string
+            epd->print(svalue2);                                     // Real value as formated string
+        } else {
+            epd->print(svalue2old);                                  // Old value as formated string
         }
-        else{
+        if (valid2 == true) {
-            getdisplay().print(svalue2old);                                  // Old value as formated string
-        }
-        if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
             unit2old = unit2;                                           // Save the old unit
         }
@@ -189,47 +195,46 @@ class PageFourValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 146, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 146, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(20, 181);
+        epd->setCursor(20, 181);
-        getdisplay().print(name3);                           // Page name
+        epd->print(name3);
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 201);
+        epd->setCursor(20, 201);
         if(holdvalues == false){
-            getdisplay().print(unit3);                       // Unit
+            epd->print(unit3);
         }
         else{
-            getdisplay().print(unit3old);
+            epd->print(unit3old);
         }
 
         // Switch font if format for any values
-        if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
+        if (bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(120, 191);
+            epd->setCursor(120, 191);
         }
-        else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
+        else if (bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(150, 191);
+            epd->setCursor(150, 191);
         }
-        else{
+        else {
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(180, 201);
+            epd->setCursor(180, 201);
         }
 
         // Show bus data
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(svalue3);                                     // Real value as formated string
+            epd->print(svalue3);                                     // Real value as formated string
+        } else {
+            epd->print(svalue3old);                                  // Old value as formated string
         }
-        else{
+        if (valid3 == true) {
-            getdisplay().print(svalue3old);                                  // Old value as formated string
-        }
-        if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
             unit3old = unit3;                                           // Save the old unit
         }
@@ -237,53 +242,57 @@ class PageFourValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 214, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 214, 400, 3, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(20, 249);
+        epd->setCursor(20, 249);
-        getdisplay().print(name4);                           // Page name
+        epd->print(name4);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 269);
+        epd->setCursor(20, 269);
         if(holdvalues == false){
-            getdisplay().print(unit4);                       // Unit
+            epd->print(unit4);                       // Unit
         }
         else{
-            getdisplay().print(unit4old);
+            epd->print(unit4old);
         }
 
         // Switch font if format for any values
-        if(bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude"){
+        if (bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(120, 259);
+            epd->setCursor(120, 259);
         }
-        else if(bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate"){
+        else if (bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(150, 259);
+            epd->setCursor(150, 259);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(180, 269);
+            epd->setCursor(180, 269);
         }
 
         // Show bus data
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(svalue4);                                     // Real value as formated string
+            epd->print(svalue4);                                     // Real value as formated string
+        } else {
+            epd->print(svalue4old);                                  // Old value as formated string
         }
-        else{
+        if (valid4 == true) {
-            getdisplay().print(svalue4old);                                  // Old value as formated string
-        }
-        if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value
             unit4old = unit4;                                           // Save the old unit
         }
 
         return PAGE_UPDATE;
     };
+
+    void leavePage(PageData &pageData) {
+        logger->logDebug(GwLog::LOG, "Leaving PageFourvalues");
+    }
+
 };
 
 static Page *createPage(CommonData &common){

lib/obp60task/PageFourValues2.cpp

@@ -1,28 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
+/***************************************************************************
+ * Display four values in alternative format
+ */
+
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
 class PageFourValues2 : public Page
 {
-    public:
+private:
-    PageFourValues2(CommonData &common){
+    String lengthformat;
-        commonData = &common;
+
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageFourValues2");
+public:
+    PageFourValues2(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageFourValues2");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
-        if(key == 11){
+        if (key == 11) {
-            commonData->keylock = !commonData->keylock;         // Toggle keylock
+            commonData->keylock = !commonData->keylock; // Toggle keylock
-            return 0;                   // Commit the key
+            return 0;
         }
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Old values for hold function
         static String svalue1old = "";
@@ -33,22 +52,15 @@ class PageFourValues2 : public Page
         static String unit3old = "";
         static String svalue4old = "";
         static String unit4old = "";
-
+       
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        // bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        
         // Get boat values #1
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
         name1 = name1.substring(0, 6);                  // String length limit for value name
         double value1 = bvalue1->value;                 // Value as double in SI unit
         bool valid1 = bvalue1->valid;                   // Valid information 
-        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
+        String unit1 = commonData->fmt->formatValue(bvalue1, *commonData).unit;        // Unit of value
 
         // Get boat values #2
         GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list (only one value by PageOneValue)
@@ -56,8 +68,8 @@ class PageFourValues2 : public Page
         name2 = name2.substring(0, 6);                  // String length limit for value name
         double value2 = bvalue2->value;                 // Value as double in SI unit
         bool valid2 = bvalue2->valid;                   // Valid information 
-        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
+        String unit2 = commonData->fmt->formatValue(bvalue2, *commonData).unit;        // Unit of value
 
         // Get boat values #3
         GwApi::BoatValue *bvalue3 = pageData.values[2]; // Second element in list (only one value by PageOneValue)
@@ -65,8 +77,8 @@ class PageFourValues2 : public Page
         name3 = name3.substring(0, 6);                  // String length limit for value name
         double value3 = bvalue3->value;                 // Value as double in SI unit
         bool valid3 = bvalue3->valid;                   // Valid information 
-        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
 
         // Get boat values #4
         GwApi::BoatValue *bvalue4 = pageData.values[3]; // Second element in list (only one value by PageOneValue)
@@ -74,66 +86,58 @@ class PageFourValues2 : public Page
         name4 = name4.substring(0, 6);                  // String length limit for value name
         double value4 = bvalue4->value;                 // Value as double in SI unit
         bool valid4 = bvalue4->valid;                   // Valid information 
-        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue4 = commonData->fmt->formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit4 = formatValue(bvalue4, *commonData).unit;        // Unit of value
+        String unit4 = commonData->fmt->formatValue(bvalue4, *commonData).unit;        // Unit of value
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
 
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageFourValues2, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
+        logger->logDebug(GwLog::LOG, "Drawing at PageFourValues2, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 55);
+        epd->setCursor(20, 55);
-        getdisplay().print(name1);                           // Page name
+        epd->print(name1);
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 90);
+        epd->setCursor(20, 90);
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);
-        }
+        } else {
-        else{
+            epd->print(unit1old);
-            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
-        if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
+        if (bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(100, 90);
+            epd->setCursor(100, 90);
         }
-        else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
+        else if (bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(180, 77);
+            epd->setCursor(180, 77);
         }
-        else{
+        else {
-            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-            getdisplay().setCursor(180, 90);
+            epd->setCursor(180, 90);
         }
 
         // Show bus data
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(svalue1);                                     // Real value as formated string
+            epd->print(svalue1);                                     // Real value as formated string
+        } else {
+            epd->print(svalue1old);                                  // Old value as formated string
         }
-        else{
+        if (valid1 == true) {
-            getdisplay().print(svalue1old);                                  // Old value as formated string
-        }
-        if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
             unit1old = unit1;                                           // Save the old unit
         }
@@ -141,47 +145,45 @@ class PageFourValues2 : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 145);
+        epd->setCursor(20, 145);
-        getdisplay().print(name2);                           // Page name
+        epd->print(name2);
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 180);
+        epd->setCursor(20, 180);
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(unit2);                       // Unit
+            epd->print(unit2);
-        }
+        } else{
-        else{
+            epd->print(unit2old);
-            getdisplay().print(unit2old);
         }
 
         // Switch font if format for any values
-        if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
+        if (bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(100, 180);
+            epd->setCursor(100, 180);
         }
-        else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
+        else if (bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate") {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(180, 158);
+            epd->setCursor(180, 158);
         }
-        else{
+        else {
-            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-            getdisplay().setCursor(180, 180);
+            epd->setCursor(180, 180);
         }
 
         // Show bus data
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(svalue2);                                     // Real value as formated string
+            epd->print(svalue2);                                     // Real value as formated string
+        } else {
+            epd->print(svalue2old);                                  // Old value as formated string
         }
-        else{
+        if (valid2 == true) {
-            getdisplay().print(svalue2old);                                  // Old value as formated string
-        }
-        if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
             unit2old = unit2;                                           // Save the old unit
         }
@@ -189,45 +191,45 @@ class PageFourValues2 : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 220);
+        epd->setCursor(20, 220);
-        getdisplay().print(name3);                           // Page name
+        epd->print(name3);
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 240);
+        epd->setCursor(20, 240);
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(unit3);                       // Unit
+            epd->print(unit3);
         }
         else{
-            getdisplay().print(unit3old);
+            epd->print(unit3old);
         }
 
         // Switch font if format for any values
-        if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
+        if (bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude") {
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(50, 240);
+            epd->setCursor(50, 240);
         }
-        else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
+        else if (bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate") {
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(100, 240);
+            epd->setCursor(100, 240);
         }
-        else{
+        else {
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(80, 270);
+            epd->setCursor(80, 270);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue3);                                     // Real value as formated string
+            epd->print(svalue3);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue3old);                                  // Old value as formated string
+            epd->print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
@@ -237,47 +239,45 @@ class PageFourValues2 : public Page
         // ############### Vertical Line ################
 
         // Vertical line 3 pix
-        getdisplay().fillRect(200, 195, 3, 75, commonData->fgcolor);
+        epd->fillRect(200, 195, 3, 75, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(220, 220);
+        epd->setCursor(220, 220);
-        getdisplay().print(name4);                           // Page name
+        epd->print(name4);
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(220, 240);
+        epd->setCursor(220, 240);
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(unit4);                       // Unit
+            epd->print(unit4);
-        }
+        } else {
-        else{
+            epd->print(unit4old);
-            getdisplay().print(unit4old);
         }
 
         // Switch font if format for any values
-        if(bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude"){
+        if (bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude") {
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(250, 240);
+            epd->setCursor(250, 240);
         }
-        else if(bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate"){
+        else if (bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate") {
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(300, 240);
+            epd->setCursor(300, 240);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(280, 270);
+            epd->setCursor(280, 270);
         }
 
         // Show bus data
-        if(holdvalues == false){
+        if (holdvalues == false) {
-            getdisplay().print(svalue4);                                     // Real value as formated string
+            epd->print(svalue4);                                     // Real value as formated string
+        } else {
+            epd->print(svalue4old);                                  // Old value as formated string
         }
-        else{
+        if (valid4 == true) {
-            getdisplay().print(svalue4old);                                  // Old value as formated string
-        }
-        if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value
             unit4old = unit4;                                           // Save the old unit
         }

lib/obp60task/PageGenerator.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,12 +7,23 @@
 
 class PageGenerator : public Page
 {
+private:
+    String batVoltage;
+    int genPower;
+    String powerSensor;
+
 public:
-    PageGenerator(CommonData &common){
+    PageGenerator(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageGenerator");
+        logger->logDebug(GwLog::LOG, "Instantiate PageGenerator");
+
+        // Get config data
+        batVoltage = config->getString(config->batteryVoltage);
+        genPower = config->getInt(config->genPower);
+        powerSensor = config->getString(config->usePowSensor3);
     }
-    virtual int handleKey(int key){
+
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -20,20 +32,8 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData)
+    int displayPage(PageData &pageData) {
-    {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
         
-        // Get config data
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String batVoltage = config->getString(config->batteryVoltage);
-        int genPower = config->getInt(config->genPower);
-        String backlightMode = config->getString(config->backlight);
-        String powerSensor = config->getString(config->usePowSensor3);
-
         double value1 = 0;  // Solar voltage
         double value2 = 0;  // Solar current
         double value3 = 0;  // Solar output power
@@ -60,100 +60,95 @@ public:
         bool valid1 = true;
 
         // Optical warning by limit violation
-        if(String(flashLED) == "Limit Violation"){
+        if (flashLED == "Limit Violation") {
-            // Over voltage
+            // Over voltage?
-            if(value1 > 14.8 && batVoltage == "12V"){
+            if (batVoltage == "12V") {
-                setBlinkingLED(true);
+                setBlinkingLED(value1 > 14.8);
-            }
+            } else if (batVoltage == "24V") {
-            if(value1 <= 14.8 && batVoltage == "12V"){
+                setBlinkingLED(value1 > 29.6);
+            } else {
                 setBlinkingLED(false);
             }
-            if(value1 > 29.6 && batVoltage == "24V"){
-                setBlinkingLED(true);
-            }
-            if(value1 <= 29.6 && batVoltage == "24V"){
-                setBlinkingLED(false);
-            }     
         }
-        
+
         // Logging voltage value
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageGenerator, Type:%iW %s:=%f", genPower, name1.c_str(), value1);
+        logger->logDebug(GwLog::LOG, "Drawing at PageGenerator, Type:%iW %s:=%f", genPower, name1.c_str(), value1);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print("Power");
+        epd->print("Power");
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(12, 82);
+        epd->setCursor(12, 82);
-        getdisplay().print("Generator");
+        epd->print("Generator");
 
         // Show voltage type
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 140);
+        epd->setCursor(10, 140);
         int bvoltage = 0;
         if(String(batVoltage) == "12V") bvoltage = 12;
         else bvoltage = 24;
-        getdisplay().print(bvoltage);
+        epd->print(bvoltage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
+        epd->print("V");
 
         // Show solar power
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 200);
+        epd->setCursor(10, 200);
-        if(genPower <= 999) getdisplay().print(genPower, 0);
+        if(genPower <= 999) epd->print(genPower, 0);
-        if(genPower > 999) getdisplay().print(float(genPower/1000.0), 1);
+        if(genPower > 999) epd->print(float(genPower/1000.0), 1);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        if(genPower <= 999) getdisplay().print("W");
+        if(genPower <= 999) epd->print("W");
-        if(genPower > 999) getdisplay().print("kW");
+        if(genPower > 999) epd->print("kW");
 
         // Show info
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 235);
+        epd->setCursor(10, 235);
-        getdisplay().print("Installed");
+        epd->print("Installed");
-        getdisplay().setCursor(10, 255);
+        epd->setCursor(10, 255);
-        getdisplay().print("Power Modul");
+        epd->print("Power Modul");
 
         // Show generator
         generatorGraphic(200, 95, commonData->fgcolor, commonData->bgcolor);
 
         // Show load level in percent
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(150, 200);
+        epd->setCursor(150, 200);
-        getdisplay().print(genPercentage);
+        epd->print(genPercentage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("%");
+        epd->print("%");
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(150, 235);
+        epd->setCursor(150, 235);
-        getdisplay().print("Load");
+        epd->print("Load");
 
         // Show sensor type info
         String i2cAddr = "";
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(270, 60);
+        epd->setCursor(270, 60);
-        if(powerSensor == "off") getdisplay().print("Internal");
+        if(powerSensor == "off") epd->print("Internal");
         if(powerSensor == "INA219"){
-            getdisplay().print("INA219");
+            epd->print("INA219");
             i2cAddr = " (0x" + String(INA219_I2C_ADDR3, HEX) + ")";
         }
         if(powerSensor == "INA226"){
-            getdisplay().print("INA226");
+            epd->print("INA226");
             i2cAddr = " (0x" + String(INA226_I2C_ADDR3, HEX) + ")";
         }
-        getdisplay().print(i2cAddr);
+        epd->print(i2cAddr);
-        getdisplay().setCursor(270, 80);
+        epd->setCursor(270, 80);
-        getdisplay().print("Sensor Modul");
+        epd->print("Sensor Modul");
 
         // Reading bus data or using simulation data
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 140);
+        epd->setCursor(260, 140);
         if(simulation == true){
             if(batVoltage == "12V"){
                 value1 = 12.0;
@@ -162,46 +157,59 @@ public:
                 value1 = 24.0;
             }
             value1 += float(random(0, 5)) / 10;         // Simulation data
-            getdisplay().print(value1,1);
+            epd->print(value1,1);
         }
         else{
             // Check for valid real data, display also if hold values activated
             if(valid1 == true || holdvalues == true){
                 // Resolution switching
-                if(value1 <= 9.9) getdisplay().print(value1, 2);
+                if(value1 <= 9.9) epd->print(value1, 2);
-                if(value1 > 9.9 && value1 <= 99.9)getdisplay().print(value1, 1);
+                if(value1 > 9.9 && value1 <= 99.9)epd->print(value1, 1);
-                if(value1 > 99.9) getdisplay().print(value1, 0);
+                if(value1 > 99.9) epd->print(value1, 0);
             }
             else{
-            getdisplay().print("---");                       // Missing bus data
+                epd->print(commonData->fmt->placeholder); // Missing bus data
             }
         }
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
+        epd->print("V");
 
         // Show actual current in A
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 200);
+        epd->setCursor(260, 200);
-        if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
+        if ((powerSensor == "INA219" || powerSensor == "INA226") && (simulation == false)) {
-            if(value2 <= 9.9) getdisplay().print(value2, 2);
+            // TODO use formatter for this?
-            if(value2 > 9.9 && value2 <= 99.9)getdisplay().print(value2, 1);
+            if (value2 <= 9.9) {
-            if(value2 > 99.9) getdisplay().print(value2, 0);
+                epd->print(value2, 2);
+            } else if (value2 <= 99.9) {
+                epd->print(value2, 1);
+            } else {
+                epd->print(value2, 0);
+            }
         }
-        else  getdisplay().print("---");
+        else {
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+            epd->print(commonData->fmt->placeholder);
-        getdisplay().print("A");
+        }
+        epd->setFont(&Ubuntu_Bold16pt8b);
+        epd->print("A");
 
         // Show actual consumption in W
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 260);
+        epd->setCursor(260, 260);
-        if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
+        if ((powerSensor == "INA219" || powerSensor == "INA226") && (simulation == false)) {
-            if(value3 <= 9.9) getdisplay().print(value3, 2);
+            if(value3 <= 9.9) {
-            if(value3 > 9.9 && value3 <= 99.9)getdisplay().print(value3, 1);
+                epd->print(value3, 2);
-            if(value3 > 99.9) getdisplay().print(value3, 0);
+            } else if (value3 <= 99.9) {
+                epd->print(value3, 1);
+            } else {
+                epd->print(value3, 0);
+            }
         }
-        else  getdisplay().print("---");
+        else {
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+            epd->print(commonData->fmt->placeholder);
-        getdisplay().print("W");
+        }
+        epd->setFont(&Ubuntu_Bold16pt8b);
+        epd->print("W");
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageKeelPosition.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -5,14 +6,24 @@
 
 class PageKeelPosition : public Page
 {
+private:
+    String lengthformat;
+    String rotsensor;
+    String rotfunction;
+
 public:
-    PageKeelPosition(CommonData &common){
+    PageKeelPosition(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageKeelPosition");
+        logger->logDebug(GwLog::LOG, "Instantiate PageKeelPosition");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
+        rotsensor = config->getString(config->useRotSensor);
+        rotfunction = config->getString(config->rotFunction);
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -21,23 +32,21 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData)
+    void displayNew(PageData &pageData) {
-    {
+#ifdef BOARD_OBP60S3
-        GwConfigHandler *config = commonData->config;
+        // Clear optical warning
-        GwLog *logger = commonData->logger;
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         double value1 = 0;
         double value1old = 0;
 
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        String rotsensor = config->getString(config->useRotSensor);
-        String rotfunction = config->getString(config->rotFunction);
-
         // Get boat values for Keel position
         bool valid1 = commonData->data.validRotAngle;    // Valid information 
         if(simulation == false && rotsensor == "AS5600" && rotfunction == "Keel"){
@@ -55,20 +64,14 @@ public:
             value1old = value1;   	                    // Save old value
         }
 
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
-
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageKeelPosition, Keel:%f", value1);
+        logger->logDebug(GwLog::LOG, "Drawing at PageKeelPosition, Keel:%f", value1);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
 //*******************************************************************************************
         
@@ -76,9 +79,9 @@ public:
         int rInstrument = 110;     // Radius of KeelPosition
         float pi = 3.141592;
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);       // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);       // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
-        getdisplay().fillRect(0, 30, 400, 122, commonData->bgcolor);                    // Delete half top circle
+        epd->fillRect(0, 30, 400, 122, commonData->bgcolor);                    // Delete half top circle
 
         for(int i=90; i<=270; i=i+10)
         {
@@ -105,17 +108,17 @@ public:
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            getdisplay().setCursor(x-w/2, y+h/2);
+            epd->setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                getdisplay().setFont(&Ubuntu_Bold8pt8b);
+                epd->setFont(&Ubuntu_Bold8pt8b);
-                getdisplay().print(ii);
+                epd->print(ii);
             }
 
             // Draw sub scale with dots
             float x1c = 200 + rInstrument*sin(i/180.0*pi);
             float y1c = 150 - rInstrument*cos(i/180.0*pi);
-            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*pi);
             float cosx=cos(i/180.0*pi); 
 
@@ -126,10 +129,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                         200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
             }
@@ -163,7 +166,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.6); 
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -173,36 +176,36 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.6);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
 
             // Draw counterweight
-            getdisplay().fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
+            epd->fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 140, startwidth + 22, commonData->bgcolor);
+        epd->fillCircle(200, 140, startwidth + 22, commonData->bgcolor);
-        getdisplay().fillCircle(200, 140, startwidth + 20, commonData->fgcolor);      // Boat circle
+        epd->fillCircle(200, 140, startwidth + 20, commonData->fgcolor);      // Boat circle
-        getdisplay().fillRect(200 - 30, 140 - 30, 2 * 30, 30, commonData->bgcolor);   // Delete half top of boat circle
+        epd->fillRect(200 - 30, 140 - 30, 2 * 30, 30, commonData->bgcolor);   // Delete half top of boat circle
-        getdisplay().fillRect(150, 150, 100, 4, commonData->fgcolor);                 // Water line
+        epd->fillRect(150, 150, 100, 4, commonData->fgcolor);                 // Water line
 
         // Print label
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(100, 70);
+        epd->setCursor(100, 70);
-        getdisplay().print("Keel Position");                 // Label
+        epd->print("Keel Position");                 // Label
 
         if((rotsensor == "AS5600" && rotfunction == "Keel" && (valid1 == true || holdvalues == true)) || simulation == true){
             // Print Unit of keel position
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(175, 110);
+            epd->setCursor(175, 110);
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);                       // Unit
         }
         else{
             // Print Unit of keel position
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(145, 110);
+            epd->setCursor(145, 110);
-            getdisplay().print("No sensor data");            // Info missing sensor
+            epd->print("No sensor data");            // Info missing sensor
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageNavigation.cpp

@@ -4,8 +4,7 @@
 #include "OBP60Extensions.h"
 #include "NetworkClient.h"      // Network connection
 #include "ImageDecoder.h"       // Image decoder for navigation map
-
+#include <mbedtls/base64.h>
-#include "Logo_OBP_400x300_sw.h"
 
 // Defines for reading of navigation map 
 #define JSON_BUFFER 30000       // Max buffer size for JSON content (30 kB picture + values)
@@ -14,34 +13,65 @@ ImageDecoder decoder;           // Define image decoder
 
 class PageNavigation : public Page
 {
-// Values for buttons
+private:
-bool firstRun = true;    // Detect the first page run
+
-int zoom = 15;           // Default zoom level
+    // Values for buttons
-bool showValues = false; // Show values HDT, SOG, DBT in navigation map
+    bool firstRun = true;    // Detect the first page run
+    int zoom = 15;           // Default zoom level
+    bool showValues = false; // Show values HDT, SOG, DBT in navigation map
 
-    private:
     uint8_t* imageBackupData = nullptr;
     int imageBackupWidth = 0;
     int imageBackupHeight = 0;
     size_t imageBackupSize = 0;
+    size_t imageBackupCapacity = 0;
     bool hasImageBackup = false;
+    bool imageBackupIsRgb565 = false;
+
+    String lengthformat;
+    String mapsource;
+    String ipAddress;
+    int localPort;
+    String mapType;
+    int zoomLevel;
+    bool grid;
+    String orientation;
+    int refreshDistance;
+    bool showValuesMap;
+    bool ownHeading;
+
+public:
+    PageNavigation(CommonData &common) : Page(common) 
+    {
+        logger->logDebug(GwLog::LOG,"Instantiate PageNavigation");
+
+        imageBackupCapacity = (size_t) epd->width() * (size_t) epd->height();
+        imageBackupData = (uint8_t*)heap_caps_malloc(imageBackupCapacity, MALLOC_CAP_SPIRAM);
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
+        mapsource = config->getString(config->mapsource);
+        ipAddress = config->getString(config->ipAddress);
+        localPort = config->getInt(config->localPort);
+        mapType = config->getString(config->maptype);
+        zoomLevel = config->getInt(config->zoomlevel);
+        grid = config->getBool(config->grid);
+        orientation = config->getString(config->orientation);
+        refreshDistance = config->getInt(config->refreshDistance);
+        showValuesMap = config->getBool(config->showvalues);
+        ownHeading = config->getBool(config->ownheading);
 
-    public:
-    PageNavigation(CommonData &common){
-        commonData = &common;
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageNavigation");
-        imageBackupData = (uint8_t*)heap_caps_malloc((GxEPD_WIDTH * GxEPD_HEIGHT), MALLOC_CAP_SPIRAM);
     }
 
     // Set botton labels
-    virtual void setupKeys(){
+    void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "ZOOM -";
         commonData->keydata[1].label = "ZOOM +";
         commonData->keydata[4].label = "VALUES";
     }
     
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -70,31 +100,22 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
 
-        // Get config data
+    int displayPage(PageData &pageData) {
-        String lengthformat = config->getString(config->lengthFormat);
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        String mapsource = config->getString(config->mapsource);
-        String ipAddress = config->getString(config->ipAddress);
-        int localPort = config->getInt(config->localPort);
-        String mapType = config->getString(config->maptype);
-        int zoomLevel = config->getInt(config->zoomlevel);
-        bool grid = config->getBool(config->grid);
-        String orientation = config->getString(config->orientation);
-        int refreshDistance = config->getInt(config->refreshDistance);
-        bool showValuesMap = config->getBool(config->showvalues);
-        bool ownHeading = config->getBool(config->ownheading);
 
-        if(firstRun == true){
+        if (firstRun == true) {
-            zoom = zoomLevel;           // Over write zoom level with setup value
+            zoom = zoomLevel;           // Overwrite zoom level with setup value
-            showValues = showValuesMap; // Over write showValues with setup value 
+            showValues = showValuesMap; // Overwrite showValues with setup value 
-            firstRun = false;           // Restet variable
+            firstRun = false;
         }
 
         // Local variables
@@ -105,7 +126,6 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
         int mapRot = 0;
         int symbolRot = 0;
         int mapGrid = 0;
-
         
         // Old values for hold function
         static double value1old = 0;
@@ -145,8 +165,8 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
         name1 = name1.substring(0, 6);                  // String length limit for value name
         double value1 = bvalue1->value;                 // Value as double in SI unit
         bool valid1 = bvalue1->valid;                   // Valid information 
-        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
+        String unit1 = commonData->fmt->formatValue(bvalue1, *commonData).unit;        // Unit of value
 
         // Get boat values #2 Longitude
         GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list (only one value by PageOneValue)
@@ -154,8 +174,8 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
         name2 = name2.substring(0, 6);                  // String length limit for value name
         double value2 = bvalue2->value;                 // Value as double in SI unit
         bool valid2 = bvalue2->valid;                   // Valid information 
-        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
+        String unit2 = commonData->fmt->formatValue(bvalue2, *commonData).unit;        // Unit of value
 
         // Get boat values #3 HDT
         GwApi::BoatValue *bvalue3 = pageData.values[2]; // Second element in list (only one value by PageOneValue)
@@ -163,8 +183,8 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
         name3 = name3.substring(0, 6);                  // String length limit for value name
         double value3 = bvalue3->value;                 // Value as double in SI unit
         bool valid3 = bvalue3->valid;                   // Valid information 
-        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
 
         // Get boat values #4 HDM
         GwApi::BoatValue *bvalue4 = pageData.values[3]; // Second element in list (only one value by PageOneValue)
@@ -172,8 +192,8 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
         name4 = name4.substring(0, 6);                  // String length limit for value name
         double value4 = bvalue4->value;                 // Value as double in SI unit
         bool valid4 = bvalue4->valid;                   // Valid information 
-        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue4 = commonData->fmt->formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit4 = formatValue(bvalue4, *commonData).unit;        // Unit of value
+        String unit4 = commonData->fmt->formatValue(bvalue4, *commonData).unit;        // Unit of value
 
         // Get boat values #5 SOG
         GwApi::BoatValue *bvalue5 = pageData.values[4]; // Second element in list (only one value by PageOneValue)
@@ -181,8 +201,8 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
         name5 = name5.substring(0, 6);                  // String length limit for value name
         double value5 = bvalue5->value;                 // Value as double in SI unit
         bool valid5 = bvalue5->valid;                   // Valid information 
-        String svalue5 = formatValue(bvalue5, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue5 = commonData->fmt->formatValue(bvalue5, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit5 = formatValue(bvalue5, *commonData).unit;        // Unit of value
+        String unit5 = commonData->fmt->formatValue(bvalue5, *commonData).unit;        // Unit of value
 
         // Get boat values #6 DBT
         GwApi::BoatValue *bvalue6 = pageData.values[5]; // Second element in list (only one value by PageOneValue)
@@ -190,18 +210,14 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
         name6 = name6.substring(0, 6);                  // String length limit for value name
         double value6 = bvalue6->value;                 // Value as double in SI unit
         bool valid6 = bvalue6->valid;                   // Valid information 
-        String svalue6 = formatValue(bvalue6, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue6 = commonData->fmt->formatValue(bvalue6, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit6 = formatValue(bvalue6, *commonData).unit;        // Unit of value
+        String unit6 = commonData->fmt->formatValue(bvalue6, *commonData).unit;        // Unit of value
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
 
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageNavigation, %s: %f, %s: %f, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4, name5.c_str(), value5, name6.c_str(), value6);
+        logger->logDebug(GwLog::LOG, "Drawing at PageNavigation, %s: %f, %s: %f, %s: %f, %s: %f, %s: %f, %s: %f",
+            name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3,
+            name4.c_str(), value4, name5.c_str(), value5, name6.c_str(), value6);
 
         // Set variables
         //***********************************************************
@@ -295,6 +311,18 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
             mType = 9;
             dType = 1;
         }
+        else if(mapType == "C-Map"){
+            mType = 103486987;
+            dType = 1;
+        }
+        else if(mapType == "Garmin Fish"){
+            mType = 113486987;
+            dType = 1;
+        }
+        else if(mapType == "Garmin Nav"){
+            mType = 123486987;
+            dType = 1;
+        }
         else{
             mType = 1;
             dType = 1;
@@ -347,22 +375,33 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
         // URL to OBP Maps Converter
         // For more details see: https://github.com/norbert-walter/maps-converter
         String url = String("http://") + server + ":" + port +  // OBP Server
-                    String("/get_image_json?") +               // Service: Output B&W picture as JSON (Base64 + gzip)
+                    String("/get_image_json?") +                // Service: Output B&W picture as JSON (Base64 + gzip)
-                    "zoom=" + zoom +   // Default zoom level: 15
+                    #ifdef DISPLAY_ST7796
+                    "oformat=3" +       // Image output format in JSON: 3=RGB565 format
+                    #else
+                    "oformat=4" +       // Image output format in JSON: 4=b/w 1-Bit format
+                    #endif                 
+                    "&zoom=" + zoom +    // Default zoom level: 15
                     "&lat=" + String(latitude, 6) +   // Latitude
                     "&lon=" + String(longitude, 6) +  // Longitude
                     "&mrot=" + mapRot + // Rotation angle navigation map in degree
                     "&mtype=" + mType + // Default Map: Open Street Map
-                    "&dtype=" + dType + // Dithering type: Atkinson dithering
+                    #ifdef DISPLAY_ST7796
-                    "&width=400" +     // With navigation map
+                    "&itype=1" +        // Image type: 1=Color
-                    "&height=250" +    // Height navigation map
+                    #else
-                    "&cutout=0" +      // No picture cutouts
+                    "&itype=4" +        // Image type: 4=b/w with dithering
-                    "&tab=0" +         // No tab size
+                    #endif              
-                    "&border=2" +      // Border line size: 2 pixel
+                    "&dtype=" + dType + // Dithering type: Atkinson dithering (only activ when itype=4 otherwise inactive)                   
-                    "&symbol=2" +      // Symbol: Triangle
+                    "&width=400" +      // With navigation map
+                    "&height=250" +     // Height navigation map
+                    "&cutout=0" +       // No picture cutouts (tab, border and alpha are unused when cutout=0)
+                    "&tab=0" +          // No tab size (only available when sqare cutouts selected coutout=3...7)
+                    "&border=2" +       // Border line size: 2 pixel (only available when sqare cutouts selected)
+                    "&alpha=80" +       // Alpha for tabs: 80% visible (only available when sqare cutouts selected)
+                    "&symbol=2" +       // Symbol: Triangle
                     "&srot=" + symbolRot + // Symbol rotation angle
-                    "&ssize=15" +      // Symbole size: 15 pixel
+                    "&ssize=15" +       // Symbole size: 15 pixel (center pointer)
-                    "&grid=" + mapGrid // Show grid: On
+                    "&grid=" + mapGrid  // Show grid: On
                     ;         
         
         // Draw page
@@ -371,117 +410,177 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
         // ############### Draw Navigation Map ################
         
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
+        // NEW: simple exponential backoff for 1 Hz polling (prevents connection-refused storms)
+        static uint32_t nextAllowedMs = 0;
+        static uint8_t  failCount = 0;
+
+        uint32_t now = millis();
+
+        // NEW: if we are in backoff window, skip network call and use backup immediately
+        bool allowFetch = ((int32_t)(now - nextAllowedMs) >= 0);
+        
         // If a network connection to URL then load the navigation map
-        if (net.fetchAndDecompressJson(url)) {
+        if (allowFetch && net.fetchAndDecompressJson(url)) {
 
-            auto& json = net.json();                // Extract JSON content
+            // NEW: reset backoff on success
-            int numPix = json["number_pixels"] | 0; // Read number of pixels
+            failCount = 0;
-            imgWidth = json["width"] | 0;           // Read width of image
+            nextAllowedMs = now + 1000; // keep 1 Hz on success
-            imgHeight = json["height"] | 0;         // Read height og image
 
-            const char* b64src = json["picture_base64"].as<const char*>();  // Read picture as Base64 content
+            int numPix = net.numberPixels(); // Read number of pixels
-            size_t b64len = strlen(b64src);                                 // Calculate length of Base64 content
+            imgWidth = net.imageWidth();     // Read width of image
+            imgHeight = net.imageHeight();   // Read height of image
+            size_t requiredBytesMono = 0;
+            size_t requiredBytesRgb565 = 0;
+            if (imgWidth > 0 && imgHeight > 0){
+                requiredBytesMono = (size_t)((imgWidth + 7) / 8) * (size_t)imgHeight;
+                requiredBytesRgb565 = (size_t)imgWidth * (size_t)imgHeight * 2U;
+            }
+            if (requiredBytesMono == 0){
+                logger->logDebug(GwLog::ERROR,"Error PageNavigation: invalid image geometry w=%d h=%d",imgWidth,imgHeight);
+                return PAGE_UPDATE;
+            }
+
+            const char* b64src = net.pictureBase64();  // Read picture as Base64 content
+            if (b64src == nullptr){
+                logger->logDebug(GwLog::ERROR,"Error PageNavigation: picture_base64 missing");
+                return PAGE_UPDATE;
+            }
+            size_t b64len = net.pictureBase64Len(); // Calculate length of Base64 content
             // Copy Base64 content in PSRAM
             char* b64 = (char*) heap_caps_malloc(b64len + 1, MALLOC_CAP_SPIRAM);    // Allcate PSRAM for Base64 content
             if (!b64) {
-                LOG_DEBUG(GwLog::ERROR,"Error PageNavigation: PSRAM alloc base64 failed");
+                logger->logDebug(GwLog::ERROR,"Error PageNavigation: PSRAM alloc base64 failed");
                 return PAGE_UPDATE;
             }
             memcpy(b64, b64src, b64len + 1);    // Copy Base64 content in PSRAM
 
             // Set image buffer in PSRAM
-            //size_t imgSize = getdisplay().width() * getdisplay().height();
+            size_t imgSize = (numPix > 0) ? (size_t)numPix : requiredBytesMono;    // Calculate image size
-            size_t imgSize = numPix;    // Calculate image size
+            if (imgSize < requiredBytesMono){
+                imgSize = requiredBytesMono;
+            }
             uint8_t* imageData = (uint8_t*) heap_caps_malloc(imgSize, MALLOC_CAP_SPIRAM);           // Allocate PSRAM for image
             if (!imageData) {
-                LOG_DEBUG(GwLog::ERROR,"Error PageNavigation: PPSRAM alloc image buffer failed");
+                logger->logDebug(GwLog::ERROR,"Error PageNavigation: PSRAM alloc image buffer failed");
                 free(b64);
                 return PAGE_UPDATE;
             }
 
             // Decode Base64 content to image
             size_t decodedSize = 0;
-            decoder.decodeBase64(b64, imageData, imgSize, decodedSize);
+            bool decodeOk = decoder.decodeBase64(b64, b64len, imageData, imgSize, decodedSize);
+            if (!decodeOk || decodedSize < requiredBytesMono){
+                int base64Ret = mbedtls_base64_decode(
+                    nullptr,
+                    0,
+                    &decodedSize,
+                    (const unsigned char*)b64,
+                    b64len
+                );
+                logger->logDebug(GwLog::ERROR,
+                    "Error PageNavigation: decode failed (ok=%d, decoded=%u, required=%u, b64ret=%d)",
+                    decodeOk ? 1 : 0,
+                    (unsigned int)decodedSize,
+                    (unsigned int)requiredBytesMono,
+                    base64Ret
+                );
+                free(b64);
+                free(imageData);
+                return PAGE_UPDATE;
+            }
 
-            // Copy actual navigation man to ackup map
+            // Copy actual navigation map to backup map
             imageBackupWidth  = imgWidth;
             imageBackupHeight = imgHeight;
             imageBackupSize   = imgSize;
-            if (decodedSize > 0) {
+            if (decodedSize > 0 && imageBackupData != nullptr) {
-                memcpy(imageBackupData, imageData, decodedSize);
+                size_t copySize = (decodedSize > imageBackupCapacity) ? imageBackupCapacity : decodedSize;
-                imageBackupSize = decodedSize;
+                memcpy(imageBackupData, imageData, copySize);
+                imageBackupSize = copySize;
             }
-            hasImageBackup = true;
+            hasImageBackup = (imageBackupData != nullptr);
             lostCounter = 0;
 
             // Show image (navigation map)
-            getdisplay().drawBitmap(0, 25, imageData, imgWidth, imgHeight, commonData->fgcolor);
+            epd->drawBitmap(0, 25, imageData, imgWidth, imgHeight, commonData->fgcolor);
 
             // Clean PSRAM
             free(b64);
             free(imageData);
         }
         // If no network connection then use backup navigation map
-        else{
+        else {
-            // Show backup image (backup navigation map)
-            if (hasImageBackup) {
-                getdisplay().drawBitmap(0, 25, imageBackupData, imageBackupWidth, imageBackupHeight, commonData->fgcolor);
-            }    
 
-            // Show info: Connection lost when 5 page refreshes has a connection lost to the map server
+            // NEW: update backoff only if we actually attempted a fetch (not when skipping due to backoff)
-            // Short connection losts are uncritical
+            if (allowFetch) {
-            if(lostCounter >= 5){
+                // NEW: exponential backoff: 1s,2s,4s,8s,16s,30s (capped)
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                if (failCount < 6) failCount++;
-                getdisplay().fillRect(200, 250 , 200, 25, commonData->fgcolor); // Black rect
+                uint32_t backoffMs = 1000u << failCount;
-                getdisplay().fillRect(202, 252 , 196, 21, commonData->bgcolor); // White rect
+                if (backoffMs > 30000u) backoffMs = 30000u;
-                getdisplay().setCursor(210, 270);
+                nextAllowedMs = now + backoffMs;
-                getdisplay().print("Map server lost");
+            } else {
+                // NEW: we are currently backing off; do not increase failCount further
+                // nextAllowedMs stays unchanged
             }
 
-            lostCounter++; // Increment lost counter
+            // Show backup image (backup navigation map)
+            if (hasImageBackup) {
+                epd->drawBitmap(0, 25, imageBackupData, imageBackupWidth, imageBackupHeight, commonData->fgcolor);
+            }    
+
+            // Show connection lost info when 5 page refreshes has a connection lost to the map server
+            // Short connection losts are uncritical
+            if(lostCounter >= 5){
+                epd->setFont(&Ubuntu_Bold12pt8b);
+                epd->fillRect(200, 250 , 200, 25, commonData->fgcolor);
+                epd->fillRect(202, 252 , 196, 21, commonData->bgcolor);
+                epd->setCursor(210, 270);
+                epd->print("Map server lost");
+            }
+
+            lostCounter++;
         }
 
-
         // ############### Draw Values ################
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
 
         // Show zoom level
-        getdisplay().fillRect(355, 25 , 45, 25, commonData->fgcolor);   // Black rect
+        epd->fillRect(355, 25 , 45, 25, commonData->fgcolor);
-        getdisplay().fillRect(357, 27 , 41, 21, commonData->bgcolor);   // White rect
+        epd->fillRect(357, 27 , 41, 21, commonData->bgcolor);
-        getdisplay().setCursor(364, 45);
+        epd->setCursor(364, 45);
-        getdisplay().print(zoom);
+        epd->print(zoom);
         // If true heading available then use HDT oterwise HDM
-        if(showValues == true){
+        if (showValues == true) {
             // Frame
-            getdisplay().fillRect(0, 25 , 130, 65, commonData->fgcolor);   // Black rect
+            epd->fillRect(0, 25 , 130, 65, commonData->fgcolor);
-            getdisplay().fillRect(2, 27 , 126, 61, commonData->bgcolor);   // White rect
+            epd->fillRect(2, 27 , 126, 61, commonData->bgcolor);
             if(valid3 == true){
                 // HDT
-                getdisplay().setCursor(10, 45);
+                epd->setCursor(10, 45);
-                getdisplay().print(name3);
+                epd->print(name3);
-                getdisplay().setCursor(70, 45);
+                epd->setCursor(70, 45);
-                getdisplay().print(svalue3);
+                epd->print(svalue3);
             }
             else{
                 // HDM
-                getdisplay().setCursor(10, 45);
+                epd->setCursor(10, 45);
-                getdisplay().print(name4);
+                epd->print(name4);
-                getdisplay().setCursor(70, 45);
+                epd->setCursor(70, 45);
-                getdisplay().print(svalue4);
+                epd->print(svalue4);
             }
             // SOG
-            getdisplay().setCursor(10, 65);
+            epd->setCursor(10, 65);
-            getdisplay().print(name5);
+            epd->print(name5);
-            getdisplay().setCursor(70, 65);
+            epd->setCursor(70, 65);
-            getdisplay().print(svalue5);
+            epd->print(svalue5);
             // DBT
-            getdisplay().setCursor(10, 85);
+            epd->setCursor(10, 85);
-            getdisplay().print(name6);
+            epd->print(name6);
-            getdisplay().setCursor(70, 85);
+            epd->setCursor(70, 85);
-            getdisplay().print(svalue6);
+            epd->print(svalue6);
         }
         
         return PAGE_UPDATE;

lib/obp60task/PageOneValue.cpp

@@ -1,228 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
-#include "OBPDataOperations.h"
-#include "OBPcharts.h"
 
-class PageOneValue : public Page {
+#ifdef ENABLE_CALIBRATION
+#include "BoatDataCalibration.h"
+#endif
+
+class PageOneValue : public Page
+{
 private:
-    GwLog* logger;
+    String lengthformat;
-
-    enum PageMode {
-        VALUE,
-        BOTH,
-        CHART
-    };
-    enum DisplayMode {
-        FULL,
-        HALF
-    };
-
-    static constexpr char HORIZONTAL = 'H';
-    static constexpr char VERTICAL = 'V';
-    static constexpr int8_t FULL_SIZE = 0;
-    static constexpr int8_t HALF_SIZE_TOP = 1;
-    static constexpr int8_t HALF_SIZE_BOTTOM = 2;
-
-    static constexpr bool PRNT_NAME = true;
-    static constexpr bool NO_PRNT_NAME = false;
-    static constexpr bool PRNT_VALUE = true;
-    static constexpr bool NO_PRNT_VALUE = false;
-
-    int width; // Screen width
-    int height; // Screen height
-
-    bool keylock = false; // Keylock
-    PageMode pageMode = VALUE; // Page display mode
-    int8_t dataIntv = 1; // Update interval for wind history chart:
-                         // (1)|(2)|(3)|(4)|(8) x 240 seconds for 4, 8, 12, 16, 32 min. history chart
-
-    // String lengthformat;
-    bool useSimuData;
-    bool holdValues;
-    String flashLED;
-    String backlightMode;
-    String tempFormat;
-
-    // Old values for hold function
-    String sValue1Old = "";
-    String unit1Old = "";
-
-    // Data buffer pointer (owned by HstryBuffers)
-    RingBuffer<uint16_t>* dataHstryBuf = nullptr;
-    std::unique_ptr<Chart> dataChart; // Chart object
-
-    // display data value in display <mode> [FULL|HALF]
-    void showData(GwApi::BoatValue* bValue1, DisplayMode mode)
-    {
-        int nameXoff, nameYoff, unitXoff, unitYoff, value1Xoff, value1Yoff;
-        const GFXfont *nameFnt, *unitFnt, *valueFnt1, *valueFnt2, *valueFnt3;
-
-        if (mode == FULL) { // full size data display
-            nameXoff = 0;
-            nameYoff = 0;
-            nameFnt = &Ubuntu_Bold32pt8b;
-            unitXoff = 0;
-            unitYoff = 0;
-            unitFnt = &Ubuntu_Bold20pt8b;
-            value1Xoff = 0;
-            value1Yoff = 0;
-            valueFnt1 = &Ubuntu_Bold20pt8b;
-            valueFnt2 = &Ubuntu_Bold32pt8b;
-            valueFnt3 = &DSEG7Classic_BoldItalic60pt7b;
-        } else { // half size data and chart display
-            nameXoff = -10;
-            nameYoff = -34;
-            nameFnt = &Ubuntu_Bold20pt8b;
-            unitXoff = -295;
-            unitYoff = -119;
-            unitFnt = &Ubuntu_Bold12pt8b;
-            valueFnt1 = &Ubuntu_Bold12pt8b;
-            value1Xoff = 153;
-            value1Yoff = -119;
-            valueFnt2 = &Ubuntu_Bold20pt8b;
-            valueFnt3 = &DSEG7Classic_BoldItalic42pt7b;
-        }
-
-        String name1 = xdrDelete(bValue1->getName()); // Value name
-        name1 = name1.substring(0, 6); // String length limit for value name
-        double value1 = bValue1->value; // Value as double in SI unit
-        bool valid1 = bValue1->valid; // Valid information
-        String sValue1 = formatValue(bValue1, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places
-        String unit1 = formatValue(bValue1, *commonData).unit; // Unit of value
-
-        // Show name
-        getdisplay().setTextColor(commonData->fgcolor);
-        getdisplay().setFont(nameFnt);
-        getdisplay().setCursor(20 + nameXoff, 100 + nameYoff);
-        getdisplay().print(name1); // name
-
-        // Show unit
-        getdisplay().setFont(unitFnt);
-        getdisplay().setCursor(305 + unitXoff, 240 + unitYoff);
-
-        if (holdValues) {
-            getdisplay().print(unit1Old); // name
-        } else {
-            getdisplay().print(unit1); // name
-        }
-
-        // Switch font depending on value format and adjust position
-        if (bValue1->getFormat() == "formatLatitude" || bValue1->getFormat() == "formatLongitude") {
-            getdisplay().setFont(valueFnt1);
-            getdisplay().setCursor(20 + value1Xoff, 180 + value1Yoff);
-        } else if (bValue1->getFormat() == "formatTime" || bValue1->getFormat() == "formatDate") {
-            getdisplay().setFont(valueFnt2);
-            getdisplay().setCursor(20 + value1Xoff, 200 + value1Yoff);
-        } else {
-            getdisplay().setFont(valueFnt3);
-            getdisplay().setCursor(20 + value1Xoff, 240 + value1Yoff);
-        }
-
-        // Show bus data
-        if (!holdValues || useSimuData) {
-            getdisplay().print(sValue1); // Real value as formated string
-        } else {
-            getdisplay().print(sValue1Old); // Old value as formated string
-        }
-
-        if (valid1 == true) {
-            sValue1Old = sValue1; // Save the old value
-            unit1Old = unit1; // Save the old unit
-        }
-    }
 
 public:
-    PageOneValue(CommonData& common)
+    PageOneValue(CommonData &common) : Page(common)
     {
-        commonData = &common;
+        logger->logDebug(GwLog::LOG, "Instantiate PageOneValue");
-        logger = commonData->logger;
-        LOG_DEBUG(GwLog::LOG, "Instantiate PageOneValue");
-
-        width = getdisplay().width(); // Screen width
-        height = getdisplay().height(); // Screen height
 
         // Get config data
-        // lengthformat = commonData->config->getString(commonData->config->lengthFormat);
+        lengthformat = config->getString(config->lengthFormat);
-        useSimuData = commonData->config->getBool(commonData->config->useSimuData);
-        holdValues = commonData->config->getBool(commonData->config->holdvalues);
-        flashLED = commonData->config->getString(commonData->config->flashLED);
-        backlightMode = commonData->config->getString(commonData->config->backlight);
-        tempFormat = commonData->config->getString(commonData->config->tempFormat); // [K|°C|°F]
     }
 
-    virtual void setupKeys()
+    int handleKey(int key) {
-    {
+        // Code for keylock
-        Page::setupKeys();
+        if(key == 11){
-
-#if defined BOARD_OBP60S3
-        constexpr int ZOOM_KEY = 4;
-#elif defined BOARD_OBP40S3
-        constexpr int ZOOM_KEY = 1;
-#endif
-
-        if (dataHstryBuf) { // show "Mode" key only if chart supported boat data type is available
-            commonData->keydata[0].label = "MODE";
-            commonData->keydata[ZOOM_KEY].label = "ZOOM";
-        } else {
-            commonData->keydata[0].label = "";
-            commonData->keydata[ZOOM_KEY].label = "";
-        }
-    }
-
-    // Key functions
-    virtual int handleKey(int key)
-    {
-        if (dataHstryBuf) { // if boat data type supports charts
-
-            // Set page mode: value | value/half chart | full chart
-            if (key == 1) {
-                switch (pageMode) {
-                case VALUE:
-                    pageMode = BOTH;
-                    break;
-                case BOTH:
-                    pageMode = CHART;
-                    break;
-                case CHART:
-                    pageMode = VALUE;
-                    break;
-                }
-                return 0; // Commit the key
-            }
-
-            // Set time frame to show for history chart
-#if defined BOARD_OBP60S3
-            if (key == 5) {
-#elif defined BOARD_OBP40S3
-            if (key == 2) {
-#endif
-                if (dataIntv == 1) {
-                    dataIntv = 2;
-                } else if (dataIntv == 2) {
-                    dataIntv = 3;
-                } else if (dataIntv == 3) {
-                    dataIntv = 4;
-                } else if (dataIntv == 4) {
-                    dataIntv = 8;
-                } else {
-                    dataIntv = 1;
-                }
-                return 0; // Commit the key
-            }
-        }
-
-        // Keylock function
-        if (key == 11) { // Code for keylock
             commonData->keylock = !commonData->keylock;
-            return 0; // Commit the key
+            return 0;                   // Commit the key
         }
         return key;
     }
 
-    virtual void displayNew(PageData& pageData)
+    void displayNew(PageData &pageData) {
-    {
 #ifdef BOARD_OBP60S3
         // Clear optical warning
         if (flashLED == "Limit Violation") {
@@ -230,71 +39,84 @@ public:
             setFlashLED(false);
         }
 #endif
-        // buffer initialization will fail, if page is default page, because <displayNew> is not executed at system start for default page
+    };
-        if (!dataChart) { // Create chart objects if they don't exist
 
-            GwApi::BoatValue* bValue1 = pageData.values[0]; // Page boat data element
+    int displayPage(PageData &pageData) {
-            String bValName1 = bValue1->getName(); // Value name
-            String bValFormat = bValue1->getFormat(); // Value format
 
-            dataHstryBuf = pageData.hstryBuffers->getBuffer(bValName1);
+        // Old values for hold function
+        static String svalue1old = "";
+        static String unit1old = "";
 
-            if (dataHstryBuf) {
+        
-                dataChart.reset(new Chart(*dataHstryBuf, Chart::dfltChrtDta[bValFormat].range, *commonData, useSimuData));
+        // Get boat values
-                LOG_DEBUG(GwLog::DEBUG, "PageOneValue: Created chart objects for %s", bValName1);
+        GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
-            } else {
+        String name1 = xdrDelete(bvalue1->getName());   // Value name
-                LOG_DEBUG(GwLog::DEBUG, "PageOneValue: No chart objects available for %s", bValName1);
+        name1 = name1.substring(0, 6);                  // String length limit for value name
-            }
+#ifdef ENABLE_CALIBRATION
-        }
+        calibrationData.calibrateInstance(bvalue1, logger); // Check if boat data value is to be calibrated
+#endif
+        double value1 = bvalue1->value;                 // Value as double in SI unit
+        bool valid1 = bvalue1->valid;                   // Valid information
+        String svalue1 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String unit1 = commonData->fmt->formatValue(bvalue1, *commonData).unit;        // Unit of value
 
-        setupKeys(); // adjust <mode> key depending on chart supported boat data type
+        // Logging boat values
-    }
+        if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-
+        logger->logDebug(GwLog::LOG, "Drawing at PageOneValue, %s: %f", name1.c_str(), value1);
-    int displayPage(PageData& pageData)
-    {
-        LOG_DEBUG(GwLog::LOG, "Display PageOneValue");
-
-        // Get boat value for page
-        GwApi::BoatValue* bValue1 = pageData.values[0]; // Page boat data element
-
-        // Optical warning by limit violation (unused)
-        if (String(flashLED) == "Limit Violation") {
-            setBlinkingLED(false);
-            setFlashLED(false);
-        }
-
-        if (bValue1 == NULL)
-            return PAGE_OK; // no data, no page to display
-
-        LOG_DEBUG(GwLog::DEBUG, "PageOneValue: printing %s, %.3f", bValue1->getName().c_str(), bValue1->value);
 
         // Draw page
         //***********************************************************
 
-        getdisplay().setPartialWindow(0, 0, width, height); // Set partial update
+        /// Set display in partial refresh mode
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        if (pageMode == VALUE || dataHstryBuf == nullptr) {
+        // Show name
-            // show only data value; ignore other pageMode options if no chart supported boat data history buffer is available
+        epd->setTextColor(commonData->fgcolor);
-            showData(bValue1, FULL);
+        epd->setFont(&Ubuntu_Bold32pt8b);
+        epd->setCursor(20, 100);
+        epd->print(name1);                           // Page name
 
-        } else if (pageMode == CHART) { // show only data chart
+        // Show unit
-            if (dataChart) {
+        epd->setFont(&Ubuntu_Bold20pt8b);
-                dataChart->showChrt(HORIZONTAL, FULL_SIZE, dataIntv, PRNT_NAME, PRNT_VALUE, *bValue1);
+        epd->setCursor(270, 100);
-            }
+        if(holdvalues == false){
+            epd->print(unit1);                       // Unit
+        }
+        else{
+            epd->print(unit1old);
+        }
 
-        } else if (pageMode == BOTH) { // show data value and chart
+        // Switch font if format for any values
-            showData(bValue1, HALF);
+        if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            if (dataChart) {
+            epd->setFont(&Ubuntu_Bold20pt8b);
-                dataChart->showChrt(HORIZONTAL, HALF_SIZE_BOTTOM, dataIntv, NO_PRNT_NAME, NO_PRNT_VALUE, *bValue1);
+            epd->setCursor(20, 180);
-            }
+        }
+        else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
+            epd->setFont(&Ubuntu_Bold32pt8b);
+            epd->setCursor(20, 200);
+        }
+        else{
+            epd->setFont(&DSEG7Classic_BoldItalic60pt7b);
+            epd->setCursor(20, 240);
+        }
+
+        // Show bus data
+        if(holdvalues == false){
+            epd->print(svalue1);                                     // Real value as formated string
+        }
+        else{
+            epd->print(svalue1old);                                  // Old value as formated string
+        }
+        if(valid1 == true){
+            svalue1old = svalue1;                                       // Save the old value
+            unit1old = unit1;                                           // Save the old unit
         }
 
         return PAGE_UPDATE;
     };
 };
 
-static Page* createPage(CommonData& common)
+static Page* createPage(CommonData &common){
-{
     return new PageOneValue(common);
 }
 
@@ -306,10 +128,10 @@ static Page* createPage(CommonData& common)
  * this will be number of BoatValue pointers in pageData.values
  */
 PageDescription registerPageOneValue(
-    "OneValue", // Page name
+    "OneValue",     // Page name
-    createPage, // Action
+    createPage,     // Action
-    1, // Number of bus values depends on selection in Web configuration
+    1,              // Number of bus values depends on selection in Web configuration
-    true // Show display header on/off
+    true            // Show display header on/off
 );
 
 #endif

lib/obp60task/PageRollPitch.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -5,14 +6,30 @@
 
 class PageRollPitch : public Page
 {
+private:
+    String lengthformat;
+    int rolllimit;
+    String roffset;
+    double rolloffset;
+    String poffset;
+    double pitchoffset;
+
 public:
-    PageRollPitch(CommonData &common){
+    PageRollPitch(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageRollPitch");
+        logger->logDebug(GwLog::LOG, "Instantiate PageRollPitch");
+
+        // Get config data
+        String lengthformat = config->getString(config->lengthFormat);
+        rolllimit = config->getInt(config->rollLimit);
+        roffset = config->getString(config->rollOffset);
+        rolloffset = roffset.toFloat() / 360 * (2 * M_PI);
+        poffset = config->getString(config->pitchOffset);
+        pitchoffset = poffset.toFloat() / 360 * (2 * M_PI);
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -21,9 +38,7 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    int displayPage(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
 
         double value1 = 0;
         double value2 = 0;
@@ -32,19 +47,6 @@ public:
         String svalue2 = "";
         String svalue2old = "";
 
-
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        int rolllimit = config->getInt(config->rollLimit);
-        String roffset = config->getString(config->rollOffset);
-        double rolloffset = roffset.toFloat()/360*(2*M_PI);
-        String poffset = config->getString(config->pitchOffset);
-        double pitchoffset = poffset.toFloat()/360*(2*M_PI);
-
         // Get boat values for roll
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (xdrRoll)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
@@ -97,71 +99,70 @@ public:
         }
 
         // Optical warning by limit violation
-        if(String(flashLED) == "Limit Violation"){
+        if (flashLED == "Limit Violation") {
             // Limits for roll
-            if(value1*360/(2*M_PI) >= -1*rolllimit && value1*360/(2*M_PI) <= rolllimit){
+            if (value1*360/(2*M_PI) >= -1*rolllimit && value1*360/(2*M_PI) <= rolllimit) {
                 setBlinkingLED(false);
                 setFlashLED(false);
-            }
+            } else {
-            else{
                 setBlinkingLED(true);
             } 
         }
 
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageRollPitch, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
+        logger->logDebug(GwLog::LOG, "Drawing at PageRollPitch, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show roll limit
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print(rolllimit);                   // Value
+        epd->print(rolllimit);                   // Value
-        //getdisplay().print(svalue1);                   // Value
+        //epd->print(svalue1);                   // Value
 
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 95);
+        epd->setCursor(10, 95);
-        getdisplay().print("Limit");                     // Name
+        epd->print("Limit");                     // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 115);
+        epd->setCursor(10, 115);
-        getdisplay().print("DEG");
+        epd->print("DEG");
 
         // Horizintal separator left
-        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
+        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show roll value
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 270);
+        epd->setCursor(10, 270);
-        if(holdvalues == false) getdisplay().print(svalue1); // Value
+        if(holdvalues == false) epd->print(svalue1); // Value
-        else getdisplay().print(svalue1old);
+        else epd->print(svalue1old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 220);
+        epd->setCursor(10, 220);
-        getdisplay().print(name1);                           // Name
+        epd->print(name1);                           // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 190);
+        epd->setCursor(10, 190);
-        getdisplay().print("Deg");
+        epd->print("Deg");
 
         // Horizintal separator right
-        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
+        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show pitch value
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(295, 270);
+        epd->setCursor(295, 270);
-        if(holdvalues == false) getdisplay().print(svalue2); // Value
+        if(holdvalues == false) epd->print(svalue2); // Value
-        else getdisplay().print(svalue2old);
+        else epd->print(svalue2old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 220);
+        epd->setCursor(335, 220);
-        getdisplay().print(name2);                           // Name
+        epd->print(name2);                           // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 190);
+        epd->setCursor(335, 190);
-        getdisplay().print("Deg");
+        epd->print("Deg");
 
 //*******************************************************************************************
 
@@ -169,8 +170,8 @@ public:
         int rInstrument = 100;     // Radius of instrument
         float pi = 3.141592;
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -194,17 +195,17 @@ public:
                 // Print text centered on position x, y
                 int16_t x1, y1;     // Return values of getTextBounds
                 uint16_t w, h;      // Return values of getTextBounds
-                getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+                epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-                getdisplay().setCursor(x-w/2, y+h/2);
+                epd->setCursor(x-w/2, y+h/2);
                 if(i % 20 == 0){
-                    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+                    epd->setFont(&Ubuntu_Bold8pt8b);
-                    getdisplay().print(ii);
+                    epd->print(ii);
                 }
 
                 // Draw sub scale with dots
                 float x1c = 200 + rInstrument*sin(i/180.0*M_PI);
                 float y1c = 150 - rInstrument*cos(i/180.0*M_PI);
-                getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+                epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
                 float sinx=sin(i/180.0*M_PI);
                 float cosx=cos(i/180.0*M_PI);
 
@@ -215,10 +216,10 @@ public:
                     float xx2 = +dx;
                     float yy1 =  -(rInstrument-10);
                     float yy2 =  -(rInstrument+10);
-                    getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                    epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                             200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                             200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                    getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                    epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                             200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                             200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
                 }
@@ -239,7 +240,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.7);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -249,28 +250,28 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.7);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
 
             // Draw counterweight
-            getdisplay().fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
+            epd->fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 150, startwidth + 22, commonData->bgcolor);
+        epd->fillCircle(200, 150, startwidth + 22, commonData->bgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 20, commonData->fgcolor);      // Boat circle
+        epd->fillCircle(200, 150, startwidth + 20, commonData->fgcolor);      // Boat circle
         int x0 = 200;
         int y0 = 150;
         int x1 = x0 + 50*cos(value1);
         int y1 = y0 + 50*sin(value1);
         int x2 = x0 + 50*cos(value1 - pi/2);
         int y2 = y0 + 50*sin(value1 - pi/2);
-        getdisplay().fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (right triangle)
+        epd->fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (right triangle)
         x1 = x0 + 50*cos(value1 + pi);
         y1 = y0 + 50*sin(value1 + pi);
-        getdisplay().fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (left triangle)
+        epd->fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (left triangle)
-        getdisplay().fillRect(150, 160, 100, 4, commonData->fgcolor);                 // Water line
+        epd->fillRect(150, 160, 100, 4, commonData->fgcolor);                 // Water line
 
         // Draw roll pointer
         startwidth = 4;     // Start width of pointer
@@ -283,7 +284,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument - 15);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -293,15 +294,15 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument - 15);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
         else{
             // Print sensor info
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(145, 200);
+            epd->setCursor(145, 200);
-            getdisplay().print("No sensor data");            // Info missing sensor
+            epd->print("No sensor data");            // Info missing sensor
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageRudderPosition.cpp

@@ -1,18 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
+#ifdef ENABLE_CALIBRATION
+#include "BoatDataCalibration.h"
+#endif
+
 class PageRudderPosition : public Page
 {
+private:
+    String lengthformat;
+
 public:
-    PageRudderPosition(CommonData &common){
+    PageRudderPosition(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Show PageRudderPosition");
+        logger->logDebug(GwLog::LOG, "Instantiate PageRudderPosition");
+
+        // Get config data
+        String lengthformat = config->getString(config->lengthFormat);
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -21,68 +32,64 @@ public:
         return key;
     }
 
-   int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+   int displayPage(PageData &pageData) {
 
         static String unit1old = "";
         double value1 = 0.1;
         double value1old = 0.1;
 
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-
         // Get boat values for rudder position
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list
         String name1 = bvalue1->getName().c_str();      // Value name
         name1 = name1.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
+        calibrationData.calibrateInstance(bvalue1, logger); // Check if boat data value is to be calibrated
+#endif
         value1 = bvalue1->value;                        // Raw value without unit convertion
         bool valid1 = bvalue1->valid;                   // Valid information 
-        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
+        String unit1 = commonData->fmt->formatValue(bvalue1, *commonData).unit;        // Unit of value
 
-        if(valid1 == true){
+        if (valid1 == true) {
             value1old = value1;   	                    // Save old value
             unit1old = unit1;                           // Save old unit
         } else {
-            if(simulation == true){
+            if (simulation == true) {
-                value1 = (3 + float(random(0, 50)) / 10.0)/360*2*PI;
+                value1 = (3 + float(random(0, 50)) / 10.0) / 360 * 2 * M_PI;
                 unit1 = "Deg";
-            }
+            } else {
-            else{
                 value1 = 0;
             }
         }
 
-        // Optical warning by limit violation (unused)
+        // Log boat values
-        if(String(flashLED) == "Limit Violation"){
+        logger->logDebug(GwLog::LOG, "Drawing at PageRudderPosition, %s:%f", name1.c_str(), value1);
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
-
-        // Logging boat values
-        if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageRudderPosition, %s:%f", name1.c_str(), value1);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
 //*******************************************************************************************
         
         // Draw RudderPosition
         int rInstrument = 110;     // Radius of RudderPosition
-        float pi = 3.141592;
+        const float pi = 3.141592;
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
-        getdisplay().fillRect(0, 30, 400, 122, commonData->bgcolor);                      // Delete half top circle
+        epd->fillRect(0, 30, 400, 122, commonData->bgcolor);                      // Delete half top circle
 
         for(int i=90; i<=270; i=i+10)
         {
@@ -90,51 +97,50 @@ public:
             float x = 200 + (rInstrument-30)*sin(i/180.0*pi);  //  x-coordinate dots
             float y = 150 - (rInstrument-30)*cos(i/180.0*pi);  //  y-coordinate cots 
             const char *ii = " ";
-            switch (i)
+            switch (i) {
-            {
+                case 0: ii=" "; break;      // Use a blank for a empty scale value
-            case 0: ii=" "; break;      // Use a blank for a empty scale value
+                case 30 : ii=" "; break;
-            case 30 : ii=" "; break;
+                case 60 : ii=" "; break;
-            case 60 : ii=" "; break;
+                case 90 : ii="45"; break;
-            case 90 : ii="45"; break;
+                case 120 : ii="30"; break;
-            case 120 : ii="30"; break;
+                case 150 : ii="15"; break;
-            case 150 : ii="15"; break;
+                case 180 : ii="0"; break;
-            case 180 : ii="0"; break;
+                case 210 : ii="15"; break;
-            case 210 : ii="15"; break;
+                case 240 : ii="30"; break;
-            case 240 : ii="30"; break;
+                case 270 : ii="45"; break;
-            case 270 : ii="45"; break;
+                case 300 : ii=" "; break;
-            case 300 : ii=" "; break;
+                case 330 : ii=" "; break;
-            case 330 : ii=" "; break;
+                default: break;
-            default: break;
             }
 
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            getdisplay().setCursor(x-w/2, y+h/2);
+            epd->setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                getdisplay().setFont(&Ubuntu_Bold8pt8b);
+                epd->setFont(&Ubuntu_Bold8pt8b);
-                getdisplay().print(ii);
+                epd->print(ii);
             }
 
             // Draw sub scale with dots
             float x1c = 200 + rInstrument*sin(i/180.0*pi);
             float y1c = 150 - rInstrument*cos(i/180.0*pi);
-            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*pi);
             float cosx=cos(i/180.0*pi); 
 
             // Draw sub scale with lines (two triangles)
             if(i % 30 == 0){
-                float dx=2;   // Line thickness = 2*dx+1
+                float dx = 2;   // Line thickness = 2*dx+1
                 float xx1 = -dx;
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                         200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
             }
@@ -142,28 +148,28 @@ public:
         }
 
         // Print label
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(80, 70);
+        epd->setCursor(80, 70);
-        getdisplay().print("Rudder Position");               // Label
+        epd->print("Rudder Position");               // Label
 
         // Print Unit in RudderPosition
         if(valid1 == true || simulation == true){
             if(holdvalues == false){
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
-                getdisplay().setCursor(175, 110);
+                epd->setCursor(175, 110);
-                getdisplay().print(unit1);                   // Unit
+                epd->print(unit1);                   // Unit
             }
             else{
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
-                getdisplay().setCursor(175, 110);
+                epd->setCursor(175, 110);
-                getdisplay().print(unit1old);                // Unit
+                epd->print(unit1old);                // Unit
             }
         }
         else{
             // Print Unit of keel position
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(145, 110);
+            epd->setCursor(145, 110);
-            getdisplay().print("No sensor data");            // Info missing sensor
+            epd->print("No sensor data");            // Info missing sensor
             }
 
         // Calculate rudder position
@@ -186,7 +192,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.5); 
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -196,14 +202,14 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.5);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageSixValues.cpp

@@ -1,8 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
+#ifdef ENABLE_CALIBRATION
+#include "BoatDataCalibration.h"
+#endif
+
 const int SixValues_x1 = 5;
 const int SixValues_DeltaX = 200;
 
@@ -13,13 +18,13 @@ const int HowManyValues = 6;
 
 class PageSixValues : public Page
 {
-    public:
+public:
-    PageSixValues(CommonData &common){
+    PageSixValues(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageSixValues");
+        logger->logDebug(GwLog::LOG, "Instantiate PageSixValues");
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -28,129 +33,133 @@ class PageSixValues : public Page
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
-
+        if (flashLED == "Limit Violation") {
-         
+            setBlinkingLED(false);
-            // Old values for hold function
+            setFlashLED(false);
-            static String OldDataText[HowManyValues] = {"", "", "", "", "", ""};
+        }
-            static String OldDataUnits[HowManyValues] = {"", "", "", "", "", ""};
+#endif
-    
-            // Get config data
-            String lengthformat = config->getString(config->lengthFormat);
-            // bool simulation = config->getBool(config->useSimuData);
-            bool holdvalues = config->getBool(config->holdvalues);
-            String flashLED = config->getString(config->flashLED);
-            String backlightMode = config->getString(config->backlight);
-            
-            GwApi::BoatValue *bvalue;
-            String DataName[HowManyValues];
-            double DataValue[HowManyValues];
-            bool DataValid[HowManyValues];
-            String DataText[HowManyValues];
-            String DataUnits[HowManyValues];
-            String DataFormat[HowManyValues];
-    
-            for (int i = 0; i < HowManyValues; i++){
-                bvalue = pageData.values[i];
-                DataName[i] = xdrDelete(bvalue->getName());
-                DataName[i] = DataName[i].substring(0, 6);                  // String length limit for value name
-                DataValue[i] = bvalue->value;                 // Value as double in SI unit
-                DataValid[i] = bvalue->valid;
-                DataText[i] = formatValue(bvalue, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-                DataUnits[i] = formatValue(bvalue, *commonData).unit;   
-                DataFormat[i] = bvalue->getFormat();     // Unit of value
-            }
-    
-            // Optical warning by limit violation (unused)
-            if(String(flashLED) == "Limit Violation"){
-                setBlinkingLED(false);
-                setFlashLED(false); 
-            }
-    
-            if (bvalue == NULL) return PAGE_OK; // WTF why this statement?
-           
-            // Draw page
-            //***********************************************************
-    
-            // Set display in partial refresh mode
-            getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-            getdisplay().setTextColor(commonData->fgcolor);
-
-            for (int i = 0; i < ( HowManyValues / 2 ); i++){
-                if (i < (HowManyValues / 2) - 1) {          // Don't draw horizontal line after last line of values -> standard design
-                   // Horizontal line 3 pix
-                    getdisplay().fillRect(0, SixValues_y1+(i+1)*SixValues_DeltaY, 400, 3, commonData->fgcolor);
-                }
-                for (int j = 0; j < 2; j++){
-                    int ValueIndex = i * 2 + j;
-                    int x0 = SixValues_x1 + j * SixValues_DeltaX;
-                    int y0 = SixValues_y1 + i * SixValues_DeltaY;
-                    LOG_DEBUG(GwLog::LOG,"Drawing at PageSixValue: %d %s %f %s",  ValueIndex,  DataName[ValueIndex], DataValue[ValueIndex], DataFormat[ValueIndex] );
-    
-           // Show name
-                    getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                    getdisplay().setCursor(x0, y0+25);
-                    getdisplay().print(DataName[ValueIndex]);                           // Page name
-    
-            // Show unit
-                    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                    getdisplay().setCursor(x0, y0+72);
-                    if(holdvalues == false){
-                        getdisplay().print(DataUnits[ValueIndex]);                       // Unit
-                        }
-                    else{
-                        getdisplay().print(OldDataUnits[ValueIndex]);
-                        }
-    
-            // Switch font if format for any values
-                    if(DataFormat[ValueIndex] == "formatLatitude" || DataFormat[ValueIndex] == "formatLongitude"){
-                        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                        getdisplay().setCursor(x0+10, y0+60);
-                        }
-                    else if(DataFormat[ValueIndex] == "formatTime" || DataFormat[ValueIndex] == "formatDate"){
-                        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-                        getdisplay().setCursor(x0+20,y0+55);
-                        } 
-            // pressure in hPa          
-                    else if(DataFormat[ValueIndex] == "formatXdr:P:P"){
-                        getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
-                        getdisplay().setCursor(x0+5, y0+70);
-                     }
-            // RPM
-                     else if(DataFormat[ValueIndex] == "formatXdr:T:R"){
-                        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-                        getdisplay().setCursor(x0+25, y0+70);
-                     }
-                    else{
-                        getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
-                        if ( DataText[ValueIndex][0] == '-' )
-                            getdisplay().setCursor(x0+25, y0+70);
-                        else
-                            getdisplay().setCursor(x0+65, y0+70);
-                        }
-    
-            // Show bus data
-                    if(holdvalues == false){
-                        getdisplay().print(DataText[ValueIndex]);                                     // Real value as formated string
-                        }
-                    else{
-                        getdisplay().print(OldDataText[ValueIndex]);                                  // Old value as formated string
-                        }
-                    if(DataValid[ValueIndex] == true){
-                        OldDataText[ValueIndex] = DataText[ValueIndex];                                       // Save the old value
-                        OldDataUnits[ValueIndex] = DataUnits[ValueIndex];                                           // Save the old unit
-                        }
-                }
-                   // Vertical line 3 pix
-            getdisplay().fillRect(SixValues_x1+SixValues_DeltaX-8, SixValues_y1+i*SixValues_DeltaY, 3, SixValues_DeltaY, commonData->fgcolor);
-            }
-    
-            return PAGE_UPDATE;
-        };
-    
     };
+
+    int displayPage(PageData &pageData) {
+         
+        // Old values for hold function
+        static String OldDataText[HowManyValues] = {"", "", "", "", "", ""};
+        static String OldDataUnits[HowManyValues] = {"", "", "", "", "", ""};
+    
+        // Get config data
+        String lengthformat = config->getString(config->lengthFormat);
+        // bool simulation = config->getBool(config->useSimuData);
+        bool holdvalues = config->getBool(config->holdvalues);
+        String flashLED = config->getString(config->flashLED);
+        String backlightMode = config->getString(config->backlight);
+            
+        GwApi::BoatValue *bvalue;
+        String DataName[HowManyValues];
+        double DataValue[HowManyValues];
+        bool DataValid[HowManyValues];
+        String DataText[HowManyValues];
+        String DataUnits[HowManyValues];
+        String DataFormat[HowManyValues];
+    
+        for (int i = 0; i < HowManyValues; i++){
+            bvalue = pageData.values[i];
+            DataName[i] = xdrDelete(bvalue->getName());
+            DataName[i] = DataName[i].substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
+            calibrationData.calibrateInstance(bvalue, logger);          // Check if boat data value is to be calibrated
+#endif
+            DataValue[i] = bvalue->value;                 // Value as double in SI unit
+            DataValid[i] = bvalue->valid;
+            DataText[i] = commonData->fmt->formatValue(bvalue, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+            DataUnits[i] = commonData->fmt->formatValue(bvalue, *commonData).unit;   
+            DataFormat[i] = bvalue->getFormat();     // Unit of value
+        }
+    
+        if (bvalue == NULL) return PAGE_OK; // WTF why this statement?
+           
+        // Draw page
+        //***********************************************************
+
+        // Set display in partial refresh mode
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        epd->setTextColor(commonData->fgcolor);
+
+        for (int i = 0; i < ( HowManyValues / 2 ); i++) {
+            if (i < (HowManyValues / 2) - 1) { // Don't draw horizontal line after last line of values -> standard design
+                // Horizontal line 3 pix
+                epd->fillRect(0, SixValues_y1+(i+1)*SixValues_DeltaY, 400, 3, commonData->fgcolor);
+            }
+            for (int j = 0; j < 2; j++) {
+                int ValueIndex = i * 2 + j;
+                int x0 = SixValues_x1 + j * SixValues_DeltaX;
+                int y0 = SixValues_y1 + i * SixValues_DeltaY;
+                LOG_DEBUG(GwLog::LOG, "Drawing at PageSixValue: %d %s %f %s",  ValueIndex,  DataName[ValueIndex], DataValue[ValueIndex], DataFormat[ValueIndex]);
+    
+                // Show name
+                epd->setFont(&Ubuntu_Bold12pt8b);
+                epd->setCursor(x0, y0+25);
+                epd->print(DataName[ValueIndex]);                           // Page name
+    
+                // Show unit
+                epd->setFont(&Ubuntu_Bold8pt8b);
+                epd->setCursor(x0, y0+72);
+                if (holdvalues == false) {
+                    epd->print(DataUnits[ValueIndex]);                       // Unit
+                } else {
+                    epd->print(OldDataUnits[ValueIndex]);
+                }
+    
+                // Switch font if format for any values
+                if (DataFormat[ValueIndex] == "formatLatitude" || DataFormat[ValueIndex] == "formatLongitude") {
+                    epd->setFont(&Ubuntu_Bold12pt8b);
+                    epd->setCursor(x0+10, y0+60);
+                } 
+                else if (DataFormat[ValueIndex] == "formatTime" || DataFormat[ValueIndex] == "formatDate") {
+                    epd->setFont(&Ubuntu_Bold16pt8b);
+                    epd->setCursor(x0+20,y0+55);
+                } 
+                 // pressure in hPa          
+                else if (DataFormat[ValueIndex] == "formatXdr:P:P") {
+                    epd->setFont(&DSEG7Classic_BoldItalic26pt7b);
+                    epd->setCursor(x0+5, y0+70);
+                }
+                // RPM
+                else if (DataFormat[ValueIndex] == "formatXdr:T:R") {
+                    epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+                    epd->setCursor(x0+25, y0+70);
+                }
+                else {
+                    epd->setFont(&DSEG7Classic_BoldItalic26pt7b);
+                    if (DataText[ValueIndex][0] == '-' ) {
+                        epd->setCursor(x0+25, y0+70);
+                    } else {
+                        epd->setCursor(x0+65, y0+70);
+                    }
+                }
+    
+                // Show bus data
+                if (holdvalues == false) {
+                    epd->print(DataText[ValueIndex]); // Real value as formated string
+                } else{
+                    epd->print(OldDataText[ValueIndex]); // Old value as formated string
+                }
+                if (DataValid[ValueIndex] == true) {
+                    OldDataText[ValueIndex] = DataText[ValueIndex];                                       // Save the old value
+                    OldDataUnits[ValueIndex] = DataUnits[ValueIndex];                                           // Save the old unit
+                }
+            } // for j
+            // Vertical line 3 pix
+            epd->fillRect(SixValues_x1+SixValues_DeltaX-8, SixValues_y1+i*SixValues_DeltaY, 3, SixValues_DeltaY, commonData->fgcolor);
+        } // for i
+    
+        return PAGE_UPDATE;
+    };
+    
+};
+
 static Page *createPage(CommonData &common){
     return new PageSixValues(common);
 }/**

lib/obp60task/PageSkyView.cpp

@@ -14,20 +14,15 @@
 class PageSkyView : public Page
 {
 private:
-    String flashLED;
     GwBoatData *bd;
 
 public:
-    PageSkyView(CommonData &common)
+    PageSkyView(CommonData &common) : Page(common)
     {
-        commonData = &common;
-
         // task name access is for example purpose only
         TaskHandle_t currentTaskHandle = xTaskGetCurrentTaskHandle();
         const char* taskName = pcTaskGetName(currentTaskHandle);
-        common.logger->logDebug(GwLog::LOG, "Instantiate PageSkyView in task '%s'", taskName);
+        logger->logDebug(GwLog::LOG, "Instantiate PageSkyView in task '%s'", taskName);
-
-        flashLED = common.config->getString(common.config->flashLED);
     }
 
     int handleKey(int key) {
@@ -57,7 +52,6 @@ public:
     }
 
     int displayPage(PageData &pageData) {
-        GwLog *logger = commonData->logger;
 
         std::vector<GwSatInfo> sats;
         int nSat = bd->SatInfo->getNumSats();
@@ -73,111 +67,109 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
         // current position
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
+
+
+        GwApi::BoatValue *bv_lat = pageData.values[0];
+        String sv_lat = commonData->fmt->formatValue(bv_lat, *commonData).svalue;
+        //epd->setCursor(300, 40);
+        //epd->print(sv_lat);
+
+        GwApi::BoatValue *bv_lon = pageData.values[1];
+        String sv_lon = commonData->fmt->formatValue(bv_lon, *commonData).svalue;
+        //epd->setCursor(300, 60);
+        //epd->print(sv_lon);
+
+        GwApi::BoatValue *bv_hdop = pageData.values[2];
+        String sv_hdop = commonData->fmt->formatValue(bv_hdop, *commonData).svalue;
+        //epd->setCursor(300, 80);
+        //epd->print(sv_hdop);
 
         // sky view
         Point c = {130, 148};
-        uint16_t r = 120;
+        uint16_t r = 125;
         uint16_t r1 = r / 2;
 
-        getdisplay().fillCircle(c.x, c.y, r + 2, commonData->fgcolor);
+        epd->fillCircle(c.x, c.y, r, commonData->bgcolor);
-        getdisplay().fillCircle(c.x, c.y, r - 1, commonData->bgcolor);
+        epd->drawCircle(c.x, c.y, r + 1, commonData->fgcolor);
-        getdisplay().drawCircle(c.x, c.y, r1, commonData->fgcolor);
+        epd->drawCircle(c.x, c.y, r + 2, commonData->fgcolor);
+        epd->drawCircle(c.x, c.y, r1, commonData->fgcolor);
 
         // separation lines
-        getdisplay().drawLine(c.x - r, c.y, c.x + r, c.y, commonData->fgcolor);
+        epd->drawLine(c.x - r, c.y, c.x + r, c.y, commonData->fgcolor);
-        getdisplay().drawLine(c.x, c.y - r, c.x, c.y + r, commonData->fgcolor);
+        epd->drawLine(c.x, c.y - r, c.x, c.y + r, commonData->fgcolor);
         Point p = {c.x, c.y - r};
         Point p1, p2;
         p1 = rotatePoint(c, p, 45);
         p2 = rotatePoint(c, p, 45 + 180);
-        getdisplay().drawLine(p1.x, p1.y, p2.x, p2.y,  commonData->fgcolor);
+        epd->drawLine(p1.x, p1.y, p2.x, p2.y,  commonData->fgcolor);
         p1 = rotatePoint(c, p, -45);
         p2 = rotatePoint(c, p, -45 + 180);
-        getdisplay().drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
+        epd->drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
 
         // directions 
 
         int16_t x1, y1;
         uint16_t w, h;
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
 
-		getdisplay().getTextBounds("N", 0, 150, &x1, &y1, &w, &h);
+		epd->getTextBounds("N", 0, 150, &x1, &y1, &w, &h);
-        getdisplay().setCursor(c.x - w / 2, c.y - r + h + 3);
+        epd->setCursor(c.x - w / 2, c.y - r + h + 2);
-        getdisplay().print("N");
+        epd->print("N");
 
-		getdisplay().getTextBounds("S", 0, 150, &x1, &y1, &w, &h);
+		epd->getTextBounds("S", 0, 150, &x1, &y1, &w, &h);
-        getdisplay().setCursor(c.x - w / 2, c.y + r - 3);
+        epd->setCursor(c.x - w / 2, c.y + r - 2);
-        getdisplay().print("S");
+        epd->print("S");
 
-		getdisplay().getTextBounds("E", 0, 150, &x1, &y1, &w, &h);
+		epd->getTextBounds("E", 0, 150, &x1, &y1, &w, &h);
-        getdisplay().setCursor(c.x + r - w - 3, c.y + h / 2);
+        epd->setCursor(c.x + r - w - 2, c.y + h / 2);
-        getdisplay().print("E");
+        epd->print("E");
         
-		getdisplay().getTextBounds("W", 0, 150, &x1, &y1, &w, &h);
+		epd->getTextBounds("W", 0, 150, &x1, &y1, &w, &h);
-        getdisplay().setCursor(c.x - r + 3 , c.y + h / 2);
+        epd->setCursor(c.x - r + 2 , c.y + h / 2);
-        getdisplay().print("W");
+        epd->print("W");
 
         // show satellites in "map"
-        getdisplay().setFont(&IBM8x8px);
+        epd->setFont(&Atari6px);
         for (int i = 0; i < nSat; i++) {
-            float arad = (sats[i].Azimut * M_PI / 180.0) + M_PI;
+            float arad = sats[i].Azimut * M_PI / 180.0;
             float erad = sats[i].Elevation * M_PI / 180.0;
-            uint16_t x = c.x + sin(arad) * erad * r1;
+            uint16_t x = c.x + sin(arad) * erad * r;
-            uint16_t y = c.y + cos(arad) * erad * r1;
+            uint16_t y = c.y + cos(arad) * erad * r;
-            getdisplay().fillRect(x-4, y-4, 8, 8, commonData->fgcolor);
+            epd->drawRect(x-4, y-4, 8, 8, commonData->fgcolor);
-            getdisplay().setCursor(x-7, y+12);
+            // Add Sat number
-            getdisplay().printf("%02d", static_cast<int>(sats[i].PRN));
+            epd->setCursor(x+5, y);
+            char buffer[3];
+            snprintf(buffer, 3, "%02d", static_cast<int>(sats[i].PRN));
+            epd->print(String(buffer));
         }
 
         // Signal / Noise bars
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(325, 34);
+        epd->setCursor(325, 34);
-        getdisplay().print("SNR");
+        epd->print("SNR");
-//        getdisplay().drawRect(270, 20, 125, 257, commonData->fgcolor);
+        epd->drawRect(270, 20, 125, 257, commonData->fgcolor);
         int maxsat = std::min(nSat, 12);
         for (int i = 0; i < maxsat; i++) {
             uint16_t y = 29 + (i + 1) * 20;
-            getdisplay().setCursor(276, y);
+            epd->setCursor(276, y);
             char buffer[3];
             snprintf(buffer, 3, "%02d", static_cast<int>(sats[i].PRN));
-            getdisplay().print(String(buffer));
+            epd->print(String(buffer));
-            getdisplay().drawRect(305, y-12, 85, 14, commonData->fgcolor);
+            epd->drawRect(305, y-12, 85, 14, commonData->fgcolor);
-            getdisplay().setCursor(315, y);
+            epd->setCursor(315, y);
             // TODO SNR as number or as bar via mode key?
             if (sats[i].SNR <= 100) {
-                // getdisplay().print(sats[i].SNR);
+                // epd->print(sats[i].SNR);
-                getdisplay().fillRect(307, y-10, int(81 * sats[i].SNR / 100.0), 10, commonData->fgcolor);
+                epd->fillRect(307, y-10, int(81 * sats[i].SNR / 100.0), 10, commonData->fgcolor);
             } else {
-                getdisplay().print("n/a");
+                epd->print("n/a");
             }
         }
 
-        // Show SatInfo and HDOP
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-
-        getdisplay().setCursor(220, 34);
-        getdisplay().print("Sat:");
-
-        GwApi::BoatValue *bv_satinfo = pageData.values[0]; // SatInfo
-        String sval_satinfo = formatValue(bv_satinfo, *commonData).svalue;
-        getdisplay().setCursor(220, 49);
-        getdisplay().print(sval_satinfo);
-        
-        getdisplay().setCursor(220, 254);
-        getdisplay().print("HDOP:");
-
-        GwApi::BoatValue *bv_hdop = pageData.values[1]; // HDOP
-        double hdop = formatValue(bv_hdop, *commonData).value * 4; // 4 is factor for UERE (translation in meter)
-        char sval_hdop[20];
-        dtostrf(hdop, 0, 1, sval_hdop);  // Only one prefix
-        strcat(sval_hdop, "m");
-        getdisplay().setCursor(220, 269);
-        getdisplay().print(sval_hdop);
-
         return PAGE_UPDATE;
     };
 };
@@ -197,7 +189,7 @@ PageDescription registerPageSkyView(
     "SkyView",              // Page name
     createPage,             // Action
     0,                      // Number of bus values depends on selection in Web configuration
-    {"SatInfo", "HDOP"},    // Bus values we need in the page
+    {"LAT", "LON", "HDOP"}, // Bus values we need in the page
     true                    // Show display header on/off
 );
 

lib/obp60task/PageSolar.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,12 +7,23 @@
 
 class PageSolar : public Page
 {
+private:
+    String batVoltage;
+    int solPower;
+    String powerSensor;
+
 public:
-    PageSolar(CommonData &common){
+    PageSolar(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageSolar");
+        logger->logDebug(GwLog::LOG, "Instantiate PageSolar");
+
+        // Get config data
+        String batVoltage = config->getString(config->batteryVoltage);
+        int solPower = config->getInt(config->solarPower);
+        String powerSensor = config->getString(config->usePowSensor2);
     }
-    virtual int handleKey(int key){
+
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -20,19 +32,8 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    int displayPage(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
         
-        // Get config data
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String batVoltage = config->getString(config->batteryVoltage);
-        int solPower = config->getInt(config->solarPower);
-        String backlightMode = config->getString(config->backlight);
-        String powerSensor = config->getString(config->usePowSensor2);
-
         double value1 = 0;  // Solar voltage
         double value2 = 0;  // Solar current
         double value3 = 0;  // Solar output power
@@ -58,98 +59,93 @@ public:
 
         bool valid1 = true;
 
-        // Optical warning by limit violation
+        // Optical warning by limit violation      
-        if(String(flashLED) == "Limit Violation"){
+        if (flashLED == "Limit Violation") {
-            // Over voltage
+            // Over voltage?
-            if(value1 > 14.8 && batVoltage == "12V"){
+            if (batVoltage == "12V") {
-                setBlinkingLED(true);
+                setBlinkingLED(value1 > 14.8);
-            }
+            } else if (batVoltage == "24V") {
-            if(value1 <= 14.8 && batVoltage == "12V"){
+                setBlinkingLED(value1 > 29.6);
+            } else {
                 setBlinkingLED(false);
             }
-            if(value1 > 29.6 && batVoltage == "24V"){
-                setBlinkingLED(true);
-            }
-            if(value1 <= 29.6 && batVoltage == "24V"){
-                setBlinkingLED(false);
-            }     
         }
         
         // Logging voltage value
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageSolar, Type:%iW %s:=%f", solPower, name1.c_str(), value1);
+        logger->logDebug(GwLog::LOG, "Drawing at PageSolar, Type:%iW %s:=%f", solPower, name1.c_str(), value1);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print("Solar");
+        epd->print("Solar");
 
         // Show voltage type
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 140);
+        epd->setCursor(10, 140);
         int bvoltage = 0;
         if(String(batVoltage) == "12V") bvoltage = 12;
         else bvoltage = 24;
-        getdisplay().print(bvoltage);
+        epd->print(bvoltage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
+        epd->print("V");
 
         // Show solar power
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 200);
+        epd->setCursor(10, 200);
-        if(solPower <= 999) getdisplay().print(solPower, 0);
+        if(solPower <= 999) epd->print(solPower, 0);
-        if(solPower > 999) getdisplay().print(float(solPower/1000.0), 1);
+        if(solPower > 999) epd->print(float(solPower/1000.0), 1);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        if(solPower <= 999) getdisplay().print("W");
+        if(solPower <= 999) epd->print("W");
-        if(solPower > 999) getdisplay().print("kW");
+        if(solPower > 999) epd->print("kW");
 
         // Show info
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 235);
+        epd->setCursor(10, 235);
-        getdisplay().print("Installed");
+        epd->print("Installed");
-        getdisplay().setCursor(10, 255);
+        epd->setCursor(10, 255);
-        getdisplay().print("Solar Modul");
+        epd->print("Solar Modul");
 
         // Show solar panel
         solarGraphic(150, 45, commonData->fgcolor, commonData->bgcolor);
 
         // Show load level in percent
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(150, 200);
+        epd->setCursor(150, 200);
-        getdisplay().print(solPercentage);
+        epd->print(solPercentage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("%");
+        epd->print("%");
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(150, 235);
+        epd->setCursor(150, 235);
-        getdisplay().print("Load");
+        epd->print("Load");
 
         // Show sensor type info
         String i2cAddr = "";
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(270, 60);
+        epd->setCursor(270, 60);
-        if(powerSensor == "off") getdisplay().print("Internal");
+        if(powerSensor == "off") epd->print("Internal");
         if(powerSensor == "INA219"){
-            getdisplay().print("INA219");
+            epd->print("INA219");
             i2cAddr = " (0x" + String(INA219_I2C_ADDR2, HEX) + ")";
         }
         if(powerSensor == "INA226"){
-            getdisplay().print("INA226");
+            epd->print("INA226");
             i2cAddr = " (0x" + String(INA226_I2C_ADDR2, HEX) + ")";
         }
-        getdisplay().print(i2cAddr);
+        epd->print(i2cAddr);
-        getdisplay().setCursor(270, 80);
+        epd->setCursor(270, 80);
-        getdisplay().print("Sensor Modul");
+        epd->print("Sensor Modul");
 
         // Reading bus data or using simulation data
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 140);
+        epd->setCursor(260, 140);
         if(simulation == true){
             if(batVoltage == "12V"){
                 value1 = 12.0;
@@ -158,46 +154,62 @@ public:
                 value1 = 24.0;
             }
             value1 += float(random(0, 5)) / 10;         // Simulation data
-            getdisplay().print(value1,1);
+            epd->print(value1,1);
         }
         else{
             // Check for valid real data, display also if hold values activated
             if(valid1 == true || holdvalues == true){
                 // Resolution switching
-                if(value1 <= 9.9) getdisplay().print(value1, 2);
+                if (value1 <= 9.9) {
-                if(value1 > 9.9 && value1 <= 99.9)getdisplay().print(value1, 1);
+                    epd->print(value1, 2);
-                if(value1 > 99.9) getdisplay().print(value1, 0);
+                } else if (value1 <= 99.9) {
+                    epd->print(value1, 1);
+                } else {
+                    epd->print(value1, 0);
+                }
             }
-            else{
+            else {
-            getdisplay().print("---");                       // Missing bus data
+                epd->print(commonData->fmt->placeholder); // Missing bus data
             }
         }
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
+        epd->print("V");
 
         // Show actual current in A
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 200);
+        epd->setCursor(260, 200);
-        if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
+        if ((powerSensor == "INA219" || powerSensor == "INA226") && (simulation == false)) {
-            if(value2 <= 9.9) getdisplay().print(value2, 2);
+            if (value2 <= 9.9) {
-            if(value2 > 9.9 && value2 <= 99.9)getdisplay().print(value2, 1);
+                epd->print(value2, 2);
-            if(value2 > 99.9) getdisplay().print(value2, 0);
+            } else if (value2 <= 99.9) {
+                epd->print(value2, 1);
+            } else {
+                epd->print(value2, 0);
+            }
         }
-        else  getdisplay().print("---");
+        else {
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+            epd->print(commonData->fmt->placeholder);
-        getdisplay().print("A");
+        }
+        epd->setFont(&Ubuntu_Bold16pt8b);
+        epd->print("A");
 
         // Show actual consumption in W
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 260);
+        epd->setCursor(260, 260);
-        if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
+        if ((powerSensor == "INA219" || powerSensor == "INA226") && (simulation == false)) {
-            if(value3 <= 9.9) getdisplay().print(value3, 2);
+            if (value3 <= 9.9) {
-            if(value3 > 9.9 && value3 <= 99.9)getdisplay().print(value3, 1);
+                epd->print(value3, 2);
-            if(value3 > 99.9) getdisplay().print(value3, 0);
+            } else if (value3 <= 99.9) {
+                epd->print(value3, 1);
+            } else {
+                epd->print(value3, 0);
+            }
         }
-        else  getdisplay().print("---");
+        else {
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+            epd->print(commonData->fmt->placeholder);
-        getdisplay().print("W");
+        }
+        epd->setFont(&Ubuntu_Bold16pt8b);
+        epd->print("W");
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageThreeValues.cpp

@@ -1,17 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
+#ifdef ENABLE_CALIBRATION
+#include "BoatDataCalibration.h"
+#endif
+
 class PageThreeValues : public Page
 {
-    public:
+private:
-    PageThreeValues(CommonData &common){
+    String lengthformat;
-        commonData = &common;
+
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageThreeValue");
+public:
+    PageThreeValues(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageThreeValue");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -20,9 +31,17 @@ class PageThreeValues : public Page
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Old values for hold function
         static String svalue1old = "";
@@ -32,94 +51,92 @@ class PageThreeValues : public Page
         static String svalue3old = "";
         static String unit3old = "";
 
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        // bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        
         // Get boat values #1
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
         name1 = name1.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
+        calibrationData.calibrateInstance(bvalue1, logger); // Check if boat data value is to be calibrated
+#endif
         double value1 = bvalue1->value;                 // Value as double in SI unit
         bool valid1 = bvalue1->valid;                   // Valid information 
-        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
+        String unit1 = commonData->fmt->formatValue(bvalue1, *commonData).unit;        // Unit of value
 
         // Get boat values #2
         GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list
         String name2 = xdrDelete(bvalue2->getName());   // Value name
         name2 = name2.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
+        calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated
+#endif
         double value2 = bvalue2->value;                 // Value as double in SI unit
         bool valid2 = bvalue2->valid;                   // Valid information 
-        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
+        String unit2 = commonData->fmt->formatValue(bvalue2, *commonData).unit;        // Unit of value
 
         // Get boat values #3
         GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third element in list
         String name3 = xdrDelete(bvalue3->getName());      // Value name
         name3 = name3.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
+        calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated
+#endif
         double value3 = bvalue3->value;                 // Value as double in SI unit
         bool valid3 = bvalue3->valid;                   // Valid information 
-        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
 
-        // Optical warning by limit violation (unused)
+        // Log boat values
-        if(String(flashLED) == "Limit Violation"){
+        logger->logDebug(GwLog::LOG, "Drawing at PageThreeValues, %s: %f, %s: %f, %s: %f",
-            setBlinkingLED(false);
+            name1.c_str(), value1,
-            setFlashLED(false); 
+            name2.c_str(), value2,
-        }
+            name3.c_str(), value3);
-
-        // Logging boat values
-        if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageThreeValues, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3);
 
         // Draw page
         //***********************************************************
 
         /// Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 55);
+        epd->setCursor(20, 55);
-        getdisplay().print(name1);                           // Page name
+        epd->print(name1);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 90);
+        epd->setCursor(20, 90);
         if(holdvalues == false){
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);                       // Unit
         }
         else{
-            getdisplay().print(unit1old);
+            epd->print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(50, 90);
+            epd->setCursor(50, 90);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(170, 68);
+            epd->setCursor(170, 68);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-            getdisplay().setCursor(180, 90);
+            epd->setCursor(180, 90);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue1);                                     // Real value as formated string
+            epd->print(svalue1);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue1old);                                  // Old value as formated string
+            epd->print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -129,45 +146,45 @@ class PageThreeValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 145);
+        epd->setCursor(20, 145);
-        getdisplay().print(name2);                           // Page name
+        epd->print(name2);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 180);
+        epd->setCursor(20, 180);
         if(holdvalues == false){
-            getdisplay().print(unit2);                       // Unit
+            epd->print(unit2);                       // Unit
         }
         else{
-            getdisplay().print(unit2old);
+            epd->print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(50, 180);
+            epd->setCursor(50, 180);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(170, 158);
+            epd->setCursor(170, 158);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-            getdisplay().setCursor(180, 180);
+            epd->setCursor(180, 180);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue2);                                     // Real value as formated string
+            epd->print(svalue2);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue2old);                                  // Old value as formated string
+            epd->print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -177,45 +194,45 @@ class PageThreeValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 235);
+        epd->setCursor(20, 235);
-        getdisplay().print(name3);                           // Page name
+        epd->print(name3);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 270);
+        epd->setCursor(20, 270);
         if(holdvalues == false){
-            getdisplay().print(unit3);                       // Unit
+            epd->print(unit3);                       // Unit
         }
         else{
-            getdisplay().print(unit3old);
+            epd->print(unit3old);
         }
 
         // Switch font if format for any values
         if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(50, 270);
+            epd->setCursor(50, 270);
         }
         else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(170, 248);
+            epd->setCursor(170, 248);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-            getdisplay().setCursor(180, 270);
+            epd->setCursor(180, 270);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue3);                                     // Real value as formated string
+            epd->print(svalue3);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue3old);                                  // Old value as formated string
+            epd->print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value

lib/obp60task/PageTracker.cpp

@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+
+/*
+  Tracker
+    - standalone with SD card backend
+    - standalone with server backend
+    - Regatta Hero integration
+*/
+
+class PageTracker : public Page
+{
+private:
+
+    char mode = 'N'; // (N)ormal, (C)onfig
+
+    void displayModeNormal(PageData &pageData) {
+
+        // TBD Boatvalues: ...
+
+        logger->logDebug(GwLog::DEBUG,"Drawing at PageTracker");
+
+        // Title
+        epd->setTextColor(commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(8, 48);
+        epd->print("Tracker");
+ 
+    }
+
+    void displayModeConfig() {
+
+        epd->setTextColor(commonData->fgcolor);
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(8, 48);
+        epd->print("Tracker configuration");
+
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        // TODO
+
+    }
+
+public:
+    PageTracker(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageTracker");
+    }
+
+    void setupKeys(){
+        Page::setupKeys();
+        commonData->keydata[0].label = "START";
+        commonData->keydata[1].label = "STOP";
+    }
+
+    int handleKey(int key){
+        if (key == 1) { // Switch between normal and config mode
+            if (mode == 'N') {
+                mode = 'C';
+            } else {
+                mode = 'N';
+            }
+            return 0;
+        }
+        if (key == 11) {
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+
+    void displayNew(PageData &pageData) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData){
+
+        // Logging boat values
+        logger->logDebug(GwLog::LOG, "Drawing at PageTracker; Mode=%c", mode);
+
+        // Set display in partial refresh mode
+        epd->setPartialWindow(0, 0, epd->width(), epd->height());
+
+       if (mode == 'N') {
+           displayModeNormal(pageData);
+       } else if (mode == 'C') {
+           displayModeConfig();
+       }
+
+        return PAGE_UPDATE;
+    };
+};
+
+static Page *createPage(CommonData &common){
+    return new PageTracker(common);
+}
+
+/**
+ * with the code below we make this page known to the PageTask
+ * we give it a type (name) that can be selected in the config
+ * we define which function is to be called
+ * and we provide the number of user parameters we expect
+ * this will be number of BoatValue pointers in pageData.values
+ */
+PageDescription registerPageTracker(
+    "Tracker",  // Page name
+    createPage, // Action
+    0,          // Number of bus values depends on selection in Web configuration
+    {"LAT", "LON"}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
+    true        // Show display header on/off
+);
+
+#endif

lib/obp60task/PageTwoValues.cpp

@@ -1,230 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
-#include "OBPDataOperations.h"
-#include "OBPcharts.h"
 
-class PageTwoValues : public Page {
+#ifdef ENABLE_CALIBRATION
+#include "BoatDataCalibration.h"
+#endif
+
+class PageTwoValues : public Page
+{
 private:
-    GwLog* logger;
+    String lengthformat;
-
-    enum PageMode {
-        VALUES,
-        VAL1_CHART,
-        VAL2_CHART,
-        CHARTS
-    };
-    enum DisplayMode {
-        FULL,
-        HALF
-    };
-
-    static constexpr char HORIZONTAL = 'H';
-    static constexpr char VERTICAL = 'V';
-    static constexpr int8_t FULL_SIZE = 0;
-    static constexpr int8_t HALF_SIZE_TOP = 1;
-    static constexpr int8_t HALF_SIZE_BOTTOM = 2;
-
-    static constexpr bool PRNT_NAME = true;
-    static constexpr bool NO_PRNT_NAME = false;
-    static constexpr bool PRNT_VALUE = true;
-    static constexpr bool NO_PRNT_VALUE = false;
-
-    static constexpr int YOFFSET = 130; // y offset for display of 2nd boat value
-
-    int width; // Screen width
-    int height; // Screen height
-
-    bool keylock = false; // Keylock
-    PageMode pageMode = VALUES; // Page display mode
-    int8_t dataIntv = 1; // Update interval for wind history chart:
-                         // (1)|(2)|(3)|(4)|(8) x 240 seconds for 4, 8, 12, 16, 32 min. history chart
-
-    // String lengthformat;
-    bool useSimuData;
-    bool holdValues;
-    String flashLED;
-    String backlightMode;
-    String tempFormat;
-
-    // Data buffer pointer (owned by HstryBuffers)
-    static constexpr int NUMVALUES = 2; // two data values in this page
-    RingBuffer<uint16_t>* dataHstryBuf[NUMVALUES] = { nullptr };
-    std::unique_ptr<Chart> dataChart[NUMVALUES]; // Chart object
-
-    // Old values for hold function
-    String sValueOld[NUMVALUES] = { "", "" };
-    String unitOld[NUMVALUES] = { "", "" };
-
-    // display data values in display <mode> [FULL|HALF]
-    void showData(const std::vector<GwApi::BoatValue*>& bValue, DisplayMode mode)
-    {
-        getdisplay().setTextColor(commonData->fgcolor);
-
-        int numValues = bValue.size(); // do we have to handle 1 or 2 values?
-
-        for (int i = 0; i < numValues; i++) {
-            int yOffset = YOFFSET * i;
-            String name = xdrDelete(bValue[i]->getName()); // Value name
-            name = name.substring(0, 6); // String length limit for value name
-            double value = bValue[i]->value; // Value as double in SI unit
-            bool valid = bValue[i]->valid; // Valid information
-            String sValue = formatValue(bValue[i], *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places
-            String unit = formatValue(bValue[i], *commonData).unit; // Unit of value
-
-            // Show name
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(20, 75 + yOffset);
-            getdisplay().print(name); // name
-
-            // Show unit
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(20, 125 + yOffset);
-
-            if (holdValues) {
-                getdisplay().print(unitOld[i]); // name
-            } else {
-                getdisplay().print(unit); // name
-            }
-
-            // Switch font depending on value format and adjust position
-            if (bValue[i]->getFormat() == "formatLatitude" || bValue[i]->getFormat() == "formatLongitude") {
-                getdisplay().setFont(&Ubuntu_Bold20pt8b);
-                getdisplay().setCursor(50, 125 + yOffset);
-            } else if (bValue[i]->getFormat() == "formatTime" || bValue[i]->getFormat() == "formatDate") {
-                getdisplay().setFont(&Ubuntu_Bold20pt8b);
-                getdisplay().setCursor(170, 105 + yOffset);
-            } else { // Default font for other formats
-                getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
-                getdisplay().setCursor(180, 125 + yOffset);
-            }
-
-            // Show bus data
-            if (!holdValues || useSimuData) {
-                getdisplay().print(sValue); // Real value as formated string
-            } else {
-                getdisplay().print(sValueOld[i]); // Old value as formated string
-            }
-
-            if (valid == true) {
-                sValueOld[i] = sValue; // Save the old value
-                unitOld[i] = unit; // Save the old unit
-            }
-        }
-
-        if (numValues == 2 && mode == FULL) { // print line only, if we want to show 2 data values
-            getdisplay().fillRect(0, 145, width, 3, commonData->fgcolor);             // Horizontal line 3 pix
-        }
-    }
 
 public:
-    PageTwoValues(CommonData& common)
+    PageTwoValues(CommonData &common) : Page(common)
     {
-        commonData = &common;
+        logger->logDebug(GwLog::LOG, "Instantiate PageTwoValue");
-        logger = commonData->logger;
-        LOG_DEBUG(GwLog::LOG, "Instantiate PageTwoValues");
-
-        width = getdisplay().width(); // Screen width
-        height = getdisplay().height(); // Screen height
 
         // Get config data
-        // lengthformat = commonData->config->getString(commonData->config->lengthFormat);
+        lengthformat = config->getString(config->lengthFormat);
-        useSimuData = commonData->config->getBool(commonData->config->useSimuData);
-        holdValues = commonData->config->getBool(commonData->config->holdvalues);
-        flashLED = commonData->config->getString(commonData->config->flashLED);
-        backlightMode = commonData->config->getString(commonData->config->backlight);
-        tempFormat = commonData->config->getString(commonData->config->tempFormat); // [K|°C|°F]
     }
 
-    virtual void setupKeys()
+    int handleKey(int key){
-    {
+        // Code for keylock
-        Page::setupKeys();
+        if(key == 11){
-
-#if defined BOARD_OBP60S3
-        constexpr int ZOOM_KEY = 4;
-#elif defined BOARD_OBP40S3
-        constexpr int ZOOM_KEY = 1;
-#endif
-
-        if (dataHstryBuf[0] || dataHstryBuf[1]) { // show "Mode" key only if at least 1 chart supported boat data type is available
-            commonData->keydata[0].label = "MODE";
-            commonData->keydata[ZOOM_KEY].label = "ZOOM";
-        } else {
-            commonData->keydata[0].label = "";
-            commonData->keydata[ZOOM_KEY].label = "";
-        }
-    }
-
-    // Key functions
-    virtual int handleKey(int key)
-    {
-        if (dataHstryBuf[0] || dataHstryBuf[1]) { // if at least 1 boat data type supports charts
-
-            // Set page mode: value | value/half chart | full charts
-            if (key == 1) {
-                switch (pageMode) {
-
-                case VALUES:
-
-                    if (dataHstryBuf[0]) {
-                        pageMode = VAL1_CHART;
-                    } else if (dataHstryBuf[1]) {
-                        pageMode = VAL2_CHART;
-                    }
-                    break;
-
-                case VAL1_CHART:
-
-                    if (dataHstryBuf[1]) {
-                        pageMode = VAL2_CHART;
-                    } else {
-                        pageMode = CHARTS;
-                    }
-                    break;
-
-                case VAL2_CHART:
-                    pageMode = CHARTS;
-                    break;
-
-                case CHARTS:
-                    pageMode = VALUES;
-                    break;
-                }
-                return 0; // Commit the key
-            }
-
-            // Set time frame to show for history chart
-#if defined BOARD_OBP60S3
-            if (key == 5) {
-#elif defined BOARD_OBP40S3
-            if (key == 2) {
-#endif
-                if (dataIntv == 1) {
-                    dataIntv = 2;
-                } else if (dataIntv == 2) {
-                    dataIntv = 3;
-                } else if (dataIntv == 3) {
-                    dataIntv = 4;
-                } else if (dataIntv == 4) {
-                    dataIntv = 8;
-                } else {
-                    dataIntv = 1;
-                }
-                return 0; // Commit the key
-            }
-        }
-
-        // Keylock function
-        if (key == 11) { // Code for keylock
             commonData->keylock = !commonData->keylock;
-            return 0; // Commit the key
+            return 0;                   // Commit the key
         }
         return key;
     }
 
-    virtual void displayNew(PageData& pageData)
+    void displayNew(PageData &pageData) {
-    {
 #ifdef BOARD_OBP60S3
         // Clear optical warning
         if (flashLED == "Limit Violation") {
@@ -232,96 +39,150 @@ public:
             setFlashLED(false);
         }
 #endif
-        // buffer initialization will fail, if page is default page, because <displayNew> is not executed at system start for default page
+    };
-        for (int i = 0; i < NUMVALUES; i++) {
-            if (!dataChart[i]) { // Create chart objects if they don't exist
 
-                GwApi::BoatValue* bValue = pageData.values[i]; // Page boat data element
+    int displayPage(PageData &pageData) {
-                String bValName = bValue->getName(); // Value name
-                String bValFormat = bValue->getFormat(); // Value format
 
-                dataHstryBuf[i] = pageData.hstryBuffers->getBuffer(bValName);
+        // Old values for hold function
+        static String svalue1old = "";
+        static String unit1old = "";
+        static String svalue2old = "";
+        static String unit2old = "";
 
-                if (dataHstryBuf[i]) {
+        
-                    dataChart[i].reset(new Chart(*dataHstryBuf[i], Chart::dfltChrtDta[bValFormat].range, *commonData, useSimuData));
+        // Get boat values #1
-                    LOG_DEBUG(GwLog::DEBUG, "PageTwoValues: Created chart object%d for %s", i, bValName.c_str());
+        GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
-                } else {
+        String name1 = xdrDelete(bvalue1->getName());   // Value name
-                    LOG_DEBUG(GwLog::DEBUG, "PageTwoValues: No chart object available for %s", bValName.c_str());
+        name1 = name1.substring(0, 6);                  // String length limit for value name
-                }
+#ifdef ENABLE_CALIBRATION
-            }
+        calibrationData.calibrateInstance(bvalue1, logger); // Check if boat data value is to be calibrated
-        }
+#endif
+        double value1 = bvalue1->value;                 // Value as double in SI unit
+        bool valid1 = bvalue1->valid;                   // Valid information 
+        String svalue1 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String unit1 = commonData->fmt->formatValue(bvalue1, *commonData).unit;        // Unit of value
 
-        setupKeys(); // adjust <mode> key depending on chart supported boat data type
+        // Get boat values #2
-    }
+        GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list
+        String name2 = xdrDelete(bvalue2->getName());   // Value name
+        name2 = name2.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
+        calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated
+#endif
+        double value2 = bvalue2->value;                 // Value as double in SI unit
+        bool valid2 = bvalue2->valid;                   // Valid information 
+        String svalue2 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String unit2 = commonData->fmt->formatValue(bvalue2, *commonData).unit;        // Unit of value
 
-    int displayPage(PageData& pageData)
+        // Logging boat values
-    {
+        if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG, "Display PageTwoValues");
+        logger->logDebug(GwLog::LOG, "Drawing at PageTwoValues, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2);
-
-        // Get boat values for page
-        std::vector<GwApi::BoatValue*> bValue;
-        bValue.push_back(pageData.values[0]); // Page boat data element 1
-        bValue.push_back(pageData.values[1]); // Page boat data element 2
-
-        // Optical warning by limit violation (unused)
-        if (String(flashLED) == "Limit Violation") {
-            setBlinkingLED(false);
-            setFlashLED(false);
-        }
-
-        if (bValue[0] == NULL && bValue[1] == NULL)
-            return PAGE_OK; // no data, no page to display
-
-        LOG_DEBUG(GwLog::DEBUG, "PageTwoValues: printing #1: %s, %.3f, #2: %s, %.3f",
-            bValue[0]->getName().c_str(), bValue[0]->value, bValue[1]->getName().c_str(), bValue[1]->value);
 
         // Draw page
         //***********************************************************
 
-        getdisplay().setPartialWindow(0, 0, width, height); // Set partial update
+        // Set display in partial refresh mode
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        if (pageMode == VALUES || (dataHstryBuf[0] == nullptr && dataHstryBuf[1] == nullptr)) {
+        // ############### Value 1 ################
-            // show only data value; ignore other pageMode options if no chart supported boat data history buffer is available
-            showData(bValue, FULL);
 
-        } else if (pageMode == VAL1_CHART) { // show data value 1 and chart
+        // Show name
-            showData({bValue[0]}, HALF);
+        epd->setTextColor(commonData->fgcolor);
-            if (dataChart[0]) {
+        epd->setFont(&Ubuntu_Bold20pt8b);
-                dataChart[0]->showChrt(HORIZONTAL, HALF_SIZE_BOTTOM, dataIntv, NO_PRNT_NAME, NO_PRNT_VALUE, *bValue[0]);
+        epd->setCursor(20, 80);
-            }
+        epd->print(name1);                           // Page name
 
-        } else if (pageMode == VAL2_CHART) { // show data value 2 and chart
+        // Show unit
-            showData({bValue[1]}, HALF);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-            if (dataChart[1]) {
+        epd->setCursor(20, 130);
-                dataChart[1]->showChrt(HORIZONTAL, HALF_SIZE_BOTTOM, dataIntv, NO_PRNT_NAME, NO_PRNT_VALUE, *bValue[1]);
+        if(holdvalues == false){
-            }
+            epd->print(unit1);                       // Unit
+        }
+        else{
+            epd->print(unit1old);
+        }
 
-        } else if (pageMode == CHARTS) { // show both data charts
+        // Switch font if format for any values
-            if (dataChart[0]) {
+        if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-                if (dataChart[1]) {
+            epd->setFont(&Ubuntu_Bold20pt8b);
-                    dataChart[0]->showChrt(HORIZONTAL, HALF_SIZE_TOP, dataIntv, PRNT_NAME, PRNT_VALUE, *bValue[0]);
+            epd->setCursor(50, 130);
-                } else {
+        }
-                    dataChart[0]->showChrt(HORIZONTAL, FULL_SIZE, dataIntv, PRNT_NAME, PRNT_VALUE, *bValue[0]);
+        else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-                }
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            }
+            epd->setCursor(170, 105);
-            if (dataChart[1]) {
+        }
-                if (dataChart[0]) {
+        else{
-                    dataChart[1]->showChrt(HORIZONTAL, HALF_SIZE_BOTTOM, dataIntv, PRNT_NAME, PRNT_VALUE, *bValue[1]);
+            epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
-                } else {
+            epd->setCursor(180, 130);
-                    dataChart[1]->showChrt(HORIZONTAL, FULL_SIZE, dataIntv, PRNT_NAME, PRNT_VALUE, *bValue[1]);
+        }
-                }
+
-            }
+        // Show bus data
+        if(holdvalues == false){
+            epd->print(svalue1);                                     // Real value as formated string
+        }
+        else{
+            epd->print(svalue1old);                                  // Old value as formated string
+        }
+        if(valid1 == true){
+            svalue1old = svalue1;                                       // Save the old value
+            unit1old = unit1;                                           // Save the old unit
+        }
+
+        // ############### Horizontal Line ################
+
+        // Horizontal line 3 pix
+        epd->fillRect(0, 145, 400, 3, commonData->fgcolor);
+
+        // ############### Value 2 ################
+
+        // Show name
+        epd->setFont(&Ubuntu_Bold20pt8b);
+        epd->setCursor(20, 190);
+        epd->print(name2);                           // Page name
+
+        // Show unit
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(20, 240);
+        if(holdvalues == false){
+            epd->print(unit2);                       // Unit
+        }
+        else{
+            epd->print(unit2old);
+        }
+
+        // Switch font if format for any values
+        if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
+            epd->setFont(&Ubuntu_Bold20pt8b);
+            epd->setCursor(50, 240);
+        }
+        else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
+            epd->setFont(&Ubuntu_Bold20pt8b);
+            epd->setCursor(170, 215);
+        }
+        else{
+            epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
+            epd->setCursor(180, 240);
+        }
+
+        // Show bus data
+        if(holdvalues == false){
+            epd->print(svalue2);                                     // Real value as formated string
+        }
+        else{
+            epd->print(svalue2old);                                  // Old value as formated string
+        }
+        if(valid2 == true){
+            svalue2old = svalue2;                                       // Save the old value
+            unit2old = unit2;                                           // Save the old unit
         }
 
         return PAGE_UPDATE;
     };
 };
 
-static Page* createPage(CommonData& common)
+static Page *createPage(CommonData &common){
-{
     return new PageTwoValues(common);
 }
-
 /**
  * with the code below we make this page known to the PageTask
  * we give it a type (name) that can be selected in the config
@@ -330,10 +191,10 @@ static Page* createPage(CommonData& common)
  * this will be number of BoatValue pointers in pageData.values
  */
 PageDescription registerPageTwoValues(
-    "TwoValues", // Page name
+    "TwoValues",    // Page name
-    createPage, // Action
+    createPage,     // Action
-    2, // Number of bus values depends on selection in Web configuration
+    2,              // Number of bus values depends on selection in Web configuration
-    true // Show display header on/off
+    true            // Show display header on/off
 );
 
 #endif

lib/obp60task/PageVoltage.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,16 +7,24 @@
 
 class PageVoltage : public Page
 {
-bool init = false;                  // Marker for init done
+private:
-uint8_t average = 0;                // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
+    String batVoltage;
-bool trend = true;                  // Trend indicator [0|1], 0=off, 1=on
+    String batType;
-double raw = 0;
+    bool init = false;                  // Marker for init done
-char mode = 'D';                    // display mode (A)nalog | (D)igital
+    uint8_t average = 0;                // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
+    bool trend = true;                  // Trend indicator [0|1], 0=off, 1=on
+    double raw = 0;
+    char mode = 'D';                    // display mode (A)nalog | (D)igital
 
 public:
-    PageVoltage(CommonData &common){
+    PageVoltage(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageVoltage");
+        logger->logDebug(GwLog::LOG, "Instantiate PageVoltage");
+
+        // Get config data
+        batVoltage = config->getString(config->batteryVoltage);
+        batType = config->getString(config->batteryType);
+
         if (hasFRAM) {
             average = fram.read(FRAM_VOLTAGE_AVG);
             trend = fram.read(FRAM_VOLTAGE_TREND);
@@ -23,14 +32,18 @@ public:
         }
     }
 
-    virtual void setupKeys(){
+    ~PageVoltage(){
+	    logger->logDebug(GwLog::LOG, "Destroy PageVoltage");
+	}
+
+    void setupKeys() {
         Page::setupKeys();
         commonData->keydata[0].label = "AVG";
         commonData->keydata[1].label = "MODE";
         commonData->keydata[4].label = "TRD";
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
          // Change average
         if(key == 1){
             average ++;
@@ -66,51 +79,41 @@ public:
     }
 
     void printAvg(int avg, uint16_t x, uint16_t y, bool prefix) {
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(x, y);
+        epd->setCursor(x, y);
         if (prefix) {
-            getdisplay().print("Avg: ");
+            epd->print("Avg: ");
         }
         switch (average) {
             case 0:
-                getdisplay().print("1s");
+                epd->print("1s");
                 break;
             case 1:
-                getdisplay().print("10s");
+                epd->print("10s");
                 break;
             case 2:
-                getdisplay().print("60s");
+                epd->print("60s");
                 break;
             case 3:
-                getdisplay().print("300s");
+                epd->print("300s");
                 break;
             default:
-                getdisplay().print("1s");
+                epd->print("1s");
                 break;
         }
     }
 
     void printVoltageSymbol(uint16_t x, uint16_t y, uint16_t color) {
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(x, y);
+        epd->setCursor(x, y);
-        getdisplay().print("V");
+        epd->print("V");
-        getdisplay().fillRect(x, y + 6, 22, 3, color);
+        epd->fillRect(x, y + 6, 22, 3, color);
-        getdisplay().fillRect(x, y + 11, 6, 3, color);
+        epd->fillRect(x, y + 11, 6, 3, color);
-        getdisplay().fillRect(x + 8, y + 11, 6, 3, color);
+        epd->fillRect(x + 8, y + 11, 6, 3, color);
-        getdisplay().fillRect(x + 16, y + 11, 6, 3, color);
+        epd->fillRect(x + 16, y + 11, 6, 3, color);
     }
 
-    int displayPage(PageData &pageData){
+    int displayPage(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
-        
-        // Get config data
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String batVoltage = config->getString(config->batteryVoltage);
-        String batType = config->getString(config->batteryType);
-        String backlightMode = config->getString(config->backlight);
 
         double value1 = 0;
         double valueTrend = 0;  // Average over 10 values
@@ -151,92 +154,76 @@ public:
         bool valid1 = true;
 
         // Optical warning by limit violation
-        if(String(flashLED) == "Limit Violation"){
+        if (flashLED == "Limit Violation") {
-            // Limits for Pb battery
+            bool violation = false;
-            if(String(batType) == "Pb" && (raw < 11.8 || raw > 14.8)){
+            if (batType == "Pb") {
+                violation = (raw < 11.8 || raw > 14.8);
+            } else if (batType == "Gel") {
+                violation = (raw < 11.8 || raw > 14.4);
+            } else if (batType == "AGM") {
+                violation = (raw < 11.8 || raw > 14.7);
+            } else if (batType == "LiFePo4") {
+                violation = (raw < 12.0 || raw > 14.6);
+            }
+            if (violation) {
                 setBlinkingLED(true);
-            }
+            } else {
-            if(String(batType) == "Pb" && (raw >= 11.8 && raw <= 14.8)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for Gel battery
-            if(String(batType) == "Gel" && (raw < 11.8 || raw > 14.4)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "Gel" && (raw >= 11.8 && raw <= 14.4)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for AGM battery
-            if(String(batType) == "AGM" && (raw < 11.8 || raw > 14.7)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "AGM" && (raw >= 11.8 && raw <= 14.7)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for LiFePo4 battery
-            if(String(batType) == "LiFePo4" && (raw < 12.0 || raw > 14.6)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "LiFePo4" && (raw >= 12.0 && raw <= 14.6)){
                 setBlinkingLED(false);
                 setFlashLED(false);
             }
         }
-        
+
         // Logging voltage value
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageVoltage, Type:%s %s:=%f", batType, name1.c_str(), raw);
+        logger->logDebug(GwLog::LOG, "Drawing at PageVoltage, Type:%s %s:=%f", batType, name1.c_str(), raw);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
         if (mode == 'D') {
             // Display mode digital
 
             // Show name
-            getdisplay().setTextColor(commonData->fgcolor);
+            epd->setTextColor(commonData->fgcolor);
-            getdisplay().setFont(&Ubuntu_Bold32pt8b);
+            epd->setFont(&Ubuntu_Bold32pt8b);
-            getdisplay().setCursor(20, 100);
+            epd->setCursor(20, 100);
-            getdisplay().print(name1);                           // Value name
+            epd->print(name1);                           // Value name
 
-            #if defined BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
+#if defined BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
             // Show charge status
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(185, 100);
+            epd->setCursor(185, 100);
             if(commonData->data.BatteryChargeStatus == true){
-                getdisplay().print("Charge");
+                epd->print("Charge");
             }
             else{
-                getdisplay().print("Discharge");
+                epd->print("Discharge");
             }
-            #endif
+#endif
 
             // Show unit
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(270, 100);
+            epd->setCursor(270, 100);
-            getdisplay().print("V");
+            epd->print("V");
 
             // Show battery type
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(295, 100);
+            epd->setCursor(295, 100);
-            #ifdef BOARD_OBP60S3
+#ifdef BOARD_OBP60S3
-            getdisplay().print(batType);
+            epd->print(batType);
-            #endif
+#endif
-            #if defined BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
+#if defined BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
-            getdisplay().print("LiPo");
+            epd->print("LiPo");
-            #endif
+#endif
 
             // Show average settings
             printAvg(average, 320, 84, true);
 
             // Reading bus data or using simulation data
-            getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic60pt7b);
-            getdisplay().setCursor(20, 240);
+            epd->setCursor(20, 240);
             if(simulation == true){
                 if(batVoltage == "12V"){
                     value1 = 12.0;
@@ -245,30 +232,30 @@ public:
                     value1 = 24.0;
                 }
                 value1 += float(random(0, 5)) / 10;         // Simulation data
-                getdisplay().print(value1,1);
+                epd->print(value1,1);
             }
             else{
                 // Check for valid real data, display also if hold values activated
                 if(valid1 == true || holdvalues == true){
                     // Resolution switching
                     if(value1 < 10){
-                        getdisplay().print(value1,2);
+                        epd->print(value1,2);
                     }
                     if(value1 >= 10 && value1 < 100){
-                        getdisplay().print(value1,1);
+                        epd->print(value1,1);
                     }
                     if(value1 >= 100){
-                        getdisplay().print(value1,0);
+                        epd->print(value1,0);
                     }
                 }
                 else{
-                getdisplay().print("---");                       // Missing bus data
+                    epd->print(commonData->fmt->placeholder); // Missing bus data
                 }
             }
 
             // Show trend indicator
             if(trend == true){
-                getdisplay().fillRect(315, 183, 35, 4, commonData->fgcolor);   // Draw separator
+                epd->fillRect(315, 183, 35, 4, commonData->fgcolor);   // Draw separator
                 if(int(raw * 10) > int(valueTrend * 10)){
                     displayTrendHigh(320, 174, 11, commonData->fgcolor);  // Show high indicator
                 }
@@ -289,9 +276,9 @@ public:
             std::vector<Point> pts;
 
             // Instrument
-            getdisplay().drawCircleHelper(c.x, c.y, r + 2, 0x01, commonData->fgcolor);
+            epd->drawCircleHelper(c.x, c.y, r + 2, 0x01, commonData->fgcolor);
-            getdisplay().drawCircleHelper(c.x, c.y, r + 1, 0x01, commonData->fgcolor);
+            epd->drawCircleHelper(c.x, c.y, r + 1, 0x01, commonData->fgcolor);
-            getdisplay().drawCircleHelper(c.x, c.y, r    , 0x01, commonData->fgcolor);
+            epd->drawCircleHelper(c.x, c.y, r    , 0x01, commonData->fgcolor);
 
             // Scale
             // angle to voltage scale mapping
@@ -304,7 +291,7 @@ public:
                 {c.x - r + 12, c.y + 1},
                 {c.x - r, c.y + 1}
             };
-            getdisplay().setFont(&Ubuntu_Bold10pt8b);
+            epd->setFont(&Ubuntu_Bold10pt8b);
             for (int angle = 3; angle < 90; angle += 3) {
                 if (angle % 15 == 0) {
                     fillPoly4(rotatePoints(c, pts, angle), commonData->fgcolor);
@@ -314,7 +301,7 @@ public:
                 else {
                     p1 = rotatePoint(c, {c.x - r, c.y}, angle);
                     p2 = rotatePoint(c, {c.x - r + 6, c.y}, angle);
-                    getdisplay().drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
+                    epd->drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
                 }
             }
 
@@ -354,31 +341,31 @@ public:
             fillPoly4(rotatePoints(c, pts, angle), commonData->fgcolor);
 
             // base
-            getdisplay().fillCircle(c.x, c.y, 7, commonData->fgcolor);
+            epd->fillCircle(c.x, c.y, 7, commonData->fgcolor);
-            getdisplay().fillCircle(c.x, c.y, 4, commonData->bgcolor);
+            epd->fillCircle(c.x, c.y, 4, commonData->bgcolor);
 
             // Symbol
             printVoltageSymbol(40, 60, commonData->fgcolor);
 
             // Additional information at right side
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(300, 60);
+            epd->setCursor(300, 60);
-            getdisplay().print("Source:");
+            epd->print("Source:");
-            getdisplay().setCursor(300, 80);
+            epd->setCursor(300, 80);
-            getdisplay().print(name1);
+            epd->print(name1);
 
-            getdisplay().setCursor(300, 110);
+            epd->setCursor(300, 110);
-            getdisplay().print("Type:");
+            epd->print("Type:");
-            getdisplay().setCursor(300, 130);
+            epd->setCursor(300, 130);
-            getdisplay().print(batType);
+            epd->print(batType);
 
-            getdisplay().setCursor(300, 160);
+            epd->setCursor(300, 160);
-            getdisplay().print("Avg:");
+            epd->print("Avg:");
             printAvg(average, 300, 180, false);
 
             // FRAM indicator
             if (hasFRAM) {
-                getdisplay().drawXBitmap(300, 240, fram_bits, icon_width, icon_height, commonData->fgcolor);
+                epd->drawXBitmap(300, 240, fram_bits, icon_width, icon_height, commonData->fgcolor);
             }
 
         }

lib/obp60task/PageWhite.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -13,16 +14,17 @@
 
 class PageWhite : public Page
 {
-char mode = 'W';  // display mode (W)hite | (L)ogo | (M)FD logo
+private:
+    char mode = 'W';  // display mode (W)hite | (L)ogo | (M)FD logo
 
 public:
-    PageWhite(CommonData &common){
+    PageWhite(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageWhite");
+        logger->logDebug(GwLog::LOG, "Instantiate PageWhite");
         refreshtime = 15000;
     }
 
-    virtual int handleKey(int key) {
+    int handleKey(int key) {
          // Change display mode
         if (key == 1) {
             if (mode == 'W') {
@@ -37,21 +39,20 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
-
+        if (flashLED == "Limit Violation") {
-        // Get config data
-        String flashLED = config->getString(config->flashLED);
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
-            setFlashLED(false); 
+            setFlashLED(false);
         }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageWhite");
+        logger->logDebug(GwLog::LOG, "Drawing at PageWhite");
 
         // Draw page
         //***********************************************************
@@ -61,19 +62,19 @@ public:
 
         // Set display in partial refresh mode
         if (mode == 'W') {
-            getdisplay().setFullWindow();
+            epd->setFullWindow();
         } else {
-            getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+            epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
         }
 
         if (mode == 'L') {
-            getdisplay().drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData->fgcolor);
+            epd->drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData->fgcolor);
         } else if (mode == 'M') {
 #ifdef BOARD_OBP60S3
-            getdisplay().drawXBitmap(0, 0, OBP60_400x300_bits, OBP60_400x300_width, OBP60_400x300_height, commonData->fgcolor);
+            epd->drawXBitmap(0, 0, OBP60_400x300_bits, OBP60_400x300_width, OBP60_400x300_height, commonData->fgcolor);
 #endif
 #ifdef BOARD_OBP40S3
-            getdisplay().drawXBitmap(0, 0, OBP40_400x300_bits, OBP40_400x300_width, OBP40_400x300_height, commonData->fgcolor);
+            epd->drawXBitmap(0, 0, OBP40_400x300_bits, OBP40_400x300_width, OBP40_400x300_height, commonData->fgcolor);
 #endif
         }
 

lib/obp60task/PageWind.cpp

@@ -1,9 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 #include "N2kMessages.h"
 
+#ifdef ENABLE_CALIBRATION
+#include "BoatDataCalibration.h"
+#endif
+
 #define front_width 120
 #define front_height 162
 static unsigned char front_bits[] PROGMEM = {
@@ -213,15 +218,21 @@ static unsigned char front_bits[] PROGMEM = {
 
 class PageWind : public Page
 {
-bool keylock = false;               // Keylock
+private:
-int8_t lp = 80;                     // Pointer length
+    String lengthformat;
-char mode = 'N';                    // page mode (N)ormal | (L)ens | e(X)ample
+    bool keylock = false;   // Keylock
-char source = 'A';                  // data source (A)pparent | (T)rue
+    int8_t lp = 80;         // Pointer length
+    char mode = 'N';        // page mode (N)ormal | (L)ens | e(X)ample
+    char source = 'A';      // data source (A)pparent | (T)rue
 
 public:
-    PageWind(CommonData &common){
+    PageWind(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageWind");
+        logger->logDebug(GwLog::LOG, "Instantiate PageWind");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
+
         if (hasFRAM) {
             lp = fram.read(FRAM_WIND_SIZE);
             source = fram.read(FRAM_WIND_SRC);
@@ -229,7 +240,7 @@ public:
         }
     }
 
-    virtual void setupKeys(){
+    void setupKeys() {
         Page::setupKeys();
         commonData->keydata[0].label = "MODE";
         if (mode == 'X') {
@@ -241,13 +252,13 @@ public:
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key) {
 
         if(key == 1){               // Mode switch
             if(mode == 'N'){
                 mode = 'L';
-        //    } else if (mode == 'L') {
+            } else if (mode == 'L') {
-        //        mode = 'X';
+                mode = 'X';
             } else {
                 mode = 'N';
             }
@@ -295,23 +306,23 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData)
+    void displayNew(PageData &pageData) {
-    {
+#ifdef BOARD_OBP60S3
-        GwConfigHandler *config = commonData->config;
+        // Clear optical warning
-        GwLog *logger = commonData->logger;
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         static String svalue1old = "";
         static String unit1old = "";
         static String svalue2old = "";
         static String unit2old = "";
 
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-
         GwApi::BoatValue *bvalue1; // Value 1 for speed on top
         GwApi::BoatValue *bvalue2; // Value 2 for angle on bottom
 
@@ -323,10 +334,13 @@ public:
         }
         String name1 = bvalue1->getName().c_str();      // Value name
         name1 = name1.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
+        calibrationData.calibrateInstance(bvalue1, logger); // Check if boat data value is to be calibrated
+#endif
         double value1 = bvalue1->value;                 // Value as double in SI unit
         // bool valid1 = bvalue1->valid;                   // Valid information
-        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
+        String unit1 = commonData->fmt->formatValue(bvalue1, *commonData).unit;        // Unit of value
 
         // Get boat values for angle (AWD/TWD)
         if (source == 'A') {
@@ -336,73 +350,70 @@ public:
         }
         String name2 = bvalue2->getName().c_str();      // Value name
         name2 = name2.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
+        calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated
+#endif
         double value2 = bvalue2->value;                 // Value as double in SI unit
         // bool valid2 = bvalue2->valid;                   // Valid information
         if (simulation) {
             value2 = 0.62731; // some random value
         }
-        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
+        String unit2 = commonData->fmt->formatValue(bvalue2, *commonData).unit;        // Unit of value
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
 
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageWind, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
+        logger->logDebug(GwLog::LOG, "Drawing at PageWind, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
 
         if (mode == 'X') {
             // Original example code with scaling circle
 
             // Show values AWS/TWS
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(20, 50);
+            epd->setCursor(20, 50);
-            getdisplay().print(name1);                       // Value name
+            epd->print(name1);                       // Value name
-            getdisplay().print(": ");
+            epd->print(": ");
             if(holdvalues == false){
-                getdisplay().print(svalue1);                     // Value
+                epd->print(svalue1);                     // Value
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(unit1);                       // Unit
+                epd->print(unit1);                       // Unit
             }
             else{
-                getdisplay().print(svalue1old);                  // Value old
+                epd->print(svalue1old);                  // Value old
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(unit1old);                    // Unit old
+                epd->print(unit1old);                    // Unit old
             }
 
             // Show values AWD/TWD
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(20, 260);
+            epd->setCursor(20, 260);
-            getdisplay().print(name2);                       // Value name
+            epd->print(name2);                       // Value name
-            getdisplay().print(": ");
+            epd->print(": ");
             if(holdvalues == false){
-                getdisplay().print(svalue2);                     // Value
+                epd->print(svalue2);                     // Value
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(unit2);                       // Unit
+                epd->print(unit2);                       // Unit
             }
             else{
-                getdisplay().print(svalue2old);                  // Value old
+                epd->print(svalue2old);                  // Value old
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(unit2old);                    // Unit old
+                epd->print(unit2old);                    // Unit old
             }
 
             Point c = {200, 145};
 
             // Draw instrument
-            getdisplay().fillCircle(c.x, c.y, lp + 5, commonData->fgcolor);
+            epd->fillCircle(c.x, c.y, lp + 5, commonData->fgcolor);
-            getdisplay().fillCircle(c.x, c.y, lp + 1, commonData->bgcolor);
+            epd->fillCircle(c.x, c.y, lp + 1, commonData->bgcolor);
 
             // Wind pointer
             if (bvalue2->valid or simulation) {
@@ -417,7 +428,7 @@ public:
                 };
                 fillPoly4(rotatePoints(c, pts, RadToDeg(value2)), commonData->fgcolor);
             } else {
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 
@@ -435,7 +446,7 @@ public:
             };
             int angle;
 
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
 
             // starbord
             // text with line
@@ -450,7 +461,7 @@ public:
             for (int i = 30; i < 138; i += 6) {
                  if (i % 15 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      getdisplay().fillCircle(p.x, p.y, 2, commonData->fgcolor);
+                      epd->fillCircle(p.x, p.y, 2, commonData->fgcolor);
                  }
             }
 
@@ -467,17 +478,17 @@ public:
             for (int i = 228; i < 330; i += 6) {
                  if (i % 15 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      getdisplay().fillCircle(p.x, p.y, 2, commonData->fgcolor);
+                      epd->fillCircle(p.x, p.y, 2, commonData->fgcolor);
                  }
             }
 
             // data source
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(8, 50);
+            epd->setCursor(8, 50);
             if (source == 'A') {
-                getdisplay().print("APP");
+                epd->print("APP");
             } else {
-                getdisplay().print("TRUE");
+                epd->print("TRUE");
             }
 
             // Wind pointer (angle)
@@ -497,7 +508,7 @@ public:
                     alpha *= -1;
                 }
 
-                getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
+                epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
                 pts = {
                     {c.x - 1, c.y - (r - 20)},
                     {c.x + 1, c.y - (r - 20)},
@@ -505,39 +516,39 @@ public:
                     {c.x - 6, c.y + 15}
                 };
                 fillPoly4(rotatePoints(c, pts, alpha), commonData->fgcolor);
-                getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
+                epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
             } else {
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 
             // Wind speed as decimal number
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(150, 250);
+            epd->setCursor(150, 250);
             if (holdvalues == false) {
-                getdisplay().print(svalue1);
+                epd->print(svalue1);
             } else {
-                getdisplay().print(svalue1old);
+                epd->print(svalue1old);
             }
             // unit
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(220, 265);
+            epd->setCursor(220, 265);
-            getdisplay().print("kts");
+            epd->print("kts");
         }
         else {
             // Normal mode
 
             // data source
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(8, 50);
+            epd->setCursor(8, 50);
             if (source == 'A') {
-                getdisplay().print("APP");
+                epd->print("APP");
             } else {
-                getdisplay().print("TRUE");
+                epd->print("TRUE");
             }
 
             // draw ship front symbol (as bitmap)
-            getdisplay().drawXBitmap(140, 30, front_bits, front_width, front_height, commonData->fgcolor);
+            epd->drawXBitmap(140, 30, front_bits, front_width, front_height, commonData->fgcolor);
 
             Point c = {200, 155};
             uint16_t r = 150;
@@ -562,7 +573,7 @@ public:
             for (int i = 30; i < 150; i += 10) {
                  if (i % 30 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
+                      epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
                  }
             }
 
@@ -579,27 +590,27 @@ public:
             for (int i = 210; i < 340; i += 10) {
                  if (i % 30 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
+                      epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
                  }
             }
 
             // Wind speed as decimal number
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(150, 250);
+            epd->setCursor(150, 250);
             if (holdvalues == false) {
-                getdisplay().print(svalue1);
+                epd->print(svalue1);
             } else {
-                getdisplay().print(svalue1old);
+                epd->print(svalue1old);
             }
             // unit
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(220, 265);
+            epd->setCursor(220, 265);
-            getdisplay().print("kts");
+            epd->print("kts");
 
             // Wind pointer (angle)
             if (bvalue2->valid or simulation) {
                 float alpha = RadToDeg(value2);
-                getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
+                epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
                 pts = {
                     {c.x - 1, c.y - (r - 20)},
                     {c.x + 1, c.y - (r - 20)},
@@ -607,9 +618,9 @@ public:
                     {c.x - 6, c.y + 15}
                 };
                 fillPoly4(rotatePoints(c, pts, alpha), commonData->fgcolor);
-                getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
+                epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
             } else {
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 

lib/obp60task/PageWindPlot.cpp

@@ -6,7 +6,8 @@
 #include "OBPcharts.h"
 
 // ****************************************************************
-class PageWindPlot : public Page {
+class PageWindPlot : public Page 
+{
 
 private:
     GwLog* logger;
@@ -28,8 +29,8 @@ private:
     static constexpr bool PRNT_VALUE = true;
     static constexpr bool NO_PRNT_VALUE = false;
 
-    int width; // Screen width
+    // int width; // Screen width
-    int height; // Screen height
+    // int height; // Screen height
 
     bool keylock = false; // Keylock
     ChartMode chrtMode = DIRECTION;
@@ -64,25 +65,18 @@ private:
     GwApi::BoatValue* wsBVal = nullptr;
 
 public:
-    PageWindPlot(CommonData& common)
+    PageWindPlot(CommonData& common) : Page(common)
     {
-        commonData = &common;
+        logger->logDebug(GwLog::LOG, "Instantiate PageWindPlot");
-        logger = commonData->logger;
-        LOG_DEBUG(GwLog::LOG, "Instantiate PageWindPlot");
 
-        width = getdisplay().width(); // Screen width
+        //width = epd->width(); // Screen width
-        height = getdisplay().height(); // Screen height
+        //height = epd->height(); // Screen height
 
         // Get config data
-        useSimuData = common.config->getBool(common.config->useSimuData);
-        // holdValues = common.config->getBool(common.config->holdvalues);
-        flashLED = common.config->getString(common.config->flashLED);
-        backlightMode = common.config->getString(common.config->backlight);
-
         oldShowTruW = !showTruW; // makes wind source being initialized at initial page call
     }
 
-    virtual void setupKeys()
+    void setupKeys()
     {
         Page::setupKeys();
         commonData->keydata[0].label = "MODE";
@@ -95,7 +89,7 @@ public:
     }
 
     // Key functions
-    virtual int handleKey(int key)
+    int handleKey(int key)
     {
         // Set chart mode
         if (key == 1) {
@@ -106,14 +100,14 @@ public:
             } else {
                 chrtMode = DIRECTION;
             }
-            return 0; // Commit the key
+            return 0;
         }
 
 #if defined BOARD_OBP60S3
         // Set data source TRUE | APP
         if (key == 2) {
             showTruW = !showTruW;
-            return 0; // Commit the key
+            return 0;
         }
 
         // Set interval for wind history chart update time (interval)
@@ -132,7 +126,7 @@ public:
             } else {
                 dataIntv = 1;
             }
-            return 0; // Commit the key
+            return 0;
         }
 
         // Keylock function
@@ -195,8 +189,8 @@ public:
 
     int displayPage(PageData& pageData)
     {
-        LOG_DEBUG(GwLog::LOG, "Display PageWindPlot");
+        logger->logDebug(GwLog::LOG, "Display PageWindPlot");
-        ulong pageTime = millis();
+        // ulong pageTime = millis();
 
         if (showTruW != oldShowTruW) {
 
@@ -215,14 +209,14 @@ public:
 
             oldShowTruW = showTruW;
         }
-        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot: draw with data %s: %.2f, %s: %.2f", wdBVal->getName().c_str(), wdBVal->value, wsBVal->getName().c_str(), wsBVal->value);
+        logger->logDebug(GwLog::DEBUG, "PageWindPlot: draw with data %s: %.2f, %s: %.2f", wdBVal->getName().c_str(), wdBVal->value, wsBVal->getName().c_str(), wsBVal->value);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, width, height); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height());
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         if (chrtMode == DIRECTION) {
             if (wdChart) {
@@ -243,7 +237,7 @@ public:
             }
         }
 
-        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot: page time %ldms", millis() - pageTime);
+        // logger->logDebug(GwLog::DEBUG, "PageWindPlot: page time %ldms", millis() - pageTime);
         return PAGE_UPDATE;
     }
 };
@@ -266,4 +260,4 @@ PageDescription registerPageWindPlot(
     true // Show display header on/off
 );
 
-#endif
+#endif

lib/obp60task/PageWindRose.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -5,16 +6,21 @@
 
 class PageWindRose : public Page
 {
-int16_t lp = 80;                    // Pointer length
+private:
+    String lengthformat;
+    int16_t lp = 80; // Pointer length
 
 public:
-    PageWindRose(CommonData &common){
+    PageWindRose(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageWindRose");
+        logger->logDebug(GwLog::LOG, "Instantiate PageWindRose");
+
+        // Get config data
+        String lengthformat = config->getString(config->lengthFormat);
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -23,216 +29,174 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
 
-        static String svalue1old = "";
+    int displayPage(PageData &pageData) {
-        static String unit1old = "";
-        static String svalue2old = "";
-        static String unit2old = "";
-        static String svalue3old = "";
-        static String unit3old = "";
-        static String svalue4old = "";
-        static String unit4old = "";
-        static String svalue5old = "";
-        static String unit5old = "";
-        static String svalue6old = "";
-        static String unit6old = "";
 
-        // Get config data
+        // storage for hold values
-        String lengthformat = config->getString(config->lengthFormat);
+        static FormattedData bvf_awa_old;
-        bool simulation = config->getBool(config->useSimuData);
+        static FormattedData bvf_aws_old;
-        bool holdvalues = config->getBool(config->holdvalues);
+        static FormattedData bvf_twd_old;
-        String flashLED = config->getString(config->flashLED);
+        static FormattedData bvf_tws_old;
-        String backlightMode = config->getString(config->backlight);
+        static FormattedData bvf_dbt_old;
+        static FormattedData bvf_stw_old;
+        // units? why?
 
         // Get boat value for AWA
-        GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
+        GwApi::BoatValue *bv_awa = pageData.values[0];     // First element in list
-        String name1 = xdrDelete(bvalue1->getName());   // Value name
+        String name_awa = xdrDelete(bv_awa->getName(), 6); // get name without prefix and limit length
-        name1 = name1.substring(0, 6);                  // String length limit for value name
+        FormattedData bvf_awa = commonData->fmt->formatValue(bv_awa, *commonData);
-        double value1 = bvalue1->value;                 // Value as double in SI unit
+        if (bv_awa->valid) { // Save formatted data for hold feature
-        bool valid1 = bvalue1->valid;                   // Valid information
+            bvf_awa_old = bvf_awa;
-        value1 = formatValue(bvalue1, *commonData).value;// Format only nesaccery for simulation data for pointer
-        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
-        if(valid1 == true){
-            svalue1old = svalue1;   	                // Save old value
-            unit1old = unit1;                           // Save old unit
         }
 
         // Get boat value for AWS
-        GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list
+        GwApi::BoatValue *bv_aws = pageData.values[1]; // Second element in list
-        String name2 = xdrDelete(bvalue2->getName());   // Value name
+        String name_aws = xdrDelete(bv_aws->getName(), 6); // get name without prefix and limit length
-        name2 = name2.substring(0, 6);                  // String length limit for value name
+        FormattedData bvf_aws = commonData->fmt->formatValue(bv_aws, *commonData);
-        double value2 = bvalue2->value;                 // Value as double in SI unit
+        if (bv_aws->valid) { // Save formatted data for hold feature
-        bool valid2 = bvalue2->valid;                   // Valid information 
+            bvf_aws_old = bvf_aws;
-        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
-        if(valid2 == true){
-            svalue2old = svalue2;   	                // Save old value
-            unit2old = unit2;                           // Save old unit
         }
 
         // Get boat value for TWD
-        GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third element in list
+        GwApi::BoatValue *bv_twd = pageData.values[2];  // Third element in list
-        String name3 = xdrDelete(bvalue3->getName());   // Value name
+        String name_twd = xdrDelete(bv_twd->getName(), 6); // get name without prefix and limit length
-        name3 = name3.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
-        double value3 = bvalue3->value;                 // Value as double in SI unit
+        calibrationData.calibrateInstance(bv_twd, logger); // Check if boat data value is to be calibrated
-        bool valid3 = bvalue3->valid;                   // Valid information 
+#endif
-        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        FormattedData bvf_twd = commonData->fmt->formatValue(bv_twd, *commonData);
-        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
+        if (bv_twd->valid) { // Save formatted data for hold feature
-        if(valid3 == true){
+            bvf_twd_old = bvf_twd;
-            svalue3old = svalue3;   	                // Save old value
-            unit3old = unit3;                           // Save old unit
         }
 
         // Get boat value for TWS
-        GwApi::BoatValue *bvalue4 = pageData.values[3]; // Fourth element in list
+        GwApi::BoatValue *bv_tws = pageData.values[3];      // Fourth element in list
-        String name4 = xdrDelete(bvalue4->getName());   // Value name
+        String name_tws = xdrDelete(bv_tws->getName(), 6);  // get name without prefix and limit length
-        name4 = name4.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
-        double value4 = bvalue4->value;                 // Value as double in SI unit
+        calibrationData.calibrateInstance(bv_tws, logger); // Check if boat data value is to be calibrated
-        bool valid4 = bvalue4->valid;                   // Valid information 
+#endif
-        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        FormattedData bvf_tws = commonData->fmt->formatValue(bv_tws, *commonData);
-        String unit4 = formatValue(bvalue4, *commonData).unit;        // Unit of value
+        if (bv_tws->valid) { // Save formatted data for hold feature
-        if(valid4 == true){
+            bvf_tws_old = bvf_tws;
-            svalue4old = svalue4;   	                // Save old value
-            unit4old = unit4;                           // Save old unit
         }
 
         // Get boat value for DBT
-        GwApi::BoatValue *bvalue5 = pageData.values[4]; // Fifth element in list
+        GwApi::BoatValue *bv_dbt = pageData.values[4];      // Fifth element in list
-        String name5 = xdrDelete(bvalue5->getName());   // Value name
+        String name_dbt = xdrDelete(bv_dbt->getName(), 6);  // get name without prefix and limit length
-        name5 = name5.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
-        double value5 = bvalue5->value;                 // Value as double in SI unit
+        calibrationData.calibrateInstance(bv_dbt, logger); // Check if boat data value is to be calibrated
-        bool valid5 = bvalue5->valid;                   // Valid information 
+#endif
-        String svalue5 = formatValue(bvalue5, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        FormattedData bvf_dbt = commonData->fmt->formatValue(bv_dbt, *commonData);
-        String unit5 = formatValue(bvalue5, *commonData).unit;        // Unit of value
+        if (bv_dbt->valid) { // Save formatted data for hold feature
-        if(valid5 == true){
+            bvf_dbt_old = bvf_dbt;
-            svalue5old = svalue5;   	                // Save old value
-            unit5old = unit5;                           // Save old unit
         }
 
         // Get boat value for STW
-        GwApi::BoatValue *bvalue6 = pageData.values[5]; // Sixth element in list
+        GwApi::BoatValue *bv_stw = pageData.values[5];      // Sixth element in list
-        String name6 = xdrDelete(bvalue6->getName());   // Value name
+        String name_stw = xdrDelete(bv_stw->getName(), 6);  // get name without prefix and limit length
-        name6 = name6.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
-        double value6 = bvalue6->value;                 // Value as double in SI unit
+        calibrationData.calibrateInstance(bv_stw, logger); // Check if boat data value is to be calibrated
-        bool valid6 = bvalue6->valid;                   // Valid information 
+#endif
-        String svalue6 = formatValue(bvalue6, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        FormattedData bvf_stw = commonData->fmt->formatValue(bv_stw, *commonData);
-        String unit6 = formatValue(bvalue6, *commonData).unit;        // Unit of value
+        if (bv_stw->valid) { // Save formatted data for hold feature
-        if(valid6 == true){
+            bvf_stw_old = bvf_stw;
-            svalue6old = svalue6;   	                // Save old value
-            unit6old = unit6;                           // Save old unit
         }
 
-        // Optical warning by limit violation (unused)
+        // Log boat values
-        if(String(flashLED) == "Limit Violation"){
+        logger->logDebug(GwLog::LOG, "Drawing at PageWindRose, %s:%f,  %s:%f,  %s:%f,  %s:%f,  %s:%f,  %s:%f",
-            setBlinkingLED(false);
+            name_awa.c_str(), bv_awa->value,
-            setFlashLED(false); 
+            name_aws.c_str(), bv_aws->value,
-        }
+            name_twd.c_str(), bv_twd->value,
-
+            name_tws.c_str(), bv_tws->value,
-        // Logging boat values
+            name_dbt.c_str(), bv_dbt->value,
-        if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
+            name_stw.c_str(), bv_stw->value);
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageWindRose, %s:%f,  %s:%f,  %s:%f,  %s:%f,  %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4, name5.c_str(), value5, name6.c_str(), value6);
 
         // Draw page
-        //***********************************************************
+        // *********************************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height());
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show values AWA
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print(svalue1);                     // Value
+        epd->print(holdvalues ? bvf_awa_old.value : bvf_awa.value);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 95);
+        epd->setCursor(10, 95);
-        getdisplay().print(name1);                       // Name
+        epd->print(name_awa);
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 115);
+        epd->setCursor(10, 115);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? bvf_awa_old.unit : bvf_awa.unit);
-            getdisplay().print(unit1);                   // Unit
-        }
-        else{
-            getdisplay().print(unit1old);                // Unit
-        }
 
         // Horizintal separator left
-        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
+        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show values AWS
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 270);
+        epd->setCursor(10, 270);
-        getdisplay().print(svalue2);                     // Value
+        epd->print(holdvalues ? bvf_aws_old.value : bvf_aws.value);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 220);
+        epd->setCursor(10, 220);
-        getdisplay().print(name2);                       // Name
+        epd->print(name_aws);
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 190);
+        epd->setCursor(10, 190);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? bvf_aws_old.unit : bvf_aws.unit);
-            getdisplay().print(unit2);                   // Unit
-        }
-        else{
-            getdisplay().print(unit2old);                // Unit
-        }
 
-        // Show values TWD
+        // Show value TWD
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(295, 65);
+        epd->setCursor(295, 65);
-        if(valid3 == true){
+        // TODO WTF? Der Formatter sollte das korrekt machen
-            getdisplay().print(abs(value3 * 180 / PI), 0);   // Value
+        if (bv_twd->valid) {
+            epd->print(abs(bv_twd->value * 180 / PI), 0);   // Value
         }
-        else{
+        else {
-            getdisplay().print("---");                   // Value
+            epd->print(commonData->fmt->placeholder);
-        }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 95);
-        getdisplay().print(name3);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 115);
-        getdisplay().print(" ");
-        if(holdvalues == false){
-            getdisplay().print(unit3);                   // Unit
-        }
-        else{
-            getdisplay().print(unit3old);                // Unit
         }
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(335, 95);
+        epd->print(name_twd);                       // Name
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        epd->setCursor(335, 115);
+        epd->print(" ");
+        epd->print(holdvalues ? bvf_twd_old.unit : bvf_twd.unit);
 
         // Horizintal separator right
-        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
+        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show values TWS
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(295, 270);
+        epd->setCursor(295, 270);
-        getdisplay().print(svalue4);                     // Value
+        epd->print(name_tws);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 220);
+        epd->setCursor(335, 220);
-        getdisplay().print(name4);                       // Name
+        epd->print(holdvalues ? bvf_tws_old.value : bvf_tws.value);
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 190);
+        epd->setCursor(335, 190);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? bvf_tws_old.unit : bvf_tws.unit);
-            getdisplay().print(unit4);                   // Unit
-        }
-        else{  
-            getdisplay().print(unit4old);                // Unit
-        }
 
-//*******************************************************************************************
+        // *********************************************************************
         
         // Draw wind rose
         int rInstrument = 110;     // Radius of grafic instrument
         float pi = 3.141592;
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
+        epd->fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
-        getdisplay().fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
+        epd->fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -240,37 +204,36 @@ public:
             float x = 200 + (rInstrument-30)*sin(i/180.0*pi);  //  x-coordinate dots
             float y = 150 - (rInstrument-30)*cos(i/180.0*pi);  //  y-coordinate cots
             const char *ii = "";
-            switch (i)
+            switch (i) {
-{
+                case 0: ii="0"; break;
-            case 0: ii="0"; break;
+                case 30 : ii="30"; break;
-            case 30 : ii="30"; break;
+                case 60 : ii="60"; break;
-            case 60 : ii="60"; break;
+                case 90 : ii="90"; break;
-            case 90 : ii="90"; break;
+                case 120 : ii="120"; break;
-            case 120 : ii="120"; break;
+                case 150 : ii="150"; break;
-            case 150 : ii="150"; break;
+                case 180 : ii="180"; break;
-            case 180 : ii="180"; break;
+                case 210 : ii="210"; break;
-            case 210 : ii="210"; break;
+                case 240 : ii="240"; break;
-            case 240 : ii="240"; break;
+                case 270 : ii="270"; break;
-            case 270 : ii="270"; break;
+                case 300 : ii="300"; break;
-            case 300 : ii="300"; break;
+                case 330 : ii="330"; break;
-            case 330 : ii="330"; break;
+                default: break;
-            default: break;
             }
 
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            getdisplay().setCursor(x-w/2, y+h/2);
+            epd->setCursor(x-w/2, y+h/2);
-            if(i % 30 == 0){
+            if (i % 30 == 0) {
-                getdisplay().setFont(&Ubuntu_Bold8pt8b);
+                epd->setFont(&Ubuntu_Bold8pt8b); // TODO move out of loop
-                getdisplay().print(ii);
+                epd->print(ii);
             }
 
             // Draw sub scale with dots
             float x1c = 200 + rInstrument*sin(i/180.0*pi);
             float y1c = 150 - rInstrument*cos(i/180.0*pi);
-            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*pi);
             float cosx=cos(i/180.0*pi); 
 
@@ -281,10 +244,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                         200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
             }
@@ -292,16 +255,16 @@ public:
 
         // Draw wind pointer
         float startwidth = 8;       // Start width of pointer
-        if(valid2 == true || holdvalues == true || simulation == true){
+        if (bv_aws->valid || holdvalues || simulation) {
-            float sinx=sin(value1);     // Wind direction
+            float sinx = sin(bv_awa->value);     // Wind direction
-            float cosx=cos(value1);
+            float cosx = cos(bv_awa->value);
             // Normal pointer
             // Pointer as triangle with center base 2*width
             float xx1 = -startwidth;
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument-15); 
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -311,47 +274,42 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument-15);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
-//*******************************************************************************************
+        // *********************************************************************
 
-        // Show values DBT
+        // Show value DBT
-        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
-        getdisplay().setCursor(160, 200);
+        epd->setCursor(160, 200);
-        getdisplay().print(svalue5);                     // Value
+        epd->print(holdvalues ? bvf_dbt_old.value : bvf_dbt.value);
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(190, 215);
+        epd->setCursor(190, 215);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? bvf_dbt_old.unit : bvf_dbt.unit);
-            getdisplay().print(unit5);                   // Unit
-        }
-        else{  
-            getdisplay().print(unit5old);                // Unit
-        }
 
-        // Show values STW
+        // Show value STW
-        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
-        getdisplay().setCursor(160, 130);
+        epd->setCursor(160, 130);
-        getdisplay().print(svalue6);                     // Value
+        epd->print(holdvalues ? bvf_stw_old.value : bvf_stw.value);
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(190, 90);
+        epd->setCursor(190, 90);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? bvf_stw_old.unit : bvf_stw.unit);
-            getdisplay().print(unit6);                   // Unit
-        }
-        else{  
-            getdisplay().print(unit6old);                // Unit
-        }
 
         return PAGE_UPDATE;
     };
+
+    void leavePage(PageData &pageData) {
+        logger->logDebug(GwLog::LOG, "Leaving PageWindRose");
+    }
+
 };
 
 static Page *createPage(CommonData &common){

lib/obp60task/PageWindRoseFlex.cpp

@@ -1,35 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
+#ifdef ENABLE_CALIBRATION
+#include "BoatDataCalibration.h"
+#endif
+
 class PageWindRoseFlex : public Page
 {
-int16_t lp = 80;                    // Pointer length
+private:
-char source = 'A';		    // data source (A)pparent | (T)rue
+    String lengthformat;
+    int16_t lp = 80;         // Pointer length
+    char source = 'A';       // data source (A)pparent | (T)rue
+    String ssource="App.";   // String for Data Source 
 
 public:
-    PageWindRoseFlex(CommonData &common){
+    PageWindRoseFlex(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageWindRoseFlex");
+        logger->logDebug(GwLog::LOG, "Instantiate PageWindRoseFlex");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
-    virtual void setupKeys(){
+
+    void setupKeys() {
         Page::setupKeys();
         commonData->keydata[1].label = "SRC";
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key) {
-	if(key == 2){ 
-	 // Code for set source 
-	    if(source == 'A'){ 
-		    source = 'T'; 
-	    } else { 
-		    source = 'A'; 
-	    } 
-	   } 
-	return key;               // Commit the key
-
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -38,9 +40,17 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         static String svalue1old = "";
         static String unit1old = "";
@@ -54,18 +64,6 @@ public:
         static String unit5old = "";
         static String svalue6old = "";
         static String unit6old = "";
-        static GFXfont name3font;
-        static GFXfont name4font;
-        static GFXfont name5font;
-        static GFXfont name6font;
-
-
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
 
 	GwApi::BoatValue *bvalue1; // Value 1 for angle
         GwApi::BoatValue *bvalue2; // Value 2 for speed
@@ -78,11 +76,14 @@ public:
         }
         String name1 = bvalue1->getName().c_str();      // Value name
         name1 = name1.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
+        calibrationData.calibrateInstance(bvalue1, logger); // Check if boat data value is to be calibrated
+#endif
         double value1 = bvalue1->value;                 // Value as double in SI unit
         bool valid1 = bvalue1->valid;                   // Valid information
-        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
+        String unit1 = commonData->fmt->formatValue(bvalue1, *commonData).unit;        // Unit of value
-	if(valid1 == true){
+        if (valid1 == true) {
             svalue1old = svalue1;   	                // Save old value
             unit1old = unit1;                           // Save old unit
         }
@@ -95,199 +96,167 @@ public:
         }
         String name2 = bvalue2->getName().c_str();      // Value name
         name2 = name2.substring(0, 6);                  // String length limit for value name
+#ifdef ENABLE_CALIBRATION
+        calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated
+#endif
         double value2 = bvalue2->value;                 // Value as double in SI unit
         bool valid2 = bvalue2->valid;                   // Valid information
         if (simulation) {
             value2 = 0.62731; // some random value
         }
-        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
+        String unit2 = commonData->fmt->formatValue(bvalue2, *commonData).unit;        // Unit of value
-	if(valid2 == true){
+        if (valid2 == true) {
             svalue2old = svalue2;   	                // Save old value
             unit2old = unit2;                           // Save old unit
         }
 
-
+        // Get boat value for bottom left corner
-
+        GwApi::BoatValue *bvalue3 = pageData.values[0];
-        // Get boat value for bottom left  corner
-        GwApi::BoatValue *bvalue3 = pageData.values[0]; 
         String name3 = xdrDelete(bvalue3->getName());   // Value name
         name3 = name3.substring(0, 6);                  // String length limit for value name
-        if (name3.length()>3){
+#ifdef ENABLE_CALIBRATION
-            name3font=Ubuntu_Bold8pt8b;
+        calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated
-        }
+#endif
-        else{
-            name3font=Ubuntu_Bold12pt8b;
-        }
         double value3 = bvalue3->value;                 // Value as double in SI unit
-        bool valid3 = bvalue3->valid;                   // Valid information 
+        bool valid3 = bvalue3->valid;                   // Valid information
-        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
         if(valid3 == true){
             svalue3old = svalue3;   	                // Save old value
             unit3old = unit3;                           // Save old unit
         }
 
-        // Get boat value  for top right corner
+        // Get boat value for top right corner
-        GwApi::BoatValue *bvalue4 = pageData.values[1]; 
+        GwApi::BoatValue *bvalue4 = pageData.values[1];
-        String name4 = xdrDelete(bvalue4->getName());      // Value name
+        String name4 = xdrDelete(bvalue4->getName());   // Value name
         name4 = name4.substring(0, 6);                  // String length limit for value name
-        if (name4.length()>3){
+#ifdef ENABLE_CALIBRATION
-            name4font=Ubuntu_Bold8pt8b;
+        calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated
-        }
+#endif
-        else{
-            name4font=Ubuntu_Bold12pt8b;
-        }
         double value4 = bvalue4->value;                 // Value as double in SI unit
-        bool valid4 = bvalue4->valid;                   // Valid information 
+        bool valid4 = bvalue4->valid;                   // Valid information
-        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue4 = commonData->fmt->formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit4 = formatValue(bvalue4, *commonData).unit;        // Unit of value
+        String unit4 = commonData->fmt->formatValue(bvalue4, *commonData).unit;        // Unit of value
         if(valid4 == true){
             svalue4old = svalue4;   	                // Save old value
             unit4old = unit4;                           // Save old unit
         }
 
-        // Get boat value bottom right corner
+        // Get boat value for bottom right corner
-        GwApi::BoatValue *bvalue5 = pageData.values[2]; 
+        GwApi::BoatValue *bvalue5 = pageData.values[2];
-        String name5 = xdrDelete(bvalue5->getName());      // Value name
+        String name5 = xdrDelete(bvalue5->getName());   // Value name
         name5 = name5.substring(0, 6);                  // String length limit for value name
-        if (name5.length()>3){
+#ifdef ENABLE_CALIBRATION
-            name5font=Ubuntu_Bold8pt8b;
+        calibrationData.calibrateInstance(bvalue5, logger); // Check if boat data value is to be calibrated
-        }
+#endif
-        else{
-            name5font=Ubuntu_Bold12pt8b;
-        }
         double value5 = bvalue5->value;                 // Value as double in SI unit
-        bool valid5 = bvalue5->valid;                   // Valid information 
+        bool valid5 = bvalue5->valid;                   // Valid information
-        String svalue5 = formatValue(bvalue5, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue5 = commonData->fmt->formatValue(bvalue5, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit5 = formatValue(bvalue5, *commonData).unit;        // Unit of value
+        String unit5 = commonData->fmt->formatValue(bvalue5, *commonData).unit;        // Unit of value
         if(valid5 == true){
             svalue5old = svalue5;   	                // Save old value
             unit5old = unit5;                           // Save old unit
         }
 
-        // Get boat value for center (name is not displayed)
+        // Get boat value for center
-        GwApi::BoatValue *bvalue6 = pageData.values[3]; 
+        GwApi::BoatValue *bvalue6 = pageData.values[3];
-        String name6 = xdrDelete(bvalue6->getName());      // Value name
+        String name6 = xdrDelete(bvalue6->getName());   // Value name
         name6 = name6.substring(0, 6);                  // String length limit for value name
-        if (name6.length()>3){
+#ifdef ENABLE_CALIBRATION
-            name6font=Ubuntu_Bold8pt8b;
+        calibrationData.calibrateInstance(bvalue6, logger); // Check if boat data value is to be calibrated
-        }
+#endif
-        else{
-            name6font=Ubuntu_Bold8pt8b;
-        }
         double value6 = bvalue6->value;                 // Value as double in SI unit
-        bool valid6 = bvalue6->valid;                   // Valid information 
+        bool valid6 = bvalue6->valid;                   // Valid information
-        String svalue6 = formatValue(bvalue6, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue6 = commonData->fmt->formatValue(bvalue6, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit6 = formatValue(bvalue6, *commonData).unit;        // Unit of value
+        String unit6 = commonData->fmt->formatValue(bvalue6, *commonData).unit;        // Unit of value
         if(valid6 == true){
             svalue6old = svalue6;   	                // Save old value
             unit6old = unit6;                           // Save old unit
         }
 
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false);
-        }
-
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageWindRoseFlex, %s:%f,  %s:%f,  %s:%f,  %s:%f,  %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4, name5.c_str(), value5, name6.c_str(), value6);
+        logger->logDebug(GwLog::LOG, "Drawing at PageWindRoseFlex, %s:%f,  %s:%f,  %s:%f,  %s:%f,  %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4, name5.c_str(), value5, name6.c_str(), value6);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show AWS or TWS top left
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print(svalue2);                     // Value
+        epd->print(svalue2);                     // Value
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 95);
+        epd->setCursor(10, 95);
-        getdisplay().print(name2);                       // Name
+        epd->print(name2);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 115);
+        epd->setCursor(10, 115);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? unit2old : unit2);
-            getdisplay().print(unit2);                   // Unit
-        }
-        else{
-            getdisplay().print(unit2old);                // Unit
-        }
 
         // Horizintal separator left
-        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
+        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show value 3 (=first user-configured parameter) at bottom left
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 270);
+        epd->setCursor(10, 270);
-        getdisplay().print(svalue3);                     // Value
+        epd->print(svalue3);                     // Value
-        getdisplay().setFont(&name3font);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 220);
+        epd->setCursor(10, 220);
-        getdisplay().print(name3);                       // Name
+        epd->print(name3);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 190);
+        epd->setCursor(10, 190);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? unit3old : unit3);
-            getdisplay().print(unit3);                   // Unit
+
-        }
-        else{
-            getdisplay().print(unit3old);                // Unit
-        }
 
         // Show value 4 (=second user-configured parameter) at top right
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(295, 65); 
+        epd->setCursor(295, 65);
-        getdisplay().print(svalue4);     // Value
+        if(valid3 == true){
-        getdisplay().setFont(&name4font);
+            epd->print(svalue4);     // Value
-        getdisplay().setCursor(325, 95);
-        getdisplay().print(name4);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(325, 115);
-        getdisplay().print(" ");
-        if(holdvalues == false){
-            getdisplay().print(unit4);                   // Unit
         }
         else{
-            getdisplay().print(unit4old);                // Unit
+            epd->print(commonData->fmt->placeholder);
         }
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(335, 95);
+        epd->print(name4);                       // Name
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        epd->setCursor(335, 115);
+        epd->print(" ");
+        epd->print(holdvalues ? unit4old : unit4);
+
 
         // Horizintal separator right
-        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
+        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show value 5 (=third user-configured parameter) at bottom right
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(295, 270);
+        epd->setCursor(295, 270);
-        getdisplay().print(svalue5);                     // Value
+        epd->print(svalue5);                     // Value
-        getdisplay().setFont(&name5font);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(325, 220);
+        epd->setCursor(335, 220);
-        getdisplay().print(name5);                       // Name
+        epd->print(name5);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(325, 190);
+        epd->setCursor(335, 190);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? unit5old : unit5);
-            getdisplay().print(unit5);                   // Unit
-        }
-        else{
-            getdisplay().print(unit5old);                // Unit
-        }
-
 
 //*******************************************************************************************
 
         // Draw wind rose
         int rInstrument = 110;     // Radius of grafic instrument
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
+        epd->fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
-        getdisplay().fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
+        epd->fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -314,17 +283,17 @@ public:
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            getdisplay().setCursor(x-w/2, y+h/2);
+            epd->setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                getdisplay().setFont(&Ubuntu_Bold8pt8b);
+                epd->setFont(&Ubuntu_Bold8pt8b);
-                getdisplay().print(ii);
+                epd->print(ii);
             }
 
             // Draw sub scale with dots
             float x1c = 200 + rInstrument*sin(i/180.0*M_PI);
             float y1c = 150 - rInstrument*cos(i/180.0*M_PI);
-            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*M_PI);
             float cosx=cos(i/180.0*M_PI);
 
@@ -335,10 +304,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                         200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
             }
@@ -355,7 +324,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument-15);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -365,58 +334,50 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument-15);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 150, startwidth + 8, commonData->bgcolor);
+        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->fgcolor);
+        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->bgcolor);
-    	getdisplay().setFont(&Ubuntu_Bold10pt8b);
-    	if (source=='A'){
-		getdisplay().setCursor(193, 155);
-	}
-	else {
-		getdisplay().setCursor(195, 156);
-	}
-    	getdisplay().print({source}); 
-
 
 //*******************************************************************************************
 
-	// Show value6 (=fourth user-configured parameter) 
+        // Show value6 (=fourth user-configured parameter) and ssource, so that they do not collide with the wind pointer
-if ( cos(value1) > 0){ 
+    if (cos(value1) > 0) {
-    //pointer points upwards 
+        // pointer points upwards 
-    getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
-    getdisplay().setCursor(160, 200);
+        epd->setCursor(160, 200);
-    getdisplay().print(svalue6);                     // Value
+        epd->print(svalue6);                     // Value
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setCursor(190, 215);
+        epd->setCursor(190, 215);
-    getdisplay().print(" ");
+        epd->print(" ");
-    if(holdvalues == false){
+        epd->print(holdvalues ? unit6old : unit6);
-        getdisplay().print(unit6);                   // Unit
+        if (sin(value1) > 0) {
+            epd->setCursor(160, 130);
+        } else {
+            epd->setCursor(220, 130);
+        }
+        epd->print(ssource); // true or app.
     }
-    else{  
+    else {
-        getdisplay().print(unit6old);                // Unit
+        // pointer points downwards
+        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+        epd->setCursor(160, 130);
+        epd->print(svalue6);
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        epd->setCursor(190, 90);
+        epd->print(" ");
+        epd->print(holdvalues ? unit6old : unit6);
+        if (sin(value1) > 0) {
+            epd->setCursor(160, 200);
+        } else {
+            epd->setCursor(220, 200);
+        }
+        epd->print(ssource); //true or app. 
     }
-}
-else{ 
-    // pointer points downwards
-    getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-    getdisplay().setCursor(160, 130);
-    getdisplay().print(svalue6);                     // Value
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setCursor(190, 90);
-    getdisplay().print(" ");
-    if(holdvalues == false){
-        getdisplay().print(unit6);                   // Unit
-    }
-    else{  
-        getdisplay().print(unit6old);                // Unit
-    }
-}
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageXTETrack.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -28,15 +29,18 @@ static unsigned char ship_bits[] PROGMEM = {
 
 class PageXTETrack : public Page
 {
-    bool simulation = false;
+private:
-    bool holdvalues = false;
+    String trackStep;
+    double seg_step;
 
-    public:
+public:
-    PageXTETrack(CommonData &common){
+    PageXTETrack(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageXTETrack");
+        logger->logDebug(GwLog::LOG, "Instantiate PageXTETrack");
-        simulation = common.config->getBool(common.config->useSimuData);
+
-        holdvalues = common.config->getBool(common.config->holdvalues);
+        // Get config data
+        String trackStep = config->getString(config->trackStep);
+        seg_step = trackStep.toDouble() * M_PI / 180;
     }
 
     void drawSegment(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1,
@@ -45,18 +49,18 @@ class PageXTETrack : public Page
        if (fill == true) {
            // no primitive for quadrangular object
            // we create it from 2 triangles
-           getdisplay().fillTriangle(x0, y0, x1, y1, x3, y3, color);
+           epd->fillTriangle(x0, y0, x1, y1, x3, y3, color);
-           getdisplay().fillTriangle(x1, y1, x2, y2, x3, y3, color);
+           epd->fillTriangle(x1, y1, x2, y2, x3, y3, color);
        } else {
            // draw outline
-           getdisplay().drawLine(x0, y0, x1, y1, color);
+           epd->drawLine(x0, y0, x1, y1, color);
-           getdisplay().drawLine(x1, y1, x2, y2, color);
+           epd->drawLine(x1, y1, x2, y2, color);
-           getdisplay().drawLine(x2, y2, x3, y3, color);
+           epd->drawLine(x2, y2, x3, y3, color);
-           getdisplay().drawLine(x3, y3, x0, y0, color);
+           epd->drawLine(x3, y3, x0, y0, color);
        }
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -65,96 +69,93 @@ class PageXTETrack : public Page
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
-
+        if (flashLED == "Limit Violation") {
-        // Get config data
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-
-        String trackStep = config->getString(config->trackStep);
-        double seg_step = trackStep.toFloat() * PI / 180;
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
             setFlashLED(false);
         }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageXTETrack");
+        logger->logDebug(GwLog::LOG, "Drawing at PageXTETrack");
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // descriptions
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(50, 188);
+        epd->setCursor(50, 188);
-        getdisplay().print("Cross-track error");
+        epd->print("Cross-track error");
-        getdisplay().setCursor(270, 188);
+        epd->setCursor(270, 188);
-        getdisplay().print("Track");
+        epd->print("Track");
-        getdisplay().setCursor(45, 275);
+        epd->setCursor(45, 275);
-        getdisplay().print("Distance to waypoint");
+        epd->print("Distance to waypoint");
-        getdisplay().setCursor(260, 275);
+        epd->setCursor(260, 275);
-        getdisplay().print("Bearing");
+        epd->print("Bearing");
 
         // values
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
 
         int16_t  x, y;
         uint16_t w, h;
 
         GwApi::BoatValue *bv_xte = pageData.values[0]; // XTE
-        String sval_xte = formatValue(bv_xte, *commonData).svalue;
+        String sval_xte = commonData->fmt->formatValue(bv_xte, *commonData).svalue;
-        getdisplay().getTextBounds(sval_xte, 0, 0, &x, &y, &w, &h);
+        epd->getTextBounds(sval_xte, 0, 0, &x, &y, &w, &h);
-        getdisplay().setCursor(160-w, 170);
+        epd->setCursor(160-w, 170);
-        getdisplay().print(sval_xte);
+        epd->print(sval_xte);
 
         GwApi::BoatValue *bv_cog = pageData.values[1]; // COG
-        String sval_cog = formatValue(bv_cog, *commonData).svalue;
+        String sval_cog = commonData->fmt->formatValue(bv_cog, *commonData).svalue;
-        getdisplay().getTextBounds(sval_cog, 0, 0, &x, &y, &w, &h);
+        epd->getTextBounds(sval_cog, 0, 0, &x, &y, &w, &h);
-        getdisplay().setCursor(360-w, 170);
+        epd->setCursor(360-w, 170);
-        getdisplay().print(sval_cog);
+        epd->print(sval_cog);
 
         GwApi::BoatValue *bv_dtw = pageData.values[2]; // DTW
-        String sval_dtw = formatValue(bv_dtw, *commonData).svalue;
+        String sval_dtw = commonData->fmt->formatValue(bv_dtw, *commonData).svalue;
-        getdisplay().getTextBounds(sval_dtw, 0, 0, &x, &y, &w, &h);
+        epd->getTextBounds(sval_dtw, 0, 0, &x, &y, &w, &h);
-        getdisplay().setCursor(160-w, 257);
+        epd->setCursor(160-w, 257);
-        getdisplay().print(sval_dtw);
+        epd->print(sval_dtw);
 
         GwApi::BoatValue *bv_btw = pageData.values[3]; // BTW
-        String sval_btw = formatValue(bv_btw, *commonData).svalue;
+        String sval_btw = commonData->fmt->formatValue(bv_btw, *commonData).svalue;
-        getdisplay().getTextBounds(sval_btw, 0, 0, &x, &y, &w, &h);
+        epd->getTextBounds(sval_btw, 0, 0, &x, &y, &w, &h);
-        getdisplay().setCursor(360-w, 257);
+        epd->setCursor(360-w, 257);
-        getdisplay().print(sval_btw);
+        epd->print(sval_btw);
+
+        GwApi::BoatValue *bv_wpname = pageData.values[4]; // WPName
 
         bool valid = bv_cog->valid && bv_btw->valid;
 
         // XTETrack view
 
         // draw ship symbol (as bitmap)
-        getdisplay().drawXBitmap(184, 68, ship_bits, ship_width, ship_height, commonData->fgcolor);
+        epd->drawXBitmap(184, 68, ship_bits, ship_width, ship_height, commonData->fgcolor);
 
         // draw next waypoint name
         String sval_wpname = "no data";
 
         if (valid) {
-            sval_wpname = "Tonne 122";
+            sval_wpname = bv_wpname->svalue;
         }
 
-        getdisplay().setFont(&Ubuntu_Bold10pt8b);
+        epd->setFont(&Ubuntu_Bold10pt8b);
-        getdisplay().getTextBounds(sval_wpname, 0, 150, &x, &y, &w, &h);
+        epd->getTextBounds(sval_wpname, 0, 150, &x, &y, &w, &h);
         // TODO if text don't fix use smaller font size.
         // if smallest size does not fit use 2 lines
         // last resort: clip with ellipsis
-        getdisplay().setCursor(200 - w / 2, 60);
+        epd->setCursor(200 - w / 2, 60);
-        getdisplay().print(sval_wpname);
+        epd->print(sval_wpname);
 
         // draw course segments
 
@@ -226,7 +227,7 @@ PageDescription registerPageXTETrack(
     "XTETrack", // Page name
     createPage, // Action
     0,          // Number of bus values depends on selection in Web configuration
-    {"XTE", "COG", "DTW", "BTW"}, // Bus values we need in the page
+    {"XTE", "COG", "DTW", "BTW", "WPName"}, // Bus values we need in the page
     true        // Show display header on/off
 );
 

lib/obp60task/Pagedata.h

@@ -1,9 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 #include <Arduino.h>
 #include "GwApi.h"
 #include <functional>
 #include <vector>
 #include "LedSpiTask.h"
+// #include "OBPDataOperations.h"
 
 #define MAX_PAGE_NUMBER 10    // Max number of pages for show data
 
@@ -99,15 +102,22 @@ typedef struct{
     uint8_t length_sec; // seconds until alarm disappeares without user interaction
 } AlarmData;
 
+typedef struct{
+    int voltage = 0;
+} AvgData;
+
+class Formatter; // forward declaration
 typedef struct{
     GwApi::Status status;
     GwLog *logger = nullptr;
     GwConfigHandler *config = nullptr;
+    Formatter *fmt = nullptr;
     SensorData data;
     SunData sundata;
     TouchKeyData keydata[6];
     BacklightData backlight;
     AlarmData alarm;
+    AvgData avgdata;
     GwApi::BoatValue *time = nullptr;
     GwApi::BoatValue *date = nullptr;
     uint16_t fgcolor;
@@ -118,9 +128,26 @@ typedef struct{
 
 //a base class that all pages must inherit from
 class Page{
-  protected:
+protected:
+    // TODO Future: GwApi *api;
     CommonData *commonData;
-  public:
+    GwConfigHandler *config;
+    GwLog *logger;
+    bool simulation = false;
+    bool holdvalues = false;
+    String flashLED;
+    String backlightMode;
+public:
+    Page(CommonData &common) {
+        commonData = &common;
+        config = commonData->config;
+        logger = commonData->logger;
+        // preload generic configuration data
+        simulation = config->getBool(config->useSimuData);
+        holdvalues = config->getBool(config->holdvalues);
+        flashLED = config->getString(config->flashLED);
+        backlightMode = config->getString(config->backlight);
+    }
     int refreshtime = 1000;
     virtual int displayPage(PageData &pageData)=0;
     virtual void displayNew(PageData &pageData){}
@@ -187,25 +214,3 @@ class PageStruct{
         PageData parameters;
         PageDescription *description = nullptr;
 };
-
-// Standard format functions without overhead
-String formatDate(String fmttype, uint16_t year, uint8_t month, uint8_t day);
-String formatTime(char fmttype, uint8_t hour, uint8_t minute, uint8_t second);
-String formatLatitude(double lat);
-String formatLongitude(double lon);
-
-// Structure for formatted boat values
-typedef struct{
-  double value; // SI value of boat data value
-  double cvalue; // value converted to target unit
-  String svalue; // value converted to target unit and formatted
-  String unit; // target value unit
-} FormattedData;
-
-// Formatter for boat values
-FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata);
-FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata, bool ignoreSimuDataSetting);
-
-// Helper method for conversion of any data value from SI to user defined format (defined in OBP60Formatter)
-double convertValue(const double &value, const String &format, CommonData &commondata);
-double convertValue(const double &value, const String &name, const String &format, CommonData &commondata);

lib/obp60task/README

@@ -0,0 +1,97 @@
+Development information
+=======================
+
+This file contains some hints concerning building the firmware as well as
+developing and debugging it.
+
+Coding style
+------------
+WIP
+Please format your new code the same as already existing code.
+
+Some rules:
+  - Preprocessor directives go to column zero
+  - Identation is 4 spaces
+
+Git commands
+------------
+Some useful commands are
+
+git status
+git fetch upstream
+git diff --name-status upstream/master
+git checkout upstream/master platformio.ini
+
+# how to reset my Repo to match norbert's status
+
+git remote add upstream https://github.com/norbert-walter/esp32-nmea2000-obp60
+git fetch upstream
+git checkout master
+git reset --hard upstream/master  
+git push origin master --force
+
+
+New pages
+---------
+To create a new page for OBP60 the following steps are necessary:
+
+  1. Create a page under /lib/obp60task/PageXXXX.cpp. You can use a simple
+     page e.g. PageOneValue.cpp as template
+  2. Set page name in PageXXXX.cpp on file name
+  3. Register new page in /lib/obp60task/obp60task.cpp in function
+     'registerAllPages'
+  4. Add new page in /lib/obp60task/config.json for each page type 
+     or use  gen_set.py to auto-generate the relevant section of
+     config.json. For further information on that  read the comments
+     in gen_set.py.
+  5. Copy the changes in config.json to config_obp40.json and rename
+     strings accordingly. E.g. obp60 to obp40.
+
+Using Gitpod
+------------
+
+Warning: You have to register with gitpod!
+
+Open web page:
+https://gitpod.io/#https://github.com/norbert-walter/esp32-nmea2000-obp60/tree/master/lib/obp60task
+
+Input in terminal:
+cd /workspace/esp32-nmea2000-obp60
+bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_installing_tools
+bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_obp60_s3
+bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_obp40_s3
+
+Compile result for OBP60:
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/bootloader.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/firmware.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/partitions.bin
+
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-all.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-dev<yyyymmdd>-all.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-dev<yyyymmdd>-update.bin
+
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-all.bin, ready to flash to offset 0x0000
+
+Compile result for OBP40 (CrowPanel 4.2):
+
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/bootloader.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/firmware.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/partitions.bin
+
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-all.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-dev<yyyymmdd>-all.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-dev<yyyymmdd>-update.bin
+
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-all.bin, ready to flash to offset 0x0000
+
+Compilation issues
+------------------
+? Error while linking: "undefined reference to `registerPageXXX'"
+: Check if the required page is enabled for current board/environment: #if defined ...
+
+Debugging tool
+--------------
+
+log.txt = text file with error messages from terminal console
+
+tools/decoder.py -p ESP32S3 -t ~/.platformio/packages/toolchain-xtensa-esp32s3/ -e .pio/build/obp60_s3/firmware.elf log.txt

lib/obp60task/TODO

@@ -0,0 +1,19 @@
+- fix unstable accesspoint availability
+
+- page refresh after page change and not connected to key codes
+
+- config: getFloat, getDouble
+
+- dseg7 font to new version
+
+- new pages: ais, autopilot, epropulsion
+
+- automate config.json generation with extra_task.py
+
+- extend boatdata: ais, waypoints, alarms
+
+- page clock: sunrise / sunset in local time or UTC
+
+- implement alerts
+
+- implement formatter as class

lib/obp60task/Using_Gitpod.txt

@@ -1,38 +0,0 @@
-Using Gitpod
-############
-
-Open web page:
-https://gitpod.io/#https://github.com/norbert-walter/esp32-nmea2000-obp60/tree/master/lib/obp60task
-
-Input in terminal:
-cd /workspace/esp32-nmea2000-obp60
-bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_installing_tools
-bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_obp60_s3
-bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_obp40_s3
-
-Compile result for OBP60
-########################
-
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/bootloader.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/firmware.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/partitions.bin
-
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-all.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-dev20231220-all.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-dev20231220-update.bin
-
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-all.bin, ready to flash to offset 0x0000
-
-Compile result for OBP40 (CrowPanel 4.2)
-########################################
-
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/bootloader.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/firmware.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/partitions.bin
-
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-all.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-dev20231220-all.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-dev20231220-update.bin
-
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-all.bin, ready to flash to offset 0x0000
-

lib/obp60task/debugging.txt

@@ -1,6 +0,0 @@
-Debugging tool
-##############
-
-log.txt = text file with error messages from terminal console
-
-tools/decoder.py -p ESP32S3 -t ~/.platformio/packages/toolchain-xtensa-esp32s3/ -e .pio/build/obp60_s3/firmware.elf log.txt

lib/obp60task/extra_task.py

@@ -1,12 +1,29 @@
 # PlatformIO extra script for obp60task
 
+import subprocess
+
+def cleanup_patches(source, target, env):
+    for p in patchfiles:
+        patch = os.path.join(patchdir, p)
+        print(f"removing {patch}")
+        res = subprocess.run(["git", "apply", "-R", patch], capture_output=True, text=True)
+        if res.returncode != 0:
+            print(res.stderr)
+
+patching = False
+
 epdtype = "unknown"
 pcbvers = "unknown"
 for x in env["BUILD_FLAGS"]:
-    if x.startswith("-D HARDWARE_"):
+    if not x.startswith('-D'):
+        continue
+    opt = x[2:].strip()
+    if opt.startswith("HARDWARE_"):
         pcbvers = x.split('_')[1]
-    if x.startswith("-D DISPLAY_"):
+    elif opt.startswith("DISPLAY_"):
         epdtype = x.split('_')[1]
+    elif opt == 'ENABLE_PATCHES':
+        patching = True
 
 propfilename = os.path.join(env["PROJECT_LIBDEPS_DIR"], env["PIOENV"], "GxEPD2/library.properties")
 properties = {}
@@ -28,3 +45,23 @@ except:
 env["CPPDEFINES"].extend([("BOARD", env["BOARD"]), ("EPDTYPE", epdtype), ("PCBVERS", pcbvers), ("GXEPD2VERS", gxepd2vers)])
 
 print("added hardware info to CPPDEFINES")
+print("friendly board name is '{}'".format(env.GetProjectOption("board_name")))
+
+if patching:
+    # apply patches to gateway code
+    print("applying gateway patches")
+    patchdir = os.path.join(os.path.dirname(script), "patches")
+    if not os.path.isdir(patchdir):
+        print("patchdir not found, no patches applied")
+    else:
+        patchfiles = [f for f in os.listdir(patchdir)]
+        if len(patchfiles) > 0:
+            for p in patchfiles:
+                patch = os.path.join(patchdir, p)
+                print(f"applying {patch}")
+                res = subprocess.run(["git", "apply", patch], capture_output=True, text=True)
+                if res.returncode != 0:
+                    print(res.stderr)
+            env.AddPostAction("$PROGPATH", cleanup_patches)
+        else:
+            print("no patches found")

lib/obp60task/fonts/Atari6px8b.h

@@ -0,0 +1,273 @@
+const uint8_t Atari6pxBitmaps[] PROGMEM = {
+  0x00, 0xF0, 0x30, 0xCF, 0x38, 0x80, 0x53, 0xF5, 0x14, 0xFD, 0x40, 0x7E,
+  0x47, 0x85, 0x13, 0xE1, 0x00, 0xC7, 0x21, 0x00, 0x4E, 0x30, 0x63, 0x26,
+  0x39, 0xC3, 0x26, 0x40, 0x6F, 0x00, 0x7B, 0x24, 0xC0, 0xCD, 0xA5, 0x80,
+  0x8B, 0x3E, 0x00, 0x44, 0x10, 0x4F, 0xC4, 0x10, 0x40, 0x6F, 0x00, 0xF8,
+  0xF0, 0x0C, 0x66, 0x18, 0x82, 0x00, 0x7A, 0x39, 0x58, 0x61, 0xE0, 0x75,
+  0x50, 0xF8, 0x17, 0xA0, 0x83, 0xF0, 0xF8, 0x17, 0x80, 0x07, 0xE0, 0x39,
+  0x28, 0xA2, 0xFC, 0x20, 0xFE, 0x0F, 0x80, 0x07, 0xE0, 0x7A, 0x0F, 0xC0,
+  0x01, 0xE0, 0xF8, 0x44, 0x02, 0x10, 0x7A, 0x17, 0x80, 0x85, 0xE0, 0x7A,
+  0x17, 0xC0, 0x01, 0xE0, 0xF0, 0xF0, 0xF3, 0x58, 0x1B, 0x30, 0x42, 0x0C,
+  0xF8, 0x3E, 0xC3, 0x06, 0xC4, 0x60, 0x7A, 0x31, 0x86, 0x00, 0x01, 0x80,
+  0x7A, 0x19, 0xE6, 0x82, 0x07, 0xC0, 0x7A, 0x1F, 0xE1, 0x86, 0x10, 0xFA,
+  0x1F, 0xA0, 0x87, 0xE0, 0x7E, 0x08, 0x00, 0x01, 0xF0, 0xFA, 0x18, 0x60,
+  0x83, 0xE0, 0xFE, 0x0F, 0xA0, 0x83, 0xF0, 0xFE, 0x0F, 0xA0, 0x82, 0x00,
+  0x7E, 0x08, 0xC1, 0x05, 0xF0, 0x86, 0x1F, 0xE1, 0x86, 0x10, 0xF4, 0x44,
+  0x4F, 0x04, 0x10, 0x41, 0x85, 0xE0, 0x8C, 0xB9, 0x09, 0x44, 0x84, 0x21,
+  0x08, 0x7C, 0x83, 0xDE, 0x4C, 0x18, 0x30, 0x40, 0x83, 0xC6, 0x4C, 0x18,
+  0xF0, 0x40, 0x7A, 0x18, 0x40, 0x01, 0xE0, 0xFA, 0x1F, 0xA0, 0x82, 0x00,
+  0x7A, 0x18, 0x40, 0x01, 0xE0, 0xC0, 0xFA, 0x1F, 0xA4, 0x92, 0x30, 0x7E,
+  0x07, 0x80, 0x07, 0xE0, 0xFC, 0x41, 0x04, 0x10, 0x40, 0x86, 0x18, 0x61,
+  0x85, 0xE0, 0x86, 0x10, 0x00, 0x48, 0x40, 0x83, 0x06, 0x4C, 0x1E, 0xF0,
+  0x40, 0x85, 0x21, 0x00, 0x4A, 0x10, 0x86, 0x14, 0x80, 0x10, 0x40, 0xFC,
+  0x21, 0x10, 0x43, 0xF0, 0xFC, 0xCC, 0xCF, 0xC1, 0x81, 0x86, 0x04, 0x10,
+  0xF3, 0x33, 0x3F, 0x11, 0xEC, 0xC0, 0xFC, 0xD9, 0x80, 0x78, 0x10, 0x7F,
+  0x7C, 0x83, 0xE8, 0x61, 0x83, 0xE0, 0x7E, 0x08, 0x00, 0x7C, 0x05, 0xF8,
+  0x61, 0x05, 0xF0, 0x7B, 0xF8, 0x00, 0x78, 0x1A, 0x3E, 0x84, 0x20, 0x7E,
+  0x17, 0xC1, 0x07, 0xE0, 0x81, 0x33, 0x8C, 0x18, 0x30, 0x40, 0xC4, 0x44,
+  0xF0, 0x08, 0x42, 0x10, 0x87, 0xC0, 0x82, 0x2F, 0x20, 0x8A, 0x10, 0xC4,
+  0x44, 0x4F, 0x4B, 0xF9, 0x61, 0x84, 0xFA, 0x18, 0x61, 0x84, 0x7A, 0x18,
+  0x40, 0x78, 0xFA, 0x18, 0x60, 0xFA, 0x00, 0x7E, 0x18, 0x41, 0x7C, 0x10,
+  0xF4, 0x61, 0x08, 0x00, 0x7E, 0x00, 0x3F, 0x00, 0x4F, 0x44, 0x41, 0x86,
+  0x10, 0x41, 0x7C, 0x86, 0x10, 0x12, 0x10, 0x83, 0x26, 0x4C, 0x1E, 0xE0,
+  0x8B, 0x18, 0x08, 0x80, 0x86, 0x17, 0xC1, 0x07, 0xE0, 0xF8, 0x94, 0x8F,
+  0x80, 0x76, 0xC6, 0x67, 0xFF, 0xFC, 0xE6, 0x36, 0x6E, 0x41, 0x0B, 0x6F,
+  0x08, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD,
+  0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD,
+  0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD,
+  0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD,
+  0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD,
+  0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD,
+  0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD,
+  0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD,
+  0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD,
+  0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD,
+  0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD,
+  0xFC, 0x11, 0xEC, 0x71, 0xFC, 0x11, 0xEC, 0xC4, 0x10, 0x41, 0x00, 0x10,
+  0x40, 0x33, 0x49, 0xE1, 0x00, 0x08, 0x1B, 0xD8, 0x40, 0x81, 0x00, 0x10,
+  0xE3, 0x39, 0x01, 0x02, 0x00, 0x7A, 0x5E, 0xC4, 0x11, 0xE0, 0xFF, 0xEF,
+  0x3C, 0xC6, 0x30, 0xEE, 0x57, 0xA1, 0x87, 0xB0, 0x06, 0x1A, 0x64, 0x86,
+  0x08, 0x00, 0x7D, 0x06, 0x4C, 0xD8, 0x30, 0x5F, 0x00, 0x18, 0xF9, 0xF7,
+  0xF0, 0x00, 0x06, 0x00, 0x08, 0x30, 0x9E, 0x7B, 0xE6, 0x00, 0xF1, 0x03,
+  0xBC, 0x48, 0x81, 0x82, 0x00, 0xF1, 0x02, 0x77, 0xA1, 0x43, 0x85, 0x80,
+  0x12, 0x24, 0x48, 0x97, 0x3E, 0x70, 0x80, 0x92, 0x4D, 0xD8, 0xFF, 0x1C,
+  0x73, 0xCF, 0x3F, 0xC0, 0xC4, 0x4F, 0xFF, 0xF0, 0x7C, 0x1F, 0xF0, 0xC3,
+  0x0F, 0xC0, 0xF8, 0x2F, 0xC3, 0x0C, 0x3F, 0xC0, 0xC3, 0x0C, 0xFF, 0x0C,
+  0x30, 0xC0, 0xFB, 0x0F, 0xC3, 0x0C, 0x3F, 0xC0, 0xC3, 0x0F, 0xE3, 0xCF,
+  0x3F, 0xC0, 0xFC, 0x13, 0xCC, 0x30, 0xC3, 0x00, 0x71, 0x47, 0x37, 0xDF,
+  0x7F, 0xC0, 0xFF, 0x3C, 0x7F, 0x0C, 0x30, 0xC0, 0x78, 0x00, 0x7F, 0x78,
+  0xF0, 0x80, 0xEF, 0x88, 0x88, 0xF8, 0x0F, 0x1E, 0xFF, 0x84, 0x08, 0x1E,
+  0x26, 0x00, 0xF3, 0x20, 0xC1, 0x05, 0xF1, 0x40, 0x42, 0x2C, 0x50, 0x40,
+  0x1E, 0xF0, 0x00, 0x07, 0x24, 0x80, 0x93, 0x80, 0xFC, 0x7F, 0xDD, 0xFC,
+  0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC,
+  0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC,
+  0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC,
+  0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC,
+  0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC,
+  0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC,
+  0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC,
+  0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC,
+  0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC,
+  0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC, 0xFC, 0x7F, 0xDD, 0xFC,
+  0xFC, 0x7F, 0xDD, 0xFC };
+
+const GFXglyph Atari6pxGlyphs[] PROGMEM = {
+  {     0,   1,   1,   7,    0,    0 },   // 0x20 ' ' U+0020
+  {     1,   2,   6,   6,    2,   -5 },   // 0x21 '!' U+0021
+  {     3,   6,   3,   7,    0,   -5 },   // 0x22 '"' U+0022
+  {     6,   6,   6,   7,    0,   -5 },   // 0x23 '#' U+0023
+  {    11,   6,   7,   7,    0,   -5 },   // 0x24 '$' U+0024
+  {    17,   6,   6,   7,    0,   -5 },   // 0x25 '%' U+0025
+  {    22,   6,   7,   7,    0,   -6 },   // 0x26 '&' U+0026
+  {    28,   3,   3,   6,    1,   -5 },   // 0x27 ''' U+0027
+  {    30,   3,   6,   6,    1,   -5 },   // 0x28 '(' U+0028
+  {    33,   3,   6,   6,    1,   -5 },   // 0x29 ')' U+0029
+  {    36,   5,   6,   7,    1,   -5 },   // 0x2a '*' U+002A
+  {    40,   6,   6,   7,    0,   -5 },   // 0x2b '+' U+002B
+  {    45,   3,   3,   6,    1,   -1 },   // 0x2c ',' U+002C
+  {    47,   5,   1,   7,    1,   -3 },   // 0x2d '-' U+002D
+  {    48,   2,   2,   6,    2,   -1 },   // 0x2e '.' U+002E
+  {    49,   6,   6,   7,    0,   -5 },   // 0x2f '/' U+002F
+  {    54,   6,   6,   7,    0,   -5 },   // 0x30 '0' U+0030
+  {    59,   2,   6,   7,    3,   -5 },   // 0x31 '1' U+0031
+  {    61,   6,   6,   7,    0,   -5 },   // 0x32 '2' U+0032
+  {    66,   6,   6,   7,    0,   -5 },   // 0x33 '3' U+0033
+  {    71,   6,   6,   7,    0,   -5 },   // 0x34 '4' U+0034
+  {    76,   6,   6,   7,    0,   -5 },   // 0x35 '5' U+0035
+  {    81,   6,   6,   7,    0,   -5 },   // 0x36 '6' U+0036
+  {    86,   5,   6,   7,    0,   -5 },   // 0x37 '7' U+0037
+  {    90,   6,   6,   7,    0,   -5 },   // 0x38 '8' U+0038
+  {    95,   6,   6,   7,    0,   -5 },   // 0x39 '9' U+0039
+  {   100,   2,   6,   6,    2,   -5 },   // 0x3a ':' U+003A
+  {   102,   2,   7,   6,    2,   -5 },   // 0x3b ';' U+003B
+  {   104,   5,   6,   7,    1,   -5 },   // 0x3c '<' U+003C
+  {   108,   5,   3,   7,    1,   -4 },   // 0x3d '=' U+003D
+  {   110,   5,   6,   7,    1,   -5 },   // 0x3e '>' U+003E
+  {   114,   6,   7,   7,    0,   -5 },   // 0x3f '?' U+003F
+  {   120,   6,   7,   7,    0,   -5 },   // 0x40 '@' U+0040
+  {   126,   6,   6,   7,    0,   -5 },   // 0x41 'A' U+0041
+  {   131,   6,   6,   7,    0,   -5 },   // 0x42 'B' U+0042
+  {   136,   6,   6,   7,    0,   -5 },   // 0x43 'C' U+0043
+  {   141,   6,   6,   7,    0,   -5 },   // 0x44 'D' U+0044
+  {   146,   6,   6,   7,    0,   -5 },   // 0x45 'E' U+0045
+  {   151,   6,   6,   7,    0,   -5 },   // 0x46 'F' U+0046
+  {   156,   6,   6,   7,    0,   -5 },   // 0x47 'G' U+0047
+  {   161,   6,   6,   7,    0,   -5 },   // 0x48 'H' U+0048
+  {   166,   4,   6,   7,    1,   -5 },   // 0x49 'I' U+0049
+  {   169,   6,   6,   7,    0,   -5 },   // 0x4a 'J' U+004A
+  {   174,   5,   6,   7,    1,   -5 },   // 0x4b 'K' U+004B
+  {   178,   5,   6,   7,    1,   -5 },   // 0x4c 'L' U+004C
+  {   182,   7,   6,   8,    0,   -5 },   // 0x4d 'M' U+004D
+  {   188,   7,   6,   8,    0,   -5 },   // 0x4e 'N' U+004E
+  {   194,   6,   6,   7,    0,   -5 },   // 0x4f 'O' U+004F
+  {   199,   6,   6,   7,    0,   -5 },   // 0x50 'P' U+0050
+  {   204,   6,   7,   7,    0,   -5 },   // 0x51 'Q' U+0051
+  {   210,   6,   6,   7,    0,   -5 },   // 0x52 'R' U+0052
+  {   215,   6,   6,   7,    0,   -5 },   // 0x53 'S' U+0053
+  {   220,   6,   6,   7,    0,   -5 },   // 0x54 'T' U+0054
+  {   225,   6,   6,   7,    0,   -5 },   // 0x55 'U' U+0055
+  {   230,   6,   6,   7,    0,   -5 },   // 0x56 'V' U+0056
+  {   235,   7,   6,   8,    0,   -5 },   // 0x57 'W' U+0057
+  {   241,   6,   6,   7,    0,   -5 },   // 0x58 'X' U+0058
+  {   246,   6,   6,   7,    0,   -5 },   // 0x59 'Y' U+0059
+  {   251,   6,   6,   7,    0,   -5 },   // 0x5a 'Z' U+005A
+  {   256,   4,   6,   7,    1,   -5 },   // 0x5b '[' U+005B
+  {   259,   6,   6,   7,    0,   -5 },   // 0x5c '\' U+005C
+  {   264,   4,   6,   7,    2,   -5 },   // 0x5d ']' U+005D
+  {   267,   6,   3,   7,    0,   -5 },   // 0x5e '^' U+005E
+  {   270,   6,   1,   7,    0,    0 },   // 0x5f '_' U+005F
+  {   271,   3,   3,   6,    1,   -5 },   // 0x60 '`' U+0060
+  {   273,   6,   5,   7,    0,   -4 },   // 0x61 'a' U+0061
+  {   277,   6,   6,   7,    0,   -5 },   // 0x62 'b' U+0062
+  {   282,   6,   5,   7,    0,   -4 },   // 0x63 'c' U+0063
+  {   286,   6,   6,   7,    0,   -5 },   // 0x64 'd' U+0064
+  {   291,   6,   5,   7,    0,   -4 },   // 0x65 'e' U+0065
+  {   295,   5,   6,   7,    1,   -5 },   // 0x66 'f' U+0066
+  {   299,   6,   6,   7,    0,   -4 },   // 0x67 'g' U+0067
+  {   304,   7,   6,   8,    0,   -5 },   // 0x68 'h' U+0068
+  {   310,   4,   5,   7,    1,   -4 },   // 0x69 'i' U+0069
+  {   313,   5,   7,   7,    0,   -5 },   // 0x6a 'j' U+006A
+  {   318,   6,   6,   7,    0,   -5 },   // 0x6b 'k' U+006B
+  {   323,   4,   6,   7,    1,   -5 },   // 0x6c 'l' U+006C
+  {   326,   6,   5,   7,    0,   -4 },   // 0x6d 'm' U+006D
+  {   330,   6,   5,   7,    0,   -4 },   // 0x6e 'n' U+006E
+  {   334,   6,   5,   7,    0,   -4 },   // 0x6f 'o' U+006F
+  {   338,   6,   6,   7,    0,   -4 },   // 0x70 'p' U+0070
+  {   343,   6,   6,   7,    0,   -4 },   // 0x71 'q' U+0071
+  {   348,   5,   5,   7,    1,   -4 },   // 0x72 'r' U+0072
+  {   352,   5,   5,   7,    1,   -4 },   // 0x73 's' U+0073
+  {   356,   4,   6,   7,    1,   -5 },   // 0x74 't' U+0074
+  {   359,   6,   5,   7,    0,   -4 },   // 0x75 'u' U+0075
+  {   363,   6,   5,   7,    0,   -4 },   // 0x76 'v' U+0076
+  {   367,   7,   5,   8,    0,   -4 },   // 0x77 'w' U+0077
+  {   372,   5,   5,   7,    0,   -4 },   // 0x78 'x' U+0078
+  {   376,   6,   6,   7,    0,   -4 },   // 0x79 'y' U+0079
+  {   381,   5,   5,   7,    1,   -4 },   // 0x7a 'z' U+007A
+  {   385,   4,   6,   6,    1,   -5 },   // 0x7b '{' U+007B
+  {   388,   2,   7,   7,    4,   -5 },   // 0x7c '|' U+007C
+  {   390,   4,   6,   6,    1,   -5 },   // 0x7d '}' U+007D
+  {   393,   6,   5,   7,    0,   -5 },   // 0x7e '~' U+007E
+  {   397,   5,   6,   6,    0,   -5 },   // 0x7f 'REPLACEMENT CHARACTER *' U+2370
+  {   401,   5,   6,   6,    0,   -5 },   // 0x80 'NO-BREAK SPACE' U+00A0
+  {   405,   5,   6,   6,    0,   -5 },   // 0x81 'INVERTED EXCLAMATION MARK' U+00A1
+  {   409,   5,   6,   6,    0,   -5 },   // 0x82 'CENT SIGN' U+00A2
+  {   413,   5,   6,   6,    0,   -5 },   // 0x83 'POUND SIGN' U+00A3
+  {   417,   5,   6,   6,    0,   -5 },   // 0x84 'CURRENCY SIGN' U+00A4
+  {   421,   5,   6,   6,    0,   -5 },   // 0x85 'YEN SIGN' U+00A5
+  {   425,   5,   6,   6,    0,   -5 },   // 0x86 'BROKEN BAR' U+00A6
+  {   429,   5,   6,   6,    0,   -5 },   // 0x87 'SECTION SIGN' U+00A7
+  {   433,   5,   6,   6,    0,   -5 },   // 0x88 'DIAERESIS' U+00A8
+  {   437,   5,   6,   6,    0,   -5 },   // 0x89 'COPYRIGHT SIGN' U+00A9
+  {   441,   5,   6,   6,    0,   -5 },   // 0x8a 'FEMININE ORDINAL INDICATOR' U+00AA
+  {   445,   5,   6,   6,    0,   -5 },   // 0x8b 'LEFT-POINTING DOUBLE ANGLE QUOTATION MARK' U+00AB
+  {   449,   5,   6,   6,    0,   -5 },   // 0x8c 'NOT SIGN' U+00AC
+  {   453,   5,   6,   6,    0,   -5 },   // 0x8d 'SOFT HYPHEN' U+00AD
+  {   457,   5,   6,   6,    0,   -5 },   // 0x8e 'REGISTERED SIGN' U+00AE
+  {   461,   5,   6,   6,    0,   -5 },   // 0x8f 'MACRON' U+00AF
+  {   465,   5,   6,   6,    0,   -5 },   // 0x90 'DEGREE SIGN' U+00B0
+  {   469,   5,   6,   6,    0,   -5 },   // 0x91 'PLUS-MINUS SIGN' U+00B1
+  {   473,   5,   6,   6,    0,   -5 },   // 0x92 'SUPERSCRIPT TWO' U+00B2
+  {   477,   5,   6,   6,    0,   -5 },   // 0x93 'SUPERSCRIPT THREE' U+00B3
+  {   481,   5,   6,   6,    0,   -5 },   // 0x94 'ACUTE ACCENT' U+00B4
+  {   485,   5,   6,   6,    0,   -5 },   // 0x95 'MICRO SIGN' U+00B5
+  {   489,   5,   6,   6,    0,   -5 },   // 0x96 'PILCROW SIGN' U+00B6
+  {   493,   5,   6,   6,    0,   -5 },   // 0x97 'MIDDLE DOT' U+00B7
+  {   497,   5,   6,   6,    0,   -5 },   // 0x98 'CEDILLA' U+00B8
+  {   501,   5,   6,   6,    0,   -5 },   // 0x99 'SUPERSCRIPT ONE' U+00B9
+  {   505,   5,   6,   6,    0,   -5 },   // 0x9a 'MASCULINE ORDINAL INDICATOR' U+00BA
+  {   509,   5,   6,   6,    0,   -5 },   // 0x9b 'RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK' U+00BB
+  {   513,   5,   6,   6,    0,   -5 },   // 0x9c 'VULGAR FRACTION ONE QUARTER' U+00BC
+  {   517,   5,   6,   6,    0,   -5 },   // 0x9d 'VULGAR FRACTION ONE HALF' U+00BD
+  {   521,   5,   6,   6,    0,   -5 },   // 0x9e 'VULGAR FRACTION THREE QUARTERS' U+00BE
+  {   525,   5,   6,   6,    0,   -5 },   // 0x9f 'INVERTED QUESTION MARK' U+00BF
+  {   529,   6,   5,   7,    0,   -4 },   // 0xa0 'LATIN CAPITAL LETTER A WITH GRAVE' U+00C0
+  {   533,   6,   7,   7,    0,   -5 },   // 0xa1 'LATIN CAPITAL LETTER A WITH ACUTE' U+00C1
+  {   539,   6,   7,   7,    0,   -5 },   // 0xa2 'LATIN CAPITAL LETTER A WITH CIRCUMFLEX' U+00C2
+  {   545,   7,   6,   7,    0,   -5 },   // 0xa3 'LATIN CAPITAL LETTER A WITH TILDE' U+00C3
+  {   551,   7,   6,   7,    0,   -5 },   // 0xa4 'LATIN CAPITAL LETTER A WITH DIAERESIS' U+00C4
+  {   557,   6,   6,   7,    0,   -5 },   // 0xa5 'LATIN CAPITAL LETTER A WITH RING ABOVE' U+00C5
+  {   562,   6,   6,   7,    0,   -5 },   // 0xa6 'LATIN CAPITAL LETTER AE' U+00C6
+  {   567,   6,   6,   7,    0,   -5 },   // 0xa7 'LATIN CAPITAL LETTER C WITH CEDILLA' U+00C7
+  {   572,   7,   6,   7,    0,   -5 },   // 0xa8 'LATIN CAPITAL LETTER E WITH GRAVE' U+00C8
+  {   578,   7,   7,   7,    0,   -5 },   // 0xa9 'LATIN CAPITAL LETTER E WITH ACUTE' U+00C9
+  {   585,   7,   7,   7,    0,   -5 },   // 0xaa 'LATIN CAPITAL LETTER E WITH CIRCUMFLEX' U+00CA
+  {   592,   6,   7,   7,    0,   -5 },   // 0xab 'LATIN CAPITAL LETTER E WITH DIAERESIS' U+00CB
+  {   598,   7,   7,   7,    0,   -5 },   // 0xac 'LATIN CAPITAL LETTER I WITH GRAVE' U+00CC
+  {   605,   7,   7,   7,    0,   -5 },   // 0xad 'LATIN CAPITAL LETTER I WITH ACUTE' U+00CD
+  {   612,   7,   7,   8,    1,   -5 },   // 0xae 'LATIN CAPITAL LETTER I WITH CIRCUMFLEX' U+00CE
+  {   619,   3,   7,   6,    1,   -5 },   // 0xaf 'LATIN CAPITAL LETTER I WITH DIAERESIS' U+00CF
+  {   622,   6,   7,   7,    0,   -5 },   // 0xb0 'LATIN CAPITAL LETTER ETH' U+00D0
+  {   628,   4,   7,   7,    1,   -5 },   // 0xb1 'LATIN CAPITAL LETTER N WITH TILDE' U+00D1
+  {   632,   6,   7,   7,    0,   -5 },   // 0xb2 'LATIN CAPITAL LETTER O WITH GRAVE' U+00D2
+  {   638,   6,   7,   7,    0,   -5 },   // 0xb3 'LATIN CAPITAL LETTER O WITH ACUTE' U+00D3
+  {   644,   6,   7,   7,    0,   -5 },   // 0xb4 'LATIN CAPITAL LETTER O WITH CIRCUMFLEX' U+00D4
+  {   650,   6,   7,   7,    0,   -5 },   // 0xb5 'LATIN CAPITAL LETTER O WITH TILDE' U+00D5
+  {   656,   6,   7,   7,    0,   -5 },   // 0xb6 'LATIN CAPITAL LETTER O WITH DIAERESIS' U+00D6
+  {   662,   6,   7,   7,    0,   -5 },   // 0xb7 'MULTIPLICATION SIGN' U+00D7
+  {   668,   6,   7,   7,    0,   -5 },   // 0xb8 'LATIN CAPITAL LETTER O WITH STROKE' U+00D8
+  {   674,   6,   7,   7,    0,   -5 },   // 0xb9 'LATIN CAPITAL LETTER U WITH GRAVE' U+00D9
+  {   680,   6,   5,   7,    0,   -4 },   // 0xba 'LATIN CAPITAL LETTER U WITH ACUTE' U+00DA
+  {   684,   8,   7,   8,    0,   -5 },   // 0xbb 'LATIN CAPITAL LETTER U WITH CIRCUMFLEX' U+00DB
+  {   691,   7,   7,   8,    1,   -5 },   // 0xbc 'LATIN CAPITAL LETTER U WITH DIAERESIS' U+00DC
+  {   698,   6,   7,   7,    0,   -5 },   // 0xbd 'LATIN CAPITAL LETTER Y WITH ACUTE' U+00DD
+  {   704,   7,   7,   7,    0,   -5 },   // 0xbe 'LATIN CAPITAL LETTER THORN' U+00DE
+  {   711,   6,   6,   7,    0,   -5 },   // 0xbf 'LATIN SMALL LETTER SHARP S' U+00DF
+  {   716,   5,   6,   6,    0,   -5 },   // 0xc0 'LATIN SMALL LETTER A WITH GRAVE' U+00E0
+  {   720,   5,   6,   6,    0,   -5 },   // 0xc1 'LATIN SMALL LETTER A WITH ACUTE' U+00E1
+  {   724,   5,   6,   6,    0,   -5 },   // 0xc2 'LATIN SMALL LETTER A WITH CIRCUMFLEX' U+00E2
+  {   728,   5,   6,   6,    0,   -5 },   // 0xc3 'LATIN SMALL LETTER A WITH TILDE' U+00E3
+  {   732,   5,   6,   6,    0,   -5 },   // 0xc4 'LATIN SMALL LETTER A WITH DIAERESIS' U+00E4
+  {   736,   5,   6,   6,    0,   -5 },   // 0xc5 'LATIN SMALL LETTER A WITH RING ABOVE' U+00E5
+  {   740,   5,   6,   6,    0,   -5 },   // 0xc6 'LATIN SMALL LETTER AE' U+00E6
+  {   744,   5,   6,   6,    0,   -5 },   // 0xc7 'LATIN SMALL LETTER C WITH CEDILLA' U+00E7
+  {   748,   5,   6,   6,    0,   -5 },   // 0xc8 'LATIN SMALL LETTER E WITH GRAVE' U+00E8
+  {   752,   5,   6,   6,    0,   -5 },   // 0xc9 'LATIN SMALL LETTER E WITH ACUTE' U+00E9
+  {   756,   5,   6,   6,    0,   -5 },   // 0xca 'LATIN SMALL LETTER E WITH CIRCUMFLEX' U+00EA
+  {   760,   5,   6,   6,    0,   -5 },   // 0xcb 'LATIN SMALL LETTER E WITH DIAERESIS' U+00EB
+  {   764,   5,   6,   6,    0,   -5 },   // 0xcc 'LATIN SMALL LETTER I WITH GRAVE' U+00EC
+  {   768,   5,   6,   6,    0,   -5 },   // 0xcd 'LATIN SMALL LETTER I WITH ACUTE' U+00ED
+  {   772,   5,   6,   6,    0,   -5 },   // 0xce 'LATIN SMALL LETTER I WITH CIRCUMFLEX' U+00EE
+  {   776,   5,   6,   6,    0,   -5 },   // 0xcf 'LATIN SMALL LETTER I WITH DIAERESIS' U+00EF
+  {   780,   5,   6,   6,    0,   -5 },   // 0xd0 'LATIN SMALL LETTER ETH' U+00F0
+  {   784,   5,   6,   6,    0,   -5 },   // 0xd1 'LATIN SMALL LETTER N WITH TILDE' U+00F1
+  {   788,   5,   6,   6,    0,   -5 },   // 0xd2 'LATIN SMALL LETTER O WITH GRAVE' U+00F2
+  {   792,   5,   6,   6,    0,   -5 },   // 0xd3 'LATIN SMALL LETTER O WITH ACUTE' U+00F3
+  {   796,   5,   6,   6,    0,   -5 },   // 0xd4 'LATIN SMALL LETTER O WITH CIRCUMFLEX' U+00F4
+  {   800,   5,   6,   6,    0,   -5 },   // 0xd5 'LATIN SMALL LETTER O WITH TILDE' U+00F5
+  {   804,   5,   6,   6,    0,   -5 },   // 0xd6 'LATIN SMALL LETTER O WITH DIAERESIS' U+00F6
+  {   808,   5,   6,   6,    0,   -5 },   // 0xd7 'DIVISION SIGN' U+00F7
+  {   812,   5,   6,   6,    0,   -5 },   // 0xd8 'LATIN SMALL LETTER O WITH STROKE' U+00F8
+  {   816,   5,   6,   6,    0,   -5 },   // 0xd9 'LATIN SMALL LETTER U WITH GRAVE' U+00F9
+  {   820,   5,   6,   6,    0,   -5 },   // 0xda 'LATIN SMALL LETTER U WITH ACUTE' U+00FA
+  {   824,   5,   6,   6,    0,   -5 },   // 0xdb 'LATIN SMALL LETTER U WITH CIRCUMFLEX' U+00FB
+  {   828,   5,   6,   6,    0,   -5 },   // 0xdc 'LATIN SMALL LETTER U WITH DIAERESIS' U+00FC
+  {   832,   5,   6,   6,    0,   -5 },   // 0xdd 'LATIN SMALL LETTER Y WITH ACUTE' U+00FD
+  {   836,   5,   6,   6,    0,   -5 },   // 0xde 'LATIN SMALL LETTER THORN' U+00FE
+  {   840,   5,   6,   6,    0,   -5 } }; // 0xdf 'LATIN SMALL LETTER Y WITH DIAERESIS' U+000FF
+
+const GFXfont Atari6px PROGMEM = {
+  (uint8_t  *)Atari6pxBitmaps,
+  (GFXglyph *)Atari6pxGlyphs,
+  0x20, 0xDF, 9 };
+
+// Approx. 2195 bytes

lib/obp60task/gen_set.py

@@ -20,7 +20,7 @@ import getopt
 import re
 import json
 
-__version__ = "0.3"
+__version__ = "1.3"
 
 def detect_pages(filename):
     # returns a dictionary with page name and the number of gui fields
@@ -90,7 +90,7 @@ def create_json(device, no_of_pages, pagedata):
 
         category = f"{device.upper()} Page {page_no}"
         capabilities = {device.lower(): "true"}
-        visiblepages = [str(vp) for vp in range(page_no, no_of_pages + 1)]
+        visiblepages = [vp for vp in range(page_no, no_of_pages + 1)]
 
         page_data = {
             "name": f"page{page_no}type",
@@ -117,9 +117,9 @@ def create_json(device, no_of_pages, pagedata):
                 "description": "The display for field {}".format(number_to_text(field_no)),
                 "category": category,
                 "capabilities": capabilities,
-                "condition": { 
+                "condition": {
-                    f"page{page_no}type": [ p for p in pages if pagedata[p] >= field_no ]
+                    f"page{page_no}type": [page for page in pages if pagedata[page] >= field_no],
-                    ,"visiblePages": visiblepages
+                    "visiblePages": visiblepages
                 }
             }
             output.append(field_data)
@@ -141,10 +141,7 @@ def create_json(device, no_of_pages, pagedata):
             "description": "Fluid type in tank",
             "category": category,
             "capabilities": capabilities,
-            "condition": {
+            "condition":[{f"page{page_no}type":"Fluid"}]
-                f"page{page_no}type": "Fluid",
-                "visiblePages": visiblepages
-            }
         }
         output.append(fluid_data)
 
@@ -176,12 +173,13 @@ def usage():
     print("Command line options")
     print(" -d --device     device name to use e.g. obp60")
     print(" -p --pages      number of pages to create")
+    print(" -m --merge      json with device config to merge to")
     print(" -h              show this help")
     print()
 
 if __name__ == '__main__':
     try:
-        options, remainder = getopt.getopt(sys.argv[1:], 'd:p:', ['device=','--pages='])
+        options, remainder = getopt.getopt(sys.argv[1:], 'd:p:m:', ['device=','--pages=','--merge'])
     except getopt.GetoptError as err:
         print(err)
         usage()
@@ -189,11 +187,14 @@ if __name__ == '__main__':
 
     device = "obp60"
     no_of_pages = 10
+    merge_json = None
     for opt, arg in options:
         if opt in ('-d', '--device'):
             device = arg
         elif opt in ('-p', '--pages'):
             no_of_pages = int(arg)
+        elif opt in ('-m', '--merge'):
+            merge_json = arg
         elif opt == '-h':
             usage()
             sys.exit(0)
@@ -202,5 +203,12 @@ if __name__ == '__main__':
     pagedata = detect_pages("obp60task.cpp")
 
     json_output = create_json(device, no_of_pages, pagedata)
-    # print omitting first line containing [  of JSON array
+    if merge_json and os.path.isfile(merge_json):
-    print(json_output[1:])
+        with open(merge_json, 'r') as fh:
+            device_json = json.load(fh)
+        page_json = json.loads(json_output)
+        device_json.extend(page_json)
+        print(json.dumps(device_json, indent=4))
+    else:
+        # print omitting first line containing [ of JSON array
+        print(json_output[1:])

lib/obp60task/git_commands.txt

@@ -1,12 +0,0 @@
-git status
-git fetch upstream
-git diff --name-status upstream/master
-git checkout upstream/master platformio.ini
-
-# how to reset my Repo to match norbert'status
-
-git remote add upstream https://github.com/norbert-walter/esp32-nmea2000-obp60
-git fetch upstream
-git checkout master
-git reset --hard upstream/master  
-git push origin master --force

lib/obp60task/hbuffer.cpp

@@ -0,0 +1,88 @@
+/* History Buffer
+ *
+ * Storage backed buffer for sensordata
+ * Permanent storage only supported type: FRAM on I2C-Bus
+ *  
+ * Values can be 1 to 4 bytes in length
+ * 
+ * Header: 32 bytes of size
+ *    0 0x00 HB00              4 magic number
+ *    4 0x04 xxxxxxxxxxxxxxxx 16 name, space padded
+ *   20 0x14 n                 1 byte size of values in buffer
+ *   21 0x15 mm                2 buffer size in count of values
+ *   23 0x17 dd                2 time step in seconds between values
+ *   25 0x19 tttt              4 unix timestamp of head
+ *   29 0x1d hh                2 head pointer
+ *   31 0x1f 0xff              1 header end sign
+ *
+ *   32 0x20 ...                 start of buffer data
+ * 
+ * Usage example: 7 hours of data collected every 75 seconds
+ * TODO
+ * 
+ */
+ #include <stdint.h>
+ #include <time.h>
+ 
+ class HistoryBuffer {
+
+private:
+     // Header prototype for permanent storage
+     uint8_t header[32] = {
+         0x41, 0x48, 0x30, 0x30, // magic: HB00
+         0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+         0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, // empty name
+         0x01, // byte size
+         0x50, 0x01, // value count
+         0x4b, 0x00, // time step
+         0x00, 0x00, 0x00, 0x00, // unix time stamp
+         0x00, 0x00, // head pointer
+         0xff // end sign
+     };
+     uint16_t head = 0; // head pointer to next new value position
+     time_t timestamp; // last modification time of head
+     uint16_t delta_t; // time step in seconds
+
+public:
+     HistoryBuffer(uint16_t size) {
+     }
+     ~HistoryBuffer() {
+         // free memory
+     }
+     void begin() {
+         // 
+     }
+     void finish() {
+     }
+     uint16_t add() {
+         // returns new head value pointer
+         return 0;
+     }
+     uint8_t* get() {
+         // returns complete buffer in order new to old
+         return 0;
+     }
+     uint8_t getvalue(uint16_t dt) {
+         // Return a single value delta seconds ago
+         uint16_t index = head - abs(dt) / delta_t;
+         return 0;
+     }
+     uint8_t getvalue3() {
+         return 0;
+     }
+     bool clear() {
+         // clears buffer and permanent storage
+         return true;
+     }
+ };
+
+class History {
+public:
+    History() {
+    }
+    ~History() {
+    }
+    void *addSeries() {
+        return nullptr;
+    }
+};

lib/obp60task/hbuffer.h

@@ -0,0 +1,21 @@
+#ifndef __HBUFFER_H__
+#define __HBUFFER_H__
+
+class HistoryBuffer {
+public:
+    HistoryBuffer(uint16_t size);
+    void begin();
+    void finish();
+    uint16_t add();
+    uint8_t* get() ;
+    uint8_t getvalue(uint16_t dt);
+    uint8_t getvalue3();
+    void clear();
+};
+class History {
+public:
+    History();
+    void *addSeries();
+};
+
+#endif

lib/obp60task/images/foxtrot.xbm

@@ -0,0 +1,67 @@
+#define foxtrot_width 96
+#define foxtrot_height 64
+static unsigned char foxtrot_bits[] = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0xa0, 0xaa, 0xaa, 0x02, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x50, 0x55, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0xa8, 0xaa, 0xaa, 0x2a, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x80, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x01, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xa0, 0xaa, 0xaa, 0xaa, 0xaa, 0x0a, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x80, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x02, 0x00, 0x00,
+   0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00, 0x00,
+   0x00, 0x00, 0xa8, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x0a, 0x00, 0x00,
+   0x00, 0x00, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00,
+   0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00,
+   0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x00,
+   0x00, 0xa0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x02, 0x00,
+   0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00,
+   0x00, 0xa8, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a, 0x00,
+   0x00, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00,
+   0x80, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00,
+   0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01,
+   0xa0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x0a,
+   0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15,
+   0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a,
+   0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+   0xa8, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x0a,
+   0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05,
+   0x80, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x02,
+   0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01,
+   0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a, 0x00,
+   0x00, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00,
+   0x00, 0xa0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x0a, 0x00,
+   0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00,
+   0x00, 0x80, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00,
+   0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00,
+   0x00, 0x00, 0xa8, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x2a, 0x00, 0x00,
+   0x00, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0x00,
+   0x00, 0x00, 0xa0, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x02, 0x00, 0x00,
+   0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x01, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x54, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xa8, 0xaa, 0xaa, 0xaa, 0xaa, 0x0a, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x05, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x80, 0xaa, 0xaa, 0xaa, 0xaa, 0x02, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x01, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x2a, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x55, 0x15, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0xa0, 0xaa, 0xaa, 0x0a, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x80, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };

lib/obp60task/obp40.conf

@@ -0,0 +1,807 @@
+[DEFAULT]
+calibration_fields = AWA, AWS, COG, DBT, HDM, PRPOS, RPOS, SOG, STW, TWA, TWS, TWD, WTemp
+
+[deviceName]
+label = system name
+type = string
+default = OBP40
+description = system name, used for the access point and for services
+check = checkSystemName
+category = system
+
+[timeServer]
+label = time server
+type = string
+default = pool.ntp.org
+description = NTP time server. Use only one hostname or IP address
+category = wifi client
+capabilities = obp40:true
+
+[timeZone]
+label = Time Zone
+type = number
+default = 0.00
+description = Time zone [UTC -12...+14]
+check = checkMinMax
+min = -12.0
+max = 14.0
+category = OBP40 Settings
+capabilities = obp40:true
+
+[homeLAT]
+label = Home latitude
+type = number
+default = 0.00000
+description = Latitude of boat home location [-90.0...+90.0]
+check = checkMinMax
+min = -90.0
+max = 90.0
+category = OBP40 Settings
+capabilities = obp40:true
+
+[homeLON]
+label = Home longitude
+type = number
+default = 0.00000
+description = Longitude of boat home location [-180.0...+180.0]
+check = checkMinMax
+min = -180.0
+max = 180.0
+category = OBP40 Settings
+capabilities = obp40:true
+
+[draft]
+label = Boat Draft [m]
+type = number
+default = 0.00
+description = The draft of the boat [0...50m]
+check = checkMinMax
+min = 0.0
+max = 50.0
+category = OBP40 Settings
+capabilities = obp40:true
+
+[chainLength]
+label = Anchor Chain Length [m]
+type = number
+default = 0
+description = The length of the anchor chain [0...255m]
+check = checkMinMax
+min = 0
+max = 255
+category = OBP40 Settings
+capabilities = obp40:true
+
+[fuelTank]
+label = Fuel Tank [l]
+type = number
+default = 0
+description = Fuel tank capacity [0...5000l]
+check = checkMinMax
+min = 0
+max = 5000
+category = OBP40 Settings
+capabilities = obp40:true
+
+[fuelConsumption]
+label = Fuel Consuption [l/h]
+type = number
+default = 0.00
+description = Medium fuel consumption [0...1000l/h]
+check = checkMinMax
+min = 0.0
+max = 1000.0
+category = OBP40 Settings
+capabilities = obp40:true
+
+[waterTank]
+label = Water Tank [l]
+type = number
+default = 0
+description = Water tank capacity [0...5000l]
+check = checkMinMax
+min = 0
+max = 5000
+category = OBP40 Settings
+capabilities = obp40:true
+
+[wasteTank]
+label = Waste Tank [l]
+type = number
+default = 0
+description = Waste tank capacity [0...5000l]
+check = checkMinMax
+min = 0
+max = 5000
+category = OBP40 Settings
+capabilities = obp40:true
+
+[batteryVoltage]
+label = Battery Voltage [V]
+type = list
+default = 12V
+description = Battery Voltage [12V|24V]
+list = 12V, 24V
+category = OBP40 Settings
+capabilities = obp40:true
+
+[batteryType]
+label = Battery Type
+type = list
+default = Pb
+description = Type of battery [Pb|Gel|AGM|LiFePo4]
+list = Pb, Gel, AGM, LiFePo4
+category = OBP40 Settings
+capabilities = obp40:true
+
+[batteryCapacity]
+label = Battery Capacity [Ah]
+type = number
+default = 0.0
+description = Battery capacity [0...10000Ah]
+check = checkMinMax
+min = 0.0
+max = 10000.0
+category = OBP40 Settings
+capabilities = obp40:true
+
+[solarPower]
+label = Solar Power [W]
+type = number
+default = 0.0
+description = Solar power [0...10000W]
+check = checkMinMax
+min = 0.0
+max = 10000.0
+category = OBP40 Settings
+capabilities = obp40:true
+
+[genPower]
+label = Genarator Power [W]
+type = number
+default = 0.0
+description = Generator power [0...10000W]
+check = checkMinMax
+min = 0.0
+max = 10000.0
+category = OBP40 Settings
+capabilities = obp40:true
+
+[trackStep]
+label = angle [deg]
+type = number
+default = 3.0
+description = track step offset [1...12deg]
+check = checkMinMax
+min = 1.0
+max = 12.0
+category = OBP40 Settings
+capabilities = obp40:true
+
+[calcTrueWnds]
+label = Calculate True Wind
+type = boolean
+default = false
+description = If not available, calculate true wind data from appearant wind and other boat data
+category = OBP40 Settings
+capabilities = obp40:true
+
+[lengthFormat]
+label = Length Format
+type = list
+default = m
+description = Length format [m|ft]
+list = m, ft
+category = OBP40 Units
+capabilities = obp40:true
+
+[distanceFormat]
+label = Distance Format
+type = list
+default = nm
+description = Distance format [m|km|nm]
+list = m, km, nm
+category = OBP40 Units
+capabilities = obp40:true
+
+[speedFormat]
+label = Speed Format
+type = list
+default = kn
+description = Distance format [m/s|km/h|kn]
+list = m/s, km/h, kn
+category = OBP40 Units
+capabilities = obp40:true
+
+[windspeedFormat]
+label = Wind Speed Format
+type = list
+default = kn
+description = Wind speed format [m/s|km/h|kn|bft]
+list = m/s, km/h, kn, bft
+category = OBP40 Units
+capabilities = obp40:true
+
+[tempFormat]
+label = Temperature Format
+type = list
+default = C
+description = Temperature format [K|C|F]
+list = K, C, F
+category = OBP40 Units
+capabilities = obp40:true
+
+[dateFormat]
+label = Date Format
+type = list
+default = DE
+description = Date format [DE|GB|US|ISO] DE: 31.12.2022, GB: 31/12/2022, US: 12/31/2022, ISO: 2022-12-31
+list = DE, GB, US, ISO
+category = OBP40 Units
+capabilities = obp40:true
+
+[cpuSpeed]
+label = CPU Speed [MHz]
+type = list
+default = 160
+description = CPU speed in MHz [80|160|240]
+list = 80, 160, 240
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[useRTC]
+label = RTC Modul
+type = list
+default = off
+description = Use RTC module type [off|DS1388]
+list = off, DS1388
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[useGPS]
+label = GPS Sensor
+type = list
+default = off
+description = Use internal GPS module type [off|NEO-6M|NEO-M8N|ATGM336H]
+list = off, NEO-6M, NEO-M8N, ATGM336H
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[hdopAccuracy]
+label = HDOP Accuracy [m]
+type = number
+default = 20
+description = HDOP ccuracy in m for a valid GPS signal [1...50]
+check = checkMinMax
+min = 1
+max = 50
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[useEnvSensor]
+label = Env. Sensor
+type = list
+default = off
+description = Use internal or external environment sensor via I2C bus [off|BME280|BMP280|BMP180|BMP085|HTU21|SHT21]
+list = off, BME280, BMP280, BMP180, BMP085, HTU21, SHT21
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[usePowSensor1]
+label = Battery Sensor
+type = list
+default = off
+description = Use external power management sensor via I2C bus for battery [off|INA219|INA226|]
+list = off, INA219, INA226
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[shunt1]
+label = Battery Shunt
+type = list
+default = 10
+description = Shunt current value [10A|50A|100A|200A|300A|400A|500A]
+list = 10, 50, 100, 200, 300, 400, 500
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[usePowSensor2]
+label = Solar Sensor
+type = list
+default = off
+description = Use external power management sensor via I2C bus for solar panels [off|INA219|INA226|]
+list = off, INA219, INA226
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[shunt2]
+label = Solar Shunt
+type = list
+default = 10
+description = Shunt current value [10A|50A|100A|200A|300A|400A|500A]
+list = 10, 50, 100, 200, 300, 400, 500
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[usePowSensor3]
+label = Gen. Sensor
+type = list
+default = off
+description = Use external power management sensor via I2C bus for generator [off|INA219|INA226|]
+list = off, INA219, INA226
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[shunt3]
+label = Gen. Shunt
+type = list
+default = 10
+description = Shunt current value [10A|50A|100A|200A|300A|400A|500A] @ 75mV
+list = 10, 50, 100, 200, 300, 400, 500
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[useRotSensor]
+label = Rot. Sensor
+type = list
+default = off
+description = Use external rotation sensor via I2C bus [off|AS5600]
+list = off, AS5600
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[rotFunction]
+label = Rot. Function
+type = list
+default = off
+description = Function for rotation sensor [off|Rudder|Wind|Mast|Keel|Trim|Boom]
+list = off, Rudder, Wind, Mast, Keel, Trim, Boom
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[rotOffset]
+label = Rot. Offset
+type = number
+default = 0
+description = Offset for rotation sensor [-180°...+180°]
+check = checkMinMax
+min = -180
+max = 180
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[rollLimit]
+label = Roll Limit
+type = number
+default = 25
+description = Limit violation for roll angle [-90°...+90°]
+check = checkMinMax
+min = -90
+max = 90
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[rollOffset]
+label = Roll Offset
+type = number
+default = 0
+description = Roll offset angle [-45°...+45°]
+check = checkMinMax
+min = -45
+max = 45
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[pitchOffset]
+label = Pitch Offset
+type = number
+default = 0
+description = Pitch offset angle [-45°...+45°]
+check = checkMinMax
+min = -45
+max = 45
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[useTempSensor]
+label = Temp. Sensor
+type = boolean
+default = off
+description = Use max. 8 external 1Wire devices [off|DS18B20]
+list = off, DS18B20
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[useSDCard]
+label = SD Card
+type = boolean
+default = false
+description = Use internal SD card interface [off|on]
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[powerMode]
+label = Power Mode
+type = list
+default = Max Power
+description = Settings for power mode
+list = Max Power, Only 5.0V, Min Power
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[underVoltage]
+label = Undervoltage
+type = boolean
+default = false
+description = Switch off device if LiPo voltage drops below 3.65V [on|off]
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[useSimuData]
+label = Simulation Data
+type = boolean
+default = false
+description = Use simulation data when bus data are missing [on|off]
+category = OBP40 Hardware
+capabilities = obp40:true
+
+[tSensitivity]
+label = Touch Sensitivity [%%]
+type = number
+default = 100
+description = Touch sensitivity [0...100%%] for sensor buttons
+check = checkMinMax
+min = 0
+max = 100
+category = OBP40 Calibrations
+capabilities = obp40:false
+
+[vOffset]
+label = VSensor Offset
+type = number
+default = -1.00
+description = Offset for internal voltage sensor (ESP32)
+category = OBP40 Calibrations
+capabilities = obp40:true
+
+[vSlope]
+label = VSensor Slope
+type = number
+default = 1.00
+description = Slope for internal voltage sensor (ESP32)
+category = OBP40 Calibrations
+capabilities = obp40:true
+
+[calInstance1]
+label = Calibration Data Instance 1
+type = list
+default = ---
+description = Data instance for calibration
+list = ---, %(calibration_fields)s
+category = OBP40 Calibrations
+capabilities = obp40:true
+
+[calOffset1]
+label = Data Instance 1 Calibration Offset
+type = number
+default = 0.00
+description = Offset for data instance 1
+category = OBP40 Calibrations
+capabilities = obp40:true
+condition = calInstance1 IN %(calibration_fields)s
+
+[calSlope1]
+label = Data Instance 1 Calibration Slope
+type = number
+default = 1.00
+description = Slope for data instance 1
+category = OBP40 Calibrations
+capabilities = obp40:true
+condition = calInstance1 IN %(calibration_fields)s
+
+[calSmooth1]
+label = Data Instance 1 Smoothing
+type = number
+default = 0
+description = Smoothing factor [0..10]; 0 = no smoothing
+check = checkMinMax
+min = 0
+max = 10
+category = OBP40 Calibrations
+capabilities = obp40:true
+condition = calInstance1 IN %(calibration_fields)s
+
+[calInstance2]
+label = Calibration Data Instance 2
+type = list
+default = ---
+description = Data instance for calibration
+list = ---, %(calibration_fields)s
+category = OBP40 Calibrations
+capabilities = obp40:true
+
+[calOffset2]
+label = Data Instance 2 Calibration Offset
+type = number
+default = 0.00
+description = Offset for data instance 2
+category = OBP40 Calibrations
+capabilities = obp40:true
+condition = calInstance2 IN %(calibration_fields)s
+
+[calSlope2]
+label = Data Instance 2 Calibration Slope
+type = number
+default = 1.00
+description = Slope for data instance 2
+category = OBP40 Calibrations
+capabilities = obp40:true
+condition = calInstance2 IN %(calibration_fields)s
+
+[calSmooth2]
+label = Data Instance 2 Smoothing
+type = number
+default = 0
+description = Smoothing factor [0..10]; 0 = no smoothing
+check = checkMinMax
+min = 0
+max = 10
+category = OBP40 Calibrations
+capabilities = obp40:true
+condition = calInstance2 IN %(calibration_fields)s
+
+[calInstance3]
+label = Calibration Data Instance 3
+type = list
+default = ---
+description = Data instance for calibration
+list = ---, %(calibration_fields)s
+category = OBP40 Calibrations
+capabilities = obp40:true
+
+[calOffset3]
+label = Data Instance 3 Calibration Offset
+type = number
+default = 0.00
+description = Offset for data instance 3
+category = OBP40 Calibrations
+capabilities = obp40:true
+condition = calinstance3 IN %(calibration_fields)s
+
+[calSlope3]
+label = Data Instance 3 Calibration Slope
+type = number
+default = 1.00
+description = Slope for data instance 3
+category = OBP40 Calibrations
+capabilities = obp40:true
+condition = calinstance3 IN %(calibration_fields)s
+
+[calSmooth3]
+label = Data Instance 3 Smoothing
+type = number
+default = 0
+description = Smoothing factor [0..10]; 0 = no smoothing
+check = checkMinMax
+min = 0
+max = 10
+category = OBP40 Calibrations
+capabilities = obp40:true
+condition = calinstance3 IN %(calibration_fields)s
+
+[display]
+label = Display Mode
+type = list
+default = Logo + QR Code
+description = Settings for startup display
+list = White Screen, Logo, Logo + QR Code, Off
+category = OBP40 Display
+capabilities = obp40:true
+
+[displaycolor]
+label = Inverted Display Mode
+type = list
+default = Normal
+description = Invert display to white letters on black background [Normal|Inverse]
+list = Normal, Inverse
+category = OBP40 Display
+capabilities = obp40:true
+
+[statusLine]
+label = Status Line
+type = boolean
+default = true
+description = Show status line [on|off]
+category = OBP40 Display
+capabilities = obp40:true
+
+[timeSource]
+label = Status Time Source
+type = list
+default = GPS
+description = Data source for date and time display in status line [RTC|iRTC|GPS]
+dict =
+	iRTC:Internal real time clock (iRTC)
+	RTC:External real time clock (RTC)
+	GPS:External time via bus (GPS)
+category = OBP40 Display
+capabilities = obp40:true
+
+[refresh]
+label = Refresh
+type = boolean
+default = true
+description = Refresh e-paper display after each new page request to reduce ghost effects [on|off]
+category = OBP40 Display
+capabilities = obp40:true
+
+[fastRefresh]
+label = Fast Refresh
+type = boolean
+default = false
+description = Fast refresh for e-paper display [on|off]
+category = OBP40 Display
+capabilities = obp40:true
+
+[fullRefreshTime]
+label = Full Refresh Time [min]
+type = number
+default = 1
+description = E-Paper full refresh time all [1...10 min]
+check = checkMinMax
+min = 1
+max = 10
+category = OBP40 Display
+capabilities = obp40:true
+
+[holdvalues]
+label = Hold Values
+type = boolean
+default = false
+description = Retain old values when data stream stops [on|off]
+category = OBP40 Display
+capabilities = obp40:true
+
+[valueprecision]
+label = Display value precision
+type = list
+default = 2
+description = Maximum number of decimal places to display [1|2]
+list = 1, 2
+category = OBP40 Display
+capabilities = obp40:true
+
+[headerFormat]
+label = Header Format
+type = list
+default = TEXT
+description = Header format: Text or Symbols
+dict =
+	TEXT:Text
+	ICON:Symbols
+category = OBP40 Display
+capabilities = obp40:true
+
+[backlight]
+label = Backlight Mode
+type = list
+default = off
+description = Settings for automatic backlight mode
+list = Off, Control by Sun, Control by Bus, Control by Time, Control by Key, On
+category = OBP40 Display
+capabilities = obp40:false
+
+[blColor]
+label = Backlight Color
+type = list
+default = Red
+description = Backlight color
+list = Red, Orange, Yellow, Green, Blue, Aqua, Violet, White
+category = OBP40 Display
+capabilities = obp40:false
+
+[blBrightness]
+label = Brightness [%%]
+type = number
+default = 50
+description = Backlight brightness [20...100%%]
+check = checkMinMax
+min = 20
+max = 100
+category = OBP40 Display
+capabilities = obp40:false
+
+[flashLED]
+label = Flash LED Mode
+type = list
+default = Off
+description = Settings for flash LED
+list = Off, Bus Data, GPS Fix Lost, Limit Violation
+category = OBP40 Display
+capabilities = obp40:false
+
+[buzzerError]
+label = Buzzer Error
+type = boolean
+default = false
+description = Sound on error [on|off]
+category = OBP40 Buzzer
+capabilities = obp40:false
+
+[buzzerGps]
+label = Buzzer GPS Fix
+type = boolean
+default = false
+description = Sound on missing or lost GPS fix
+category = OBP40 Buzzer
+capabilities = obp40:false
+
+[buzzerLim]
+label = Buzzer by Limits
+type = boolean
+default = false
+description = Sound on limit violation
+category = OBP40 Buzzer
+capabilities = obp40:false
+
+[buzzerMode]
+label = Buzzer Mode
+type = list
+default = Off
+description = Settings for buzzer behaviour
+list = Off, Short Single Beep, Longer Single Beep, Beep until Confirmation
+category = OBP40 Buzzer
+capabilities = obp40:false
+
+[buzzerPower]
+label = Buzzer Power [%%]
+type = number
+default = 50
+description = Buzzer loudness [0...100%%]
+check = checkMinMax
+min = 0
+max = 100
+category = OBP40 Buzzer
+capabilities = obp40:false
+
+[visiblePages]
+label = Number of Pages
+type = number
+default = 10
+description = Number of visible data pages [1...10]
+check = checkMinMax
+min = 1
+max = 10
+category = OBP40 Pages
+capabilities = obp40:true
+
+[startPage]
+label = Start Page
+type = number
+default = 1
+description = First page number to display after device startup
+check = checkMinMax
+min = 1
+max = 10
+category = OBP40 Pages
+capabilities = obp40:true
+
+[systemPage]
+label = System Page
+type = boolean
+default = false
+description = Use wheel button for system page or direct deep sleep mode
+category = OBP40 Pages
+capabilities = obp40:true
+
+[imageFormat]
+label = Screenshot Format
+type = list
+default = PBM
+description = Graphics file format for screenshots [GIF|PBM|BMP]
+dict =
+	GIF:Compressed image (GIF)
+	PBM:Portable bitmap (PBM)
+	BMP:Windows bitmap (BMP)
+category = OBP40 Pages
+capabilities = obp40:true

lib/obp60task/obp60.conf

@@ -0,0 +1,857 @@
+[DEFAULT]
+calibration_fields = AWA, AWS, COG, DBT, HDM, PRPOS, RPOS, SOG, STW, TWA, TWS, TWD, WTemp
+
+[deviceName]
+label = system name
+type = string
+default = OBP60V2
+description = system name, used for the access point and for services
+check = checkSystemName
+category = system
+
+[timeServer]
+label = time server
+type = string
+default = pool.ntp.org
+description = NTP time server. Use only one hostname or IP address
+category = wifi client
+capabilities = obp60:true
+
+[timeZone]
+label = Time Zone
+type = number
+default = 0.00
+description = Time zone [UTC -12...+14]
+check = checkMinMax
+min = -12.0
+max = 14.0
+category = OBP60 Settings
+capabilities = obp60:true
+
+[homeLAT]
+label = Home latitude
+type = number
+default = 
+description = Latitude of boat home location [-90.0...+90.0]
+check = checkMinMax
+min = -90.0
+max = 90.0
+category = OBP60 Settings
+capabilities = obp60:true
+
+[homeLON]
+label = Home longitude
+type = number
+default = 
+description = Longitude of boat home location [-180.0...+180.0]
+check = checkMinMax
+min = -180.0
+max = 180.0
+category = OBP60 Settings
+capabilities = obp60:true
+
+[draft]
+label = Boat Draft [m]
+type = number
+default = 0.00
+description = The draft of the boat [0...50m]
+check = checkMinMax
+min = 0.0
+max = 50.0
+category = OBP60 Settings
+capabilities = obp60:true
+
+[chainLength]
+label = Anchor Chain Length [m]
+type = number
+default = 0
+description = The length of the anchor chain [0...255m]
+check = checkMinMax
+min = 0
+max = 255
+category = OBP60 Settings
+capabilities = obp60:true
+
+[fuelTank]
+label = Fuel Tank [l]
+type = number
+default = 0
+description = Fuel tank capacity [0...5000l]
+check = checkMinMax
+min = 0
+max = 5000
+category = OBP60 Settings
+capabilities = obp60:true
+
+[fuelConsumption]
+label = Fuel Consuption [l/h]
+type = number
+default = 0.00
+description = Medium fuel consumption [0...1000l/h]
+check = checkMinMax
+min = 0.0
+max = 1000.0
+category = OBP60 Settings
+capabilities = obp60:true
+
+[waterTank]
+label = Water Tank [l]
+type = number
+default = 0
+description = Water tank capacity [0...5000l]
+check = checkMinMax
+min = 0
+max = 5000
+category = OBP60 Settings
+capabilities = obp60:true
+
+[wasteTank]
+label = Waste Tank [l]
+type = number
+default = 0
+description = Waste tank capacity [0...5000l]
+check = checkMinMax
+min = 0
+max = 5000
+category = OBP60 Settings
+capabilities = obp60:true
+
+[batteryVoltage]
+label = Battery Voltage [V]
+type = list
+default = 12V
+description = Battery Voltage [12V|24V]
+list = 12V, 24V
+category = OBP60 Settings
+capabilities = obp60:true
+
+[batteryType]
+label = Battery Type
+type = list
+default = Pb
+description = Type of battery [Pb|Gel|AGM|LiFePo4]
+list = Pb, Gel, AGM, LiFePo4
+category = OBP60 Settings
+capabilities = obp60:true
+
+[batteryCapacity]
+label = Battery Capacity [Ah]
+type = number
+default = 0.0
+description = Battery capacity [0...10000Ah]
+check = checkMinMax
+min = 0.0
+max = 10000.0
+category = OBP60 Settings
+capabilities = obp60:true
+
+[solarPower]
+label = Solar Power [W]
+type = number
+default = 0.0
+description = Solar power [0...10000W]
+check = checkMinMax
+min = 0.0
+max = 10000.0
+category = OBP60 Settings
+capabilities = obp60:true
+
+[genPower]
+label = Genarator Power [W]
+type = number
+default = 0.0
+description = Generator power [0...10000W]
+check = checkMinMax
+min = 0.0
+max = 10000.0
+category = OBP60 Settings
+capabilities = obp60:true
+
+[trackStep]
+label = angle [deg]
+type = number
+default = 3.0
+description = track step offset [1...12deg]
+check = checkMinMax
+min = 1.0
+max = 12.0
+category = OBP60 Settings
+capabilities = obp60:true
+
+[calcTrueWnds]
+label = Calculate True Wind
+type = boolean
+default = false
+description = If not available, calculate true wind data from appearant wind and other boat data
+category = OBP60 Settings
+capabilities = obp60:true
+
+[lengthFormat]
+label = Length Format
+type = list
+default = m
+description = Length format [m|ft]
+list = m, ft
+category = OBP60 Units
+capabilities = obp60:true
+
+[distanceFormat]
+label = Distance Format
+type = list
+default = nm
+description = Distance format [m|km|nm]
+list = m, km, nm
+category = OBP60 Units
+capabilities = obp60:true
+
+[speedFormat]
+label = Speed Format
+type = list
+default = kn
+description = Distance format [m/s|km/h|kn]
+list = m/s, km/h, kn
+category = OBP60 Units
+capabilities = obp60:true
+
+[windspeedFormat]
+label = Wind Speed Format
+type = list
+default = kn
+description = Wind speed format [m/s|km/h|kn|bft]
+list = m/s, km/h, kn, bft
+category = OBP60 Units
+capabilities = obp60:true
+
+[tempFormat]
+label = Temperature Format
+type = list
+default = C
+description = Temperature format [K|C|F]
+list = K, C, F
+category = OBP60 Units
+capabilities = obp60:true
+
+[dateFormat]
+label = Date Format
+type = list
+default = DE
+description = Date format [DE|GB|US|ISO] DE: 31.12.2022, GB: 31/12/2022, US: 12/31/2022, ISO: 2022-12-31
+list = DE, GB, US, ISO
+category = OBP60 Units
+capabilities = obp60:true
+
+[cpuSpeed]
+label = CPU Speed [MHz]
+type = list
+default = 160
+description = CPU speed in MHz [80|160|240]
+list = 80, 160, 240
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[useRTC]
+label = RTC Modul
+type = list
+default = DS1388
+description = Use internal RTC module type [off|DS1388]
+list = off, DS1388
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[useGPS]
+label = GPS Sensor
+type = list
+default = ATGM336H
+description = Use internal GPS module type [off|NEO-6M|NEO-M8N|ATGM336H]
+list = off, NEO-6M, NEO-M8N, ATGM336H
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[hdopAccuracy]
+label = HDOP Accuracy [m]
+type = number
+default = 20
+description = HDOP ccuracy in m for a valid GPS signal [1...50]
+check = checkMinMax
+min = 1
+max = 50
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[useEnvSensor]
+label = Env. Sensor
+type = list
+default = BMP280
+description = Use internal or external environment sensor via I2C bus [off|BME280|BMP280|BMP180|BMP085|HTU21|SHT21]
+list = off, BME280, BMP280, BMP180, BMP085, HTU21, SHT21
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[usePowSensor1]
+label = Battery Sensor
+type = list
+default = off
+description = Use external power management sensor via I2C bus for battery [off|INA219|INA226|]
+list = off, INA219, INA226
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[shunt1]
+label = Battery Shunt
+type = list
+default = 10
+description = Shunt current value [10A|50A|100A|200A|300A|400A|500A]
+list = 10, 50, 100, 200, 300, 400, 500
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[usePowSensor2]
+label = Solar Sensor
+type = list
+default = off
+description = Use external power management sensor via I2C bus for solar panels [off|INA219|INA226|]
+list = off, INA219, INA226
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[shunt2]
+label = Solar Shunt
+type = list
+default = 10
+description = Shunt current value [10A|50A|100A|200A|300A|400A|500A]
+list = 10, 50, 100, 200, 300, 400, 500
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[usePowSensor3]
+label = Gen. Sensor
+type = list
+default = off
+description = Use external power management sensor via I2C bus for generator [off|INA219|INA226|]
+list = off, INA219, INA226
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[shunt3]
+label = Gen. Shunt
+type = list
+default = 10
+description = Shunt current value [10A|50A|100A|200A|300A|400A|500A] @ 75mV
+list = 10, 50, 100, 200, 300, 400, 500
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[useRotSensor]
+label = Rot. Sensor
+type = list
+default = off
+description = Use external rotation sensor via I2C bus [off|AS5600]
+list = off, AS5600
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[rotFunction]
+label = Rot. Function
+type = list
+default = off
+description = Function for rotation sensor [off|Rudder|Wind|Mast|Keel|Trim|Boom]
+list = off, Rudder, Wind, Mast, Keel, Trim, Boom
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[rotOffset]
+label = Rot. Offset
+type = number
+default = 0
+description = Offset for rotation sensor [-180°...+180°]
+check = checkMinMax
+min = -180
+max = 180
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[rollLimit]
+label = Roll Limit
+type = number
+default = 25
+description = Limit violation for roll angle [-90°...+90°]
+check = checkMinMax
+min = -90
+max = 90
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[rollOffset]
+label = Roll Offset
+type = number
+default = 0
+description = Roll offset angle [-45°...+45°]
+check = checkMinMax
+min = -45
+max = 45
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[pitchOffset]
+label = Pitch Offset
+type = number
+default = 0
+description = Pitch offset angle [-45°...+45°]
+check = checkMinMax
+min = -45
+max = 45
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[useTempSensor]
+label = Temp. Sensor
+type = boolean
+default = off
+description = Use max. 8 external 1Wire devices [off|DS18B20]
+list = off, DS18B20
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[powerMode]
+label = Power Mode
+type = list
+default = Max Power
+description = Settings for power mode
+list = Max Power, Only 5.0V, Min Power
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[underVoltage]
+label = Undervoltage
+type = boolean
+default = false
+description = Switch off device if voltage drops below 9V [on|off]
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[useSimuData]
+label = Simulation Data
+type = boolean
+default = false
+description = Use simulation data when bus data are missing [on|off]
+category = OBP60 Hardware
+capabilities = obp60:true
+
+[tSensitivity]
+label = Touch Sensitivity [%%]
+type = number
+default = 100
+description = Touch sensitivity [0...100%%] for sensor buttons
+check = checkMinMax
+min = 0
+max = 100
+category = OBP60 Calibrations
+capabilities = obp60:true
+
+[vOffset]
+label = VSensor Offset
+type = number
+default = -1.00
+description = Offset for internal voltage sensor (ESP32)
+category = OBP60 Calibrations
+capabilities = obp60:true
+
+[vSlope]
+label = VSensor Slope
+type = number
+default = 1.00
+description = Slope for internal voltage sensor (ESP32)
+category = OBP60 Calibrations
+capabilities = obp60:true
+
+[calInstance1]
+label = Calibration Data Instance 1
+type = list
+default = ---
+description = Data instance for calibration
+list = ---, %(calibration_fields)s
+category = OBP60 Calibrations
+capabilities = obp60:true
+
+[calOffset1]
+label = Data Instance 1 Calibration Offset
+type = number
+default = 0.00
+description = Offset for data instance 1
+category = OBP60 Calibrations
+capabilities = obp60:true
+condition = calInstance1 IN %(calibration_fields)s
+
+[calSlope1]
+label = Data Instance 1 Calibration Slope
+type = number
+default = 1.00
+description = Slope for data instance 1
+category = OBP60 Calibrations
+capabilities = obp60:true
+condition = calInstance1 IN %(calibration_fields)s
+
+[calSmooth1]
+label = Data Instance 1 Smoothing
+type = number
+default = 0
+description = Smoothing factor [0..10]; 0 = no smoothing
+check = checkMinMax
+min = 0
+max = 10
+category = OBP60 Calibrations
+capabilities = obp60:true
+condition = calInstance1 IN %(calibration_fields)s
+
+[calInstance2]
+label = Calibration Data Instance 2
+type = list
+default = ---
+description = Data instance for calibration
+list = ---, %(calibration_fields)s
+category = OBP60 Calibrations
+capabilities = obp60:true
+
+[calOffset2]
+label = Data Instance 2 Calibration Offset
+type = number
+default = 0.00
+description = Offset for data instance 2
+category = OBP60 Calibrations
+capabilities = obp60:true
+condition = calInstance2 IN %(calibration_fields)s
+
+[calSlope2]
+label = Data Instance 2 Calibration Slope
+type = number
+default = 1.00
+description = Slope for data instance 2
+category = OBP60 Calibrations
+capabilities = obp60:true
+condition = calInstance2 IN %(calibration_fields)s
+
+[calSmooth2]
+label = Data Instance 2 Smoothing
+type = number
+default = 0
+description = Smoothing factor [0..10]; 0 = no smoothing
+check = checkMinMax
+min = 0
+max = 10
+category = OBP60 Calibrations
+capabilities = obp60:true
+condition = calInstance2 IN %(calibration_fields)s
+
+[calInstance3]
+label = Calibration Data Instance 3
+type = list
+default = ---
+description = Data instance for calibration
+list = ---, %(calibration_fields)s
+category = OBP60 Calibrations
+capabilities = obp60:true
+
+[calOffset3]
+label = Data Instance 3 Calibration Offset
+type = number
+default = 0.00
+description = Offset for data instance 3
+category = OBP60 Calibrations
+capabilities = obp60:true
+condition = calinstance3 IN %(calibration_fields)s
+
+[calSlope3]
+label = Data Instance 3 Calibration Slope
+type = number
+default = 1.00
+description = Slope for data instance 3
+category = OBP60 Calibrations
+capabilities = obp60:true
+condition = calinstance3 IN %(calibration_fields)s
+
+[calSmooth3]
+label = Data Instance 3 Smoothing
+type = number
+default = 0
+description = Smoothing factor [0..10]; 0 = no smoothing
+check = checkMinMax
+min = 0
+max = 10
+category = OBP60 Calibrations
+capabilities = obp60:true
+condition = calinstance3 IN %(calibration_fields)s
+
+[display]
+label = Display Mode
+type = list
+default = Logo + QR Code
+description = Settings for startup display
+list = White Screen, Logo, Logo + QR Code, Off
+category = OBP60 Display
+capabilities = obp60:true
+
+[displaycolor]
+label = Inverted Display Mode
+type = list
+default = Normal
+description = Invert display to white letters on black background [Normal|Inverse]
+list = Normal, Inverse
+category = OBP60 Display
+capabilities = obp60:true
+
+[statusLine]
+label = Status Line
+type = boolean
+default = true
+description = Show status line [on|off]
+category = OBP60 Display
+capabilities = obp60:true
+
+[timeSource]
+label = Status Time Source
+type = list
+default = GPS
+description = Data source for date and time display in status line [RTC|GPS]
+dict =
+	RTC:Real time clock (RTC)
+	GPS:Time via bus (GPS)
+category = OBP60 Display
+capabilities = obp60:true
+
+[refresh]
+label = Refresh
+type = boolean
+default = true
+description = Refresh e-paper display after each new page request to reduce ghost effects [on|off]
+category = OBP60 Display
+capabilities = obp60:true
+
+[fastRefresh]
+label = Fast Refresh
+type = boolean
+default = false
+description = Fast refresh for e-paper display [on|off]
+category = OBP60 Display
+capabilities = obp60:true
+
+[fullRefreshTime]
+label = Full Refresh Time [min]
+type = number
+default = 1
+description = E-Paper full refresh time all [1...10 min]
+check = checkMinMax
+min = 1
+max = 10
+category = OBP60 Display
+capabilities = obp60:true
+
+[holdvalues]
+label = Hold Values
+type = boolean
+default = false
+description = Retain old values when data stream stops [on|off]
+category = OBP60 Display
+capabilities = obp60:true
+
+[valueprecision]
+label = Display value precision
+type = list
+default = 2
+description = Maximum number of decimal places to display [1|2]
+list = 1, 2
+category = OBP60 Display
+capabilities = obp60:true
+
+[headerFormat]
+label = Header Format
+type = list
+default = TEXT
+description = Header format: Text or Symbols
+dict =
+	TEXT:Text
+	ICON:Symbols
+category = OBP60 Pages
+capabilities = obp60:true
+
+[backlight]
+label = Backlight Mode
+type = list
+default = Control by Key
+description = Settings for automatic backlight mode
+list = Off, Control by Sun, Control by Bus, Control by Time, Control by Key, On
+category = OBP60 Display
+capabilities = obp60:true
+
+[blColor]
+label = Backlight Color
+type = list
+default = Red
+description = Backlight color
+list = Red, Orange, Yellow, Green, Blue, Aqua, Violet, White
+category = OBP60 Display
+capabilities = obp60:true
+
+[blBrightness]
+label = Brightness [%%]
+type = number
+default = 50
+description = Backlight brightness [20...100%%]
+check = checkMinMax
+min = 20
+max = 100
+category = OBP60 Display
+capabilities = obp60:true
+
+[flashLED]
+label = Flash LED Mode
+type = list
+default = Limit Violation
+description = Settings for flash LED
+list = Off, Bus Data, GPS Fix Lost, Limit Violation
+category = OBP60 Display
+capabilities = obp60:true
+
+[buzzerError]
+label = Buzzer Error
+type = boolean
+default = false
+description = Sound on error [on|off]
+category = OBP60 Buzzer
+capabilities = obp60:true
+
+[buzzerGps]
+label = Buzzer GPS Fix
+type = boolean
+default = false
+description = Sound on missing or lost GPS fix
+category = OBP60 Buzzer
+capabilities = obp60:true
+
+[buzzerLim]
+label = Buzzer by Limits
+type = boolean
+default = false
+description = Sound on limit violation
+category = OBP60 Buzzer
+capabilities = obp60:true
+
+[buzzerMode]
+label = Buzzer Mode
+type = list
+default = Off
+description = Settings for buzzer behaviour
+list = Off, Short Single Beep, Longer Single Beep, Beep until Confirmation
+category = OBP60 Buzzer
+capabilities = obp60:true
+
+[buzzerPower]
+label = Buzzer Power [%%]
+type = number
+default = 50
+description = Buzzer loudness [0...100%%]
+check = checkMinMax
+min = 0
+max = 100
+category = OBP60 Buzzer
+capabilities = obp60:true
+
+[visiblePages]
+label = Number of Pages
+type = number
+default = 10
+description = Number of visible data pages [1...10]
+check = checkMinMax
+min = 1
+max = 10
+category = OBP60 Pages
+capabilities = obp60:true
+
+[startPage]
+label = Start Page
+type = number
+default = 1
+description = First page number to display after device startup
+check = checkMinMax
+min = 1
+max = 10
+category = OBP60 Pages
+capabilities = obp60:true
+
+[imageFormat]
+label = Screenshot Format
+type = list
+default = PBM
+description = Graphics file format for screenshots [GIF|PBM|BMP]
+dict =
+	GIF:Compressed image (GIF)
+	PBM:Portable bitmap (PBM)
+	BMP:Windows bitmap (BMP)
+category = OBP60 Pages
+capabilities = obp60:true
+
+# WIP
+
+[trackerType]
+label = Tracker Type
+type = list
+default = off
+description = Type of tracker to use [OFF|SDCARD|SERVER|HERO]
+dict = OFF:No tracker
+       SDCARD:Log to SD-Card
+       SERVER:Log to Server
+       HERO:Connect with Regatta Hero
+category = OBP60 Pages
+capabilities = obp60:true
+
+[trackerOrganization]
+label = Tracker team
+type = string
+default = demo
+description = Tracker organization for login
+category = OBP60 Pages
+
+[trackerPasscode]
+label = Tracker team
+type = password
+default = 291758
+description = Your tracker team you belong to. E.g. short name of association
+category = OBP60 Pages
+
+[trackerTeam]
+label = Tracker team
+type = string
+default = none
+description = Your tracker team you belong to. E.g. short name of association
+category = OBP60 Pages
+
+[trackerHandicap]
+label = Boat handicap
+type = number
+default = 100
+check = checkMinMax
+min = 50
+max = 1000
+description = The handicap value of your boat. E.g. yardstick value
+category = OBP60 Pages
+
+[boatName]
+label = Boat Name
+type = string
+default = Unsinkbar II
+description = name of your boat
+category = OBP60 Pages
+
+[boatClass]
+label = Boat Class
+type = string
+default = One off
+description = Class name of your boat if available or "One off"
+category = OBP60 Pages
+
+[sailNumber]
+label = Sail number
+type = string
+default = GER 11
+description = Identification number on sail
+category = OBP60 Pages
+

lib/obp60task/obp60task.cpp

@@ -1,6 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include "obp60task.h"
 #include "Pagedata.h"                   // Data exchange for pages
+#include "OBP60Formatter.h"             // Data formatting for boat values
 #include "OBP60Hardware.h"              // PIN definitions
 #include <Wire.h>                       // I2C connections
 #include <MCP23017.h>                   // MCP23017 extension Port
@@ -11,8 +13,12 @@
 #include <NMEA0183Messages.h>
 #include <GxEPD2_BW.h>                  // GxEPD2 lib for b/w E-Ink displays
 #include "OBP60Extensions.h"            // Functions lib for extension board
-#include "OBP60Keypad.h"                // Functions for keypad
+#include "OBPKeyboardTask.h"            // Functions lib for keyboard handling
 #include "OBPDataOperations.h"          // Functions lib for data operations such as true wind calculation
+#include "OBP60QRWiFi.h"                // Functions lib for WiFi QR code
+#include "OBPSensorTask.h"              // Functions lib for sensor data
+
+#include "freertos/task.h" // WIP possible unused 
 
 #ifdef BOARD_OBP40S3
 #include "driver/rtc_io.h"              // Needs for weakup from deep sleep
@@ -20,12 +26,8 @@
 #endif
 
 // Pictures
-//#include GxEPD_BitmapExamples         // Example picture
+#include "images/OBP_400x300.xbm"       // OBP Logo
-#include "MFD_OBP60_400x300_sw.h"       // MFD with logo
-#include "Logo_OBP_400x300_sw.h"        // OBP Logo
 #include "images/unknown.xbm"           // unknown page indicator
-#include "OBP60QRWiFi.h"                // Functions lib for WiFi QR code
-#include "OBPSensorTask.h"              // Functions lib for sensor data
 
 // Global vars
 bool initComplete = false;      // Initialization complete
@@ -63,15 +65,15 @@ void OBP60Init(GwApi *api){
 #endif
 
     // Settings for e-paper display
-    String fastrefresh = api->getConfig()->getConfigItem(api->getConfig()->fastRefresh,true)->asString();
+    String fastrefresh = config->getConfigItem(config->fastRefresh,true)->asString();
     logger->logDebug(GwLog::DEBUG, "Fast Refresh Mode is: %s", fastrefresh.c_str());
-    #ifdef DISPLAY_GDEY042T81
+#ifdef DISPLAY_GDEY042T81
     if(fastrefresh == "true"){
         static const bool useFastFullUpdate = true;   // Enable fast full display update only for GDEY042T81
     }
-    #endif
+#endif
 
-    #ifdef BOARD_OBP60S3
+#ifdef BOARD_OBP60S3
     touchSleepWakeUpEnable(TP1, 45); // TODO sensitivity should be configurable via web interface
     touchSleepWakeUpEnable(TP2, 45);
     touchSleepWakeUpEnable(TP3, 45);
@@ -79,31 +81,31 @@ void OBP60Init(GwApi *api){
     touchSleepWakeUpEnable(TP5, 45);
     touchSleepWakeUpEnable(TP6, 45);
     esp_sleep_enable_touchpad_wakeup();
-    #endif
+#endif
 
     // Get CPU speed
     int freq = getCpuFrequencyMhz();
     logger->logDebug(GwLog::LOG,"CPU speed at boot: %i MHz", freq);
     
     // Settings for backlight
-    String backlightMode = api->getConfig()->getConfigItem(api->getConfig()->backlight,true)->asString();
+    String backlightMode = config->getConfigItem(config->backlight,true)->asString();
-    logger->logDebug(GwLog::DEBUG,"Backlight Mode is: %s", backlightMode.c_str());
+    logger->logDebug(GwLog::DEBUG, "Backlight Mode is: %s", backlightMode.c_str());
-    uint brightness = uint(api->getConfig()->getConfigItem(api->getConfig()->blBrightness,true)->asInt());
+    uint brightness = uint(config->getConfigItem(config->blBrightness,true)->asInt());
-    String backlightColor = api->getConfig()->getConfigItem(api->getConfig()->blColor,true)->asString();
+    String backlightColor = config->getConfigItem(config->blColor,true)->asString();
-    if(String(backlightMode) == "On"){
+    if (backlightMode == "On") {
-           setBacklightLED(brightness, colorMapping(backlightColor));
+        setBacklightLED(brightness, colorMapping(backlightColor));
     }
-    else if(String(backlightMode) == "Off"){
+    else if (backlightMode == "Off") {
-           setBacklightLED(0, COLOR_BLACK); // Backlight LEDs off (blue without britghness)
+        setBacklightLED(0, COLOR_BLACK); // Backlight LEDs off (blue without britghness)
     }
-    else if(String(backlightMode) == "Control by Key"){
+    else if (backlightMode == "Control by Key") {
-           setBacklightLED(0, COLOR_BLUE); // Backlight LEDs off (blue without britghness)
+        setBacklightLED(0, COLOR_BLUE); // Backlight LEDs off (blue without britghness)
     }
 
     // Settings flash LED mode
-    String ledMode = api->getConfig()->getConfigItem(api->getConfig()->flashLED,true)->asString();
+    String ledMode = config->getConfigItem(config->flashLED,true)->asString();
     logger->logDebug(GwLog::DEBUG,"LED Mode is: %s", ledMode.c_str());
-    if(String(ledMode) == "Off"){
+    if (ledMode == "Off") {
         setBlinkingLED(false);
     }
 
@@ -112,41 +114,32 @@ void OBP60Init(GwApi *api){
     initComplete = true;
 
     // Buzzer tone for initialization finish
-    setBuzzerPower(uint(api->getConfig()->getConfigItem(api->getConfig()->buzzerPower,true)->asInt()));
+    setBuzzerPower(uint(config->getConfigItem(config->buzzerPower,true)->asInt()));
     buzzer(TONE4, 500);
 
 }
 
-typedef struct {
+/* ux-functions not working WTF?
-        int page0=0;
+bool listTasks(GwLog *logger) {
-        QueueHandle_t queue;
+    UBaseType_t taskCount = uxTaskGetNumberOfTasks();
-        GwLog* logger = nullptr;
+    TaskStatus_t *taskStatusArray;
-//        GwApi* api = nullptr;
-        uint sensitivity = 100;
-        bool use_syspage = true;
-    } MyData;
 
-// Keyboard Task
+    taskStatusArray = (TaskStatus_t *)pvPortMalloc(taskCount * sizeof(TaskStatus_t));
-void keyboardTask(void *param){
+    if (taskStatusArray != NULL) {
-    MyData *data=(MyData *)param;
+        taskCount = uxTaskGetSystemState(taskStatusArray, taskCount, NULL);
-
+        for (UBaseType_t i = 0; i < taskCount; i++) {
-    int keycode = 0;
+            logger->logDebug(GwLog::LOG, "Task Name: %s (Stack=%d)", taskStatusArray[i].pcTaskName,
-    data->logger->logDebug(GwLog::LOG,"Start keyboard task");
+                taskStatusArray[i].usStackHighWaterMark);
-
+            // more fields in task status
-    // Loop for keyboard task
+            // xHandle, uxCurrentPriority, uxBasePriority, usStackHighWaterMark
-    while (true){
-        keycode = readKeypad(data->logger, data->sensitivity, data->use_syspage);
-        //send a key event
-        if(keycode != 0){
-            xQueueSend(data->queue, &keycode, 0);
-            data->logger->logDebug(GwLog::LOG,"Send keycode: %d", keycode);
         }
-        delay(20);      // 50Hz update rate (20ms)
+        vPortFree(taskStatusArray);
+        return true;
     }
-    vTaskDelete(NULL);
+    logger->logDebug(GwLog::ERROR, "Failed to allocate memory for task list");
-}
+    return false;
+} */
 
-// --- Class BoatValueList --------------
 bool BoatValueList::addValueToList(GwApi::BoatValue *v){
     for (int i=0;i<numValues;i++){
         if (allBoatValues[i] == v){
@@ -159,6 +152,7 @@ bool BoatValueList::addValueToList(GwApi::BoatValue *v){
     numValues++;
     return true;
 }
+
 //helper to ensure that each BoatValue is only queried once
 GwApi::BoatValue *BoatValueList::findValueOrCreate(String name){
     for (int i=0;i<numValues;i++){
@@ -170,7 +164,6 @@ GwApi::BoatValue *BoatValueList::findValueOrCreate(String name){
     addValueToList(rt);
     return rt;
 }
-// --- End Class BoatValueList --------------
 
 //we want to have a list that has all our page definitions
 //this way each page can easily be added here
@@ -197,12 +190,13 @@ class PageList{
  * each page should have defined a registerXXXPage variable of type
  * PageData that describes what it needs
  */
-void registerAllPages(PageList &list){
+void registerAllPages(GwLog *logger, PageList &list){
     //the next line says that this variable is defined somewhere else
     //in our case in a separate C++ source file
     //this way this separate source file can be compiled by it's own
     //and has no access to any of our data except the one that we
     //give as a parameter to the page function
+    logger->logDebug(GwLog::LOG, "Memory before registering pages: stack=%d, heap=%d", uxTaskGetStackHighWaterMark(NULL), ESP.getFreeHeap());
     extern PageDescription registerPageSystem;
     //we add the variable to our list
     list.add(&registerPageSystem);
@@ -262,8 +256,15 @@ void registerAllPages(PageList &list){
     list.add(&registerPageNavigation);
     extern PageDescription registerPageDigitalOut;
     list.add(&registerPageDigitalOut);
-    extern PageDescription registerPageAutopilot;
+    extern PageDescription registerPageAnchor;
-    list.add(&registerPageAutopilot);
+    list.add(&registerPageAnchor);
+    extern PageDescription registerPageAIS;
+    list.add(&registerPageAIS);
+    extern PageDescription registerPageBarograph;
+    list.add(&registerPageBarograph);
+    extern PageDescription registerPageTracker;
+    list.add(&registerPageTracker);
+    logger->logDebug(GwLog::LOG,"Memory after registering pages: stack=%d, heap=%d", uxTaskGetStackHighWaterMark(NULL), ESP.getFreeHeap());
 }
 
 // Undervoltage detection for shutdown display
@@ -274,18 +275,18 @@ void underVoltageError(CommonData &common) {
     setFlashLED(false);                     // Flash LED Off
     buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
     // Shutdown EInk display
-    getdisplay().setFullWindow();           // Set full Refresh
+    epd->setFullWindow();           // Set full Refresh
-    //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+    //epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-    getdisplay().fillScreen(common.bgcolor);// Clear screen
+    epd->fillScreen(common.bgcolor);// Clear screen
-    getdisplay().setTextColor(common.fgcolor);
+    epd->setTextColor(common.fgcolor);
-    getdisplay().setFont(&Ubuntu_Bold20pt8b);
+    epd->setFont(&Ubuntu_Bold20pt8b);
-    getdisplay().setCursor(65, 150);
+    epd->setCursor(65, 150);
-    getdisplay().print("Undervoltage");
+    epd->print("Undervoltage");
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    epd->setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setCursor(65, 175);
+    epd->setCursor(65, 175);
-    getdisplay().print("Charge battery and restart system");
+    epd->print("Charge battery and restart system");
-    getdisplay().nextPage();                // Partial update
+    epd->nextPage();                // Partial update
-    getdisplay().powerOff();                // Display power off
+    epd->powerOff();                // Display power off
     setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
     setPortPin(OBP_POWER_SD, false);        // Power off SD card
 #else
@@ -295,17 +296,17 @@ void underVoltageError(CommonData &common) {
     buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
     setPortPin(OBP_POWER_50, false);        // Power rail 5.0V Off
     // Shutdown EInk display
-    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-    getdisplay().fillScreen(common.bgcolor);// Clear screen
+    epd->fillScreen(common.bgcolor);// Clear screen
-    getdisplay().setTextColor(common.fgcolor);
+    epd->setTextColor(common.fgcolor);
-    getdisplay().setFont(&Ubuntu_Bold20pt8b);
+    epd->setFont(&Ubuntu_Bold20pt8b);
-    getdisplay().setCursor(65, 150);
+    epd->setCursor(65, 150);
-    getdisplay().print("Undervoltage");
+    epd->print("Undervoltage");
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    epd->setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setCursor(65, 175);
+    epd->setCursor(65, 175);
-    getdisplay().print("To wake up repower system");
+    epd->print("To wake up repower system");
-    getdisplay().nextPage();                // Partial update
+    epd->nextPage();                // Partial update
-    getdisplay().powerOff();                // Display power off
+    epd->powerOff();                // Display power off
 #endif
     while (true) {
         esp_deep_sleep_start(); // Deep Sleep without wakeup. Wakeup only after power cycle (restart).
@@ -315,10 +316,10 @@ void underVoltageError(CommonData &common) {
 inline bool underVoltageDetection(float voffset, float vslope) {
     // Read supply voltage
 #if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
-    float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.53) * 2;   // Vin = 1/2 for OBP40
+    float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.53) * 2; // Vin = 1/2 for OBP40
     float minVoltage = 3.65;  // Absolut minimum volatge for 3,7V LiPo accu
 #else
-    float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20;   // Vin = 1/20 for OBP60
+    float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20; // Vin = 1/20 for OBP60
     float minVoltage = MIN_VOLTAGE;
 #endif
     float calVoltage = actVoltage * vslope + voffset;  // Calibration
@@ -330,16 +331,17 @@ inline bool underVoltageDetection(float voffset, float vslope) {
 void OBP60Task(GwApi *api){
 //    vTaskDelete(NULL);
 //    return;
-    GwLog *logger=api->getLogger();
+    GwLog *logger = api->getLogger();
-    GwConfigHandler *config=api->getConfig();
+    GwConfigHandler *config = api->getConfig();
 #ifdef HARDWARE_V21
     startLedTask(api);
 #endif
     PageList allPages;
-    registerAllPages(allPages);
+    registerAllPages(logger, allPages);
     CommonData commonData;
-    commonData.logger=logger;
+    commonData.logger = logger;
-    commonData.config=config;
+    commonData.config = config;
+    commonData.fmt = new Formatter(config);
 
 #ifdef HARDWARE_V21
     // Keyboard coordinates for page footer
@@ -354,8 +356,8 @@ void OBP60Task(GwApi *api){
     }
 
     // Init E-Ink display
-    String displaymode = api->getConfig()->getConfigItem(api->getConfig()->display,true)->asString();
+    String displaymode = config->getConfigItem(config->display,true)->asString();
-    String displaycolor = api->getConfig()->getConfigItem(api->getConfig()->displaycolor,true)->asString();
+    String displaycolor = config->getConfigItem(config->displaycolor,true)->asString();
     if (displaycolor == "Normal") {
         commonData.fgcolor = GxEPD_BLACK;
         commonData.bgcolor = GxEPD_WHITE;
@@ -364,47 +366,48 @@ void OBP60Task(GwApi *api){
         commonData.fgcolor = GxEPD_WHITE;
         commonData.bgcolor = GxEPD_BLACK;
     }
-    String systemname = api->getConfig()->getConfigItem(api->getConfig()->systemName,true)->asString();
+    String systemname = config->getConfigItem(config->systemName, true)->asString();
-    String wifipass = api->getConfig()->getConfigItem(api->getConfig()->apPassword,true)->asString();
+    String wifipass = config->getConfigItem(config->apPassword, true)->asString();
-    bool refreshmode = api->getConfig()->getConfigItem(api->getConfig()->refresh,true)->asBoolean();
+    bool refreshmode = config->getConfigItem(config->refresh, true)->asBoolean();
-    String fastrefresh = api->getConfig()->getConfigItem(api->getConfig()->fastRefresh,true)->asString();
+    bool symbolmode = (config->getString(config->headerFormat) == "ICON");
-    uint fullrefreshtime = uint(api->getConfig()->getConfigItem(api->getConfig()->fullRefreshTime,true)->asInt());
+    String fastrefresh = config->getConfigItem(config->fastRefresh, true)->asString();
-    #ifdef BOARD_OBP40S3
+    uint fullrefreshtime = uint(config->getConfigItem(config->fullRefreshTime, true)->asInt());
+#ifdef BOARD_OBP40S3
     bool syspage_enabled = config->getBool(config->systemPage);
-    #endif
+#endif
 
-    #ifdef DISPLAY_GDEY042T81
+#ifdef DISPLAY_GDEY042T81
-        getdisplay().init(115200, true, 2, false);  // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+        epd->init(115200, true, 2, false);  // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
-    #else
+#else
-        getdisplay().init(115200);                  // Init for normal displays
+        epd->init(115200);                  // Init for normal displays
-    #endif
+#endif
 
-    getdisplay().setRotation(0);                 // Set display orientation (horizontal)
+    epd->setRotation(0);                 // Set display orientation (horizontal)
-    getdisplay().setFullWindow();                // Set full Refresh
+    epd->setFullWindow();                // Set full Refresh
-    getdisplay().firstPage();                    // set first page
+    epd->firstPage();                    // set first page
-    getdisplay().fillScreen(commonData.bgcolor);
+    epd->fillScreen(commonData.bgcolor);
-    getdisplay().setTextColor(commonData.fgcolor);
+    epd->setTextColor(commonData.fgcolor);
-    getdisplay().nextPage();                     // Full Refresh
+    epd->nextPage();                     // Full Refresh
-    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-    getdisplay().fillScreen(commonData.bgcolor);
+    epd->fillScreen(commonData.bgcolor);
-    getdisplay().nextPage();                     // Fast Refresh
+    epd->nextPage();                     // Fast Refresh
-    getdisplay().nextPage();                     // Fast Refresh
+    epd->nextPage();                     // Fast Refresh
     if(String(displaymode) == "Logo + QR Code" || String(displaymode) == "Logo"){
-        getdisplay().fillScreen(commonData.bgcolor);
+        epd->fillScreen(commonData.bgcolor);
-        getdisplay().drawBitmap(0, 0, gImage_Logo_OBP_400x300_sw, getdisplay().width(), getdisplay().height(), commonData.fgcolor); // Draw start logo
+        epd->drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData.fgcolor);
-        getdisplay().nextPage();                 // Fast Refresh
+        epd->nextPage();                 // Fast Refresh
-        getdisplay().nextPage();                 // Fast Refresh
+        epd->nextPage();                 // Fast Refresh
         delay(SHOW_TIME);                        // Logo show time
         if(String(displaymode) == "Logo + QR Code"){
-            getdisplay().fillScreen(commonData.bgcolor);
+            epd->fillScreen(commonData.bgcolor);
             qrWiFi(systemname, wifipass, commonData.fgcolor, commonData.bgcolor);  // Show QR code for WiFi connection
-            getdisplay().nextPage();             // Fast Refresh
+            epd->nextPage();             // Fast Refresh
-            getdisplay().nextPage();             // Fast Refresh
+            epd->nextPage();             // Fast Refresh
             delay(SHOW_TIME);                    // QR code show time
         }
-        getdisplay().fillScreen(commonData.bgcolor);
+        epd->fillScreen(commonData.bgcolor);
-        getdisplay().nextPage();                 // Fast Refresh
+        epd->nextPage();                 // Fast Refresh
-        getdisplay().nextPage();                 // Fast Refresh
+        epd->nextPage();                 // Fast Refresh
     }
     
     // Init pages
@@ -432,7 +435,7 @@ void OBP60Task(GwApi *api){
 #endif
     LOG_DEBUG(GwLog::LOG,"...done");
 
-    int lastPage=-1; // initialize with an impiossible value, so we can detect wether we are during startup and no page has been displayed yet
+    int lastPage=-1; // initialize with an impossible value, so we can detect wether we are during startup and no page has been displayed yet
 
     BoatValueList boatValues; //all the boat values for the api query
     HstryBuffers hstryBufferList(1920, &boatValues, logger);  // Create empty list of boat data history buffers (1.920 values = seconds = 32 min.)
@@ -505,46 +508,46 @@ void OBP60Task(GwApi *api){
         doImageRequest(api, &pageNumber, pages, request);
     });
 
-    //now we have prepared the page data
+    // now we have prepared the page data
-    //we start a separate task that will fetch our keys...
+    // we start a separate task that will fetch our keys...
-    MyData allParameters;
+    KbTaskData kbparams;
-    allParameters.logger=api->getLogger();
+    kbparams.logger = api->getLogger();
-    allParameters.page0=3;
+    kbparams.queue = xQueueCreate(10, sizeof(int));
-    allParameters.queue=xQueueCreate(10,sizeof(int));
+    kbparams.sensitivity = api->getConfig()->getInt(GwConfigDefinitions::tSensitivity);
-    allParameters.sensitivity= api->getConfig()->getInt(GwConfigDefinitions::tSensitivity);
+#ifdef BOARD_OBP40S3
-    #ifdef BOARD_OBP40S3
+    kbparams.use_syspage = syspage_enabled;
-    allParameters.use_syspage = syspage_enabled;
+#endif
-    #endif
+    createKeyboardTask(&kbparams);
-    xTaskCreate(keyboardTask,"keyboard",2000,&allParameters,configMAX_PRIORITIES-1,NULL);
+    // we start a separate task to collect sensor data
-    SharedData *shared=new SharedData(api);
+    SharedData *shared = new SharedData(api);
     createSensorTask(shared);
 
     // Task Loop
     //####################################################################################
 
     // Configuration values for main loop
-    String gpsFix = api->getConfig()->getConfigItem(api->getConfig()->flashLED,true)->asString();
+    String gpsFix = config->getConfigItem(config->flashLED,true)->asString();
-    String gpsOn=api->getConfig()->getConfigItem(api->getConfig()->useGPS,true)->asString();
+    String gpsOn = config->getConfigItem(config->useGPS,true)->asString();
-    float tz = api->getConfig()->getConfigItem(api->getConfig()->timeZone,true)->asFloat();
+    float tz = config->getConfigItem(config->timeZone,true)->asFloat();
 
-    commonData.backlight.mode = backlightMapping(config->getConfigItem(config->backlight,true)->asString());
+    commonData.backlight.mode = backlightMapping(config->getConfigItem(config->backlight, true)->asString());
-    commonData.backlight.color = colorMapping(config->getConfigItem(config->blColor,true)->asString());
+    commonData.backlight.color = colorMapping(config->getConfigItem(config->blColor, true)->asString());
-    commonData.backlight.brightness = uint(config->getConfigItem(config->blBrightness,true)->asInt());
+    commonData.backlight.brightness = 2.55 * uint(config->getConfigItem(config->blBrightness, true)->asInt());
-    commonData.powermode = api->getConfig()->getConfigItem(api->getConfig()->powerMode,true)->asString();
+    commonData.powermode = api->getConfig()->getConfigItem(api->getConfig()->powerMode, true)->asString();
 
     bool uvoltage = config->getConfigItem(config->underVoltage, true)->asBoolean();
     float voffset = (config->getConfigItem(config->vOffset,true)->asString()).toFloat();
     float vslope = (config->getConfigItem(config->vSlope,true)->asString()).toFloat();
-    String cpuspeed = api->getConfig()->getConfigItem(api->getConfig()->cpuSpeed,true)->asString();
+    String cpuspeed = config->getConfigItem(config->cpuSpeed, true)->asString();
-    uint hdopAccuracy = uint(api->getConfig()->getConfigItem(api->getConfig()->hdopAccuracy,true)->asInt());
+    uint hdopAccuracy = uint(config->getConfigItem(config->hdopAccuracy, true)->asInt());
 
-    double homelat = commonData.config->getString(commonData.config->homeLAT).toDouble();
+    double homelat = config->getString(config->homeLAT).toDouble();
-    double homelon = commonData.config->getString(commonData.config->homeLON).toDouble();
+    double homelon = config->getString(config->homeLON).toDouble();
     bool homevalid = homelat >= -180.0 and homelat <= 180 and homelon >= -90.0 and homelon <= 90.0;
     if (homevalid) {
-        LOG_DEBUG(GwLog::LOG, "Home location set to lat=%f, lon=%f", homelat, homelon);
+        logger->logDebug(GwLog::LOG, "Home location set to lat=%f, lon=%f", homelat, homelon);
     } else {
-        LOG_DEBUG(GwLog::LOG, "No valid home location found");
+        logger->logDebug(GwLog::LOG, "No valid home location found");
     }
 
     // refreshmode defined in init section
@@ -572,6 +575,8 @@ void OBP60Task(GwApi *api){
 
     pages[pageNumber].page->setupKeys(); // Initialize keys for first page
 
+    // listTasks(logger);
+
     // Main loop runs with 100ms
     //####################################################################################
 
@@ -623,7 +628,7 @@ void OBP60Task(GwApi *api){
          
             // Check the keyboard message
             int keyboardMessage=0;
-            while (xQueueReceive(allParameters.queue,&keyboardMessage,0)){
+            while (xQueueReceive(kbparams.queue,&keyboardMessage, 0)) {
                 LOG_DEBUG(GwLog::LOG,"new key from keyboard %d",keyboardMessage);
                 keypressed = true;
 
@@ -656,15 +661,17 @@ void OBP60Task(GwApi *api){
                     // if(String(backlight) == "Control by Key"){
                         if(keyboardMessage == 6){
                             LOG_DEBUG(GwLog::LOG,"Toggle Backlight LED");
+                            // TODO config: toogle vs steps
+                            // toggleBacklightLED(commonData.backlight.brightness, commonData.backlight.color);
                             stepsBacklightLED(commonData.backlight.brightness, commonData.backlight.color);
                         }
                     }
-                    #ifdef BOARD_OBP40S3
+#ifdef BOARD_OBP40S3
                     // #3 Deep sleep mode for OBP40
                     if ((keyboardMessage == 3) and !syspage_enabled){
                         deepSleep(commonData);
                     }
-                    #endif
+#endif
                     // #9 Swipe right or #4 key right
                     if ((keyboardMessage == 9) or (keyboardMessage == 4))
                     {
@@ -719,27 +726,26 @@ void OBP60Task(GwApi *api){
             }
             
             // Full display update afer a new selected page and 8s wait time
-            if(millis() > starttime4 + 8000 && delayedDisplayUpdate == true){
+            if (millis() > starttime4 + 8000 && delayedDisplayUpdate == true) {
                 starttime1 = millis();
                 starttime2 = millis();
-                getdisplay().setFullWindow();    // Set full update
+                epd->setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    getdisplay().nextPage();                     // Full update
+                    epd->nextPage();                     // Full update
                 }
                 else{
-                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
+                    epd->fillScreen(commonData.fgcolor); // Clear display
-                    #ifdef DISPLAY_GDEY042T81
+#ifdef DISPLAY_GDEY042T81
-                        getdisplay().hibernate();                  // Set display in hybenate mode
+                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
-                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+#else
-                    #else
+                        epd->init(115200);               // Init for normal displays
-                        getdisplay().init(115200);               // Init for normal displays
+#endif
-                    #endif
+                    epd->firstPage();                    // Full update
-                    getdisplay().firstPage();                    // Full update
+                    epd->nextPage();                     // Full update
-                    getdisplay().nextPage();                     // Full update
+//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+//                    epd->fillScreen(commonData.bgcolor); // Clear display
-//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
+//                    epd->nextPage();                     // Partial update
-//                    getdisplay().nextPage();                     // Partial update
+//                    epd->nextPage();                     // Partial update
-//                    getdisplay().nextPage();                     // Partial update
                 }
                 delayedDisplayUpdate = false;
             }
@@ -750,24 +756,23 @@ void OBP60Task(GwApi *api){
                 starttime1 = millis();
                 starttime2 = millis();
                 LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh first 5 min");
-                getdisplay().setFullWindow();    // Set full update
+                epd->setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    getdisplay().nextPage();                     // Full update
+                    epd->nextPage();                     // Full update
                 }
                 else{
-                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
+                    epd->fillScreen(commonData.fgcolor); // Clear display
-                    #ifdef DISPLAY_GDEY042T81
+#ifdef DISPLAY_GDEY042T81
-                        getdisplay().hibernate();                  // Set display in hybenate mode
+                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
-                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+#else
-                    #else
+                        epd->init(115200);               // Init for normal displays
-                        getdisplay().init(115200);               // Init for normal displays
+#endif
-                    #endif
+                    epd->firstPage();                    // Full update
-                    getdisplay().firstPage();                    // Full update
+                    epd->nextPage();                     // Full update
-                    getdisplay().nextPage();                     // Full update
+//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+//                    epd->fillScreen(commonData.bgcolor); // Clear display
-//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
+//                    epd->nextPage();                     // Partial update
-//                    getdisplay().nextPage();                     // Partial update
+//                    epd->nextPage();                     // Partial update
-//                    getdisplay().nextPage();                     // Partial update
                 }
             }
 
@@ -775,24 +780,23 @@ void OBP60Task(GwApi *api){
             if(millis() > starttime2 + fullrefreshtime * 60 * 1000){
                 starttime2 = millis();
                 LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh");
-                getdisplay().setFullWindow();    // Set full update
+                epd->setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    getdisplay().nextPage();                     // Full update
+                    epd->nextPage();                     // Full update
                 }
                 else{
-                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
+                    epd->fillScreen(commonData.fgcolor); // Clear display
-                    #ifdef DISPLAY_GDEY042T81
+#ifdef DISPLAY_GDEY042T81
-                        getdisplay().hibernate();                  // Set display in hybenate mode
+                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
-                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+#else
-                    #else
+                        epd->init(115200);               // Init for normal displays
-                        getdisplay().init(115200);               // Init for normal displays
+#endif
-                    #endif
+                    epd->firstPage();                    // Full update
-                    getdisplay().firstPage();                    // Full update
+                    epd->nextPage();                     // Full update
-                    getdisplay().nextPage();                     // Full update
+//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+//                    epd->fillScreen(commonData.bgcolor); // Clear display
-//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
+//                    epd->nextPage();                     // Partial update
-//                    getdisplay().nextPage();                     // Partial update
+//                    epd->nextPage();                     // Partial update
-//                    getdisplay().nextPage();                     // Partial update
                 }
             }        
                 
@@ -818,13 +822,13 @@ void OBP60Task(GwApi *api){
                 hstryBufferList.handleHstryBufs(useSimuData, commonData); // Handle history buffers for certain boat data for windplot page and other usage
 
                 // Clear display
-                // getdisplay().fillRect(0, 0, getdisplay().width(), getdisplay().height(), commonData.bgcolor);
+                // epd->fillRect(0, 0, epd->width(), epd->height(), commonData.bgcolor);
-                getdisplay().fillScreen(commonData.bgcolor);  // Clear display
+                epd->fillScreen(commonData.bgcolor);  // Clear display
 
                 // Show header if enabled
                 if (pages[pageNumber].description && pages[pageNumber].description->header or systemPage){
                     // build header using commonData
-                    displayHeader(commonData, date, time, hdop);  // Show page header
+                    displayHeader(commonData, symbolmode, date, time, hdop);  // Show page header
                 }
 
                 // Call the particular page
@@ -842,20 +846,20 @@ void OBP60Task(GwApi *api){
                     if (currentPage == NULL){
                         LOG_DEBUG(GwLog::ERROR,"page number %d not found", pageNumber);
                         // Error handling for missing page
-                        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+                        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-                        getdisplay().fillScreen(commonData.bgcolor);  // Clear display
+                        epd->fillScreen(commonData.bgcolor);  // Clear display
-                        getdisplay().drawXBitmap(200 - unknown_width / 2, 150 - unknown_height / 2, unknown_bits, unknown_width, unknown_height, commonData.fgcolor);
+                        epd->drawXBitmap(200 - unknown_width / 2, 150 - unknown_height / 2, unknown_bits, unknown_width, unknown_height, commonData.fgcolor);
-                        getdisplay().setCursor(140, 250);
+                        epd->setCursor(140, 250);
-                        getdisplay().setFont(&Atari16px);
+                        epd->setFont(&Atari16px);
-                        getdisplay().print("Here be dragons!");
+                        epd->print("Here be dragons!");
-                        getdisplay().nextPage(); // Partial update (fast)
+                        epd->nextPage(); // Partial update (fast)
                     }
-                    else{
+                    else {
-                        if (lastPage != pageNumber){
+                        if (lastPage != pageNumber) {
-			    if (lastPage != -1){ // skip cleanup if we are during startup, and no page has been displayed yet. 
+                            if (lastPage != -1) { // skip cleanup if we are during startup, and no page has been displayed yet
                                 pages[lastPage].page->leavePage(pages[lastPage].parameters); // call page cleanup code
                                 if (hasFRAM) fram.write(FRAM_PAGE_NO, pageNumber); // remember new page for device restart
-			    }
+                            }
                             currentPage->setupKeys();
                             currentPage->displayNew(pages[pageNumber].parameters);
                             lastPage = pageNumber;
@@ -871,10 +875,10 @@ void OBP60Task(GwApi *api){
                             displayAlarm(commonData);
                         }
                         if (ret & PAGE_UPDATE) {
-                            getdisplay().nextPage(); // Partial update (fast)
+                            epd->nextPage(); // Partial update (fast)
                         }
                         if (ret & PAGE_HIBERNATE) {
-                            getdisplay().hibernate();
+                            epd->hibernate();
                         }
                     }
 

lib/obp60task/obp60task.h

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 #include "GwApi.h"
 //we only compile for some boards

lib/obp60task/platformio.ini

@@ -8,7 +8,6 @@ default_envs =
     obp40_s3
 
 [env:obp60_s3]
-platform = espressif32@6.8.1
 board_build.variants_dir = variants
 #board = obp60_s3_n8     #ESP32-S3 N8, 8MB flash, no PSRAM
 #board = obp60_s3_n16    #ESP32-S3 N16,16MB flash, no PSRAM, zero series
@@ -16,6 +15,9 @@ board_build.variants_dir = variants
 board = obp60_s3_n16r8  #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
 #board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
 board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
+custom_config = lib/obp60task/config_obp60.json
+custom_script = lib/obp60task/extra_task.py
+board_name = OBP60
 framework = arduino
 lib_deps = 
     ${basedeps.lib_deps}
@@ -24,14 +26,11 @@ lib_deps =
     ESP32time
     HTTPClient
     WiFiClientSecure
-    esphome/AsyncTCP-esphome@2.0.1
     robtillaart/PCF8574@0.3.9
     adafruit/Adafruit Unified Sensor @ 1.1.13
     blemasle/MCP23017@2.0.0
     adafruit/Adafruit BusIO@1.5.0
     adafruit/Adafruit GFX Library@1.11.9
-    #zinggjm/GxEPD2@1.5.8
-    #https://github.com/ZinggJM/GxEPD2
     https://github.com/thooge/GxEPD2
     sstaub/Ticker@4.4.0
     adafruit/Adafruit BMP280 Library@2.6.2
@@ -64,28 +63,25 @@ upload_speed = 230400
 monitor_speed = 115200
 
 [env:obp40_s3]
-platform = espressif32@6.8.1
 board_build.variants_dir = variants
 board = obp40_s3_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone (CrowPanel 4.2)
 board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
-custom_config = config_obp40.json
+custom_config = lib/obp60task/config_obp40.json
+custom_script = lib/obp60task/extra_task.py
+board_name = OBP40
 framework = arduino
 lib_deps =
     ${basedeps.lib_deps}
     Wire
     SPI
-    SD
     ESP32time
     HTTPClient
     WiFiClientSecure
-    esphome/AsyncTCP-esphome@2.0.1
     robtillaart/PCF8574@0.3.9
     adafruit/Adafruit Unified Sensor @ 1.1.13
     blemasle/MCP23017@2.0.0
     adafruit/Adafruit BusIO@1.5.0
     adafruit/Adafruit GFX Library@1.11.9
-    #zinggjm/GxEPD2@1.5.8
-    #https://github.com/ZinggJM/GxEPD2
     https://github.com/thooge/GxEPD2
     sstaub/Ticker@4.4.0
     adafruit/Adafruit BMP280 Library@2.6.2
@@ -103,8 +99,8 @@ build_flags=
     -D HARDWARE_V10                 #OBP40 hardware revision V1.0 SKU:DIE07300S V1.1 (CrowPanel 4.2)
     -D DISPLAY_GDEY042T81           #new E-Ink display from Good Display (Waveshare), R10 2.2 ohm - good (contast lost by shunshine)
     #-D DISPLAY_ZJY400300-042CAAMFGN #alternativ E-Ink display from ZZE Technology, R10 2.2 ohm - very good   
-    -D LIPO_ACCU_1200               #Hardware extension, LiPo accu 3,7V 1200mAh
+#   -D LIPO_ACCU_1200               #Hardware extension, LiPo accu 3,7V 1200mAh
-    -D VOLTAGE_SENSOR               #Hardware extension, LiPo voltage sensor with two resistors
+#   -D VOLTAGE_SENSOR               #Hardware extension, LiPo voltage sensor with two resistors
     ${env.build_flags}
 upload_port = /dev/ttyUSB0          #OBP40 download via external USB/Serail converter
 upload_protocol = esptool           #firmware upload via USB OTG seriell, by first upload need to set the ESP32-S3 in the upload mode with shortcut GND to Pin27

lib/obp60task/run_install_tools

@@ -8,6 +8,6 @@
 
 # Install tools
 echo "Installing tools"
-cd /workspace/esp32-nmea2000
+cd /workspaces/esp32-nmea2000
 pip3 install -U esptool
 pip3 install  platformio

lib/obp60task/utils/auto_version.py

@@ -0,0 +1,17 @@
+import subprocess
+
+# Import("env")
+
+def get_firmware_specifier_build_flag():    
+    #ret = subprocess.run(["git", "describe"], stdout=subprocess.PIPE, text=True) #Uses only annotated tags
+    ret = subprocess.run(["git", "describe", "--tags"], stdout=subprocess.PIPE, text=True) #Uses any tags
+    build_version = ret.stdout.strip()
+    build_flag = "-D AUTO_VERSION=\\\"" + build_version + "\\\""
+    print ("Firmware Revision: " + build_version)
+    return (build_flag)
+
+#env.Append(
+#    BUILD_FLAGS=[get_firmware_specifier_build_flag()]
+#)
+
+get_firmware_specifier_build_flag()

lib/obp60task/utils/make_json.py

@@ -0,0 +1,172 @@
+#!/usr/bin/python
+
+"""
+Convert config file to JSON 
+
+The JSON contains array of single fields. There is no hierarchy.
+Fields are being grouped in GUI with "category".
+A group is shown if a minimum of one field is visible.
+
+Hints
+  capabilities is a dictionary 
+    field:[true | false]
+    optional comma separated multiple values
+
+"""
+
+import os
+import sys
+import getopt
+import configparser
+from io import StringIO
+from pyparsing import alphas, alphanums, Word, Literal, Combine, Group, Forward, ZeroOrMore, delimitedList
+
+__author__ = "Thomas Hooge"
+__copyright__ = "Copyleft 2025, all rights reversed"
+__version__ = "0.1"
+__email__ = "thomas@hoogi.de"
+__status__ = "Development"
+
+infile = None
+outfile = ""
+force = False # overwrite outfile
+
+# Variables for condition parsing
+fieldname = Combine(Word(alphas, exact=1) + Word(alphanums, max=15))
+fieldvalue = Word(alphanums, max=16)
+equals = Literal("=")
+in_op = Literal("IN")
+and_op = Literal("AND")
+or_op = Literal("OR")
+comparison = Group(fieldname + equals + fieldvalue) \
+           | Group(fieldname + in_op + delimitedList(fieldvalue))
+expr = Forward()
+expr <<= comparison + ZeroOrMore((and_op | or_op) + comparison)
+
+def parse_condition(condition):
+    try:
+        result = expr.parseString(condition, parseAll=True)
+    except Exception as e:
+        return ""
+    out = StringIO()
+    andlist = []
+    for token in result:
+        # list: field = value or field IN value [, value ...]
+        # str: AND, OR
+        # combine ANDs and output reaching OR
+        if type(token) == str:
+            if token == "OR":
+                andstr = ",\n".join(andlist)
+                out.write(f'\t\t{{ {andstr} }},\n')
+                andlist = []
+        else:
+            if token[1] == '=':
+                andlist.append(f'"{token[0]}": "{token[2]}"')
+            elif token[1] == 'IN':
+                n = len(token) - 2
+                if n == 1:
+                    # no list, write single value
+                    andlist.append(f'"{token[0]}": "{token[2]}"') 
+                else:
+                    # write list
+                    inlist = '", "'.join(token[2:])
+                    andlist.append(f'"{token[0]}": [ "{inlist}" ]\n')
+                
+    if len(andlist) > 0:
+        out.write("\t\t{{ {} }}".format(", ".join(andlist)))
+    return out.getvalue()
+
+def create_flist():
+    flist = []
+    for field in config.sections():
+        properties = [f'\t"name": "{field}"']
+        for prop, val in config.items(field):
+            if prop in ["label", "type", "default", "description", "category", "check"]:
+                properties.append(f'\t"{prop}": "{val}"')
+            elif prop == "capabilities":
+                # multiple values possible
+                capas = []
+                for capa in val.split(','):
+                    k, v = capa.split(':')
+                    capas.append(f'"{k.strip()}":"{v.strip()}"')
+                capalist = ','.join(capas)
+                properties.append(f'\t"{prop}": {{{capalist}}}')
+            elif prop in ("min", "max"):
+                properties.append(f'\t"{prop}": {val}')
+            elif prop == "list":
+                entries = '", "'.join([x.strip() for x in val.split(',')])
+                properties.append(f'\t"list": ["{entries}"]')
+            elif prop == "dict":
+                d = {}
+                for l in val.splitlines():
+                    if len(l) < 3:
+                        continue
+                    k, v = l.split(':')
+                    d[k.strip()] = v.strip()
+                lines = []
+                for k,v in d.items():
+                    lines.append(f'\t\t{{"l":"{v}","v":"{k}"}}')
+                entries = ",\n".join(lines)
+                properties.append(f'\t"list": [\n{entries}\n\t]')
+            elif prop == "condition":
+                jsoncond = parse_condition(val)
+                properties.append(f'\t"{prop}": [\n{jsoncond}\n\t]\n')
+            else:
+                pass # ignore unknown stuff
+        fieldprops = ",\n".join(properties)
+        flist.append(f'{{\n{fieldprops}\n}}')
+    return flist
+
+def usage():
+    print("{} v{}".format(os.path.basename(__file__), __version__))
+    print(__copyright__)
+    print()
+    print("Command line options")
+    print(" -c --config     config file name to use")
+    print(" -j --json       json file name to generate")
+    print(" -f              force overwrite of existing json file")
+    print(" -h              show this help")
+    print()
+
+if __name__ == '__main__': 
+    try:
+        options, remainder = getopt.getopt(sys.argv[1:], 'c:j:fh', ['config=', 'json='])
+    except getopt.GetoptError as e:
+        print(e)
+        sys.exit(1)
+    filename = None
+    for opt, arg in options:
+        if opt in ('-c', '--config'):
+            infile = arg
+        elif opt in ('-j', '--json'):
+            outfile = arg
+        elif opt == '-h':
+            usage()
+            sys.exit(0)
+        elif opt == '-f':
+            force = True
+    if not infile:
+        print("Error: config filename missing")
+        sys.exit(1)
+    if not os.path.isfile(infile):
+        print(f"Error: configuration file '{filename} not found'")
+        sys.exit(1)
+    if os.path.isfile(outfile) and not force:
+        print(f"Error: json file '{outfile}' already exists")
+        sys.exit(1)
+
+    config = configparser.ConfigParser()
+    ret = config.read(infile)
+    if len(ret) == 0:
+        print(f"ERROR: Config file '{infile}' not found")
+        sys.exit(1)
+
+    flist = create_flist()
+    out = "[\n{}\n]\n".format(",\n".join(flist))
+    if not outfile:
+        # print to console
+        print(out)
+    else:
+        # write to file
+        with open(outfile, "w") as fh:
+            fh.write(out)

lib/obp60task/utils/xbmconvert.py

@@ -0,0 +1,61 @@
+#!/usr/bin/python
+# 
+# Convert a Gimp-created XBM file to bitmap useable by drawBitmap()
+#
+
+import os
+import sys
+import re
+from PIL import Image
+
+if len(sys.argv) < 2:
+    print("Usage: xbmconvert.py <filename>")
+    sys.exit(1)
+
+xbmfilename = sys.argv[1]
+if not os.path.isfile(xbmfilename):
+    print(f"The file '{xbmfilename}' does not exists.")
+    sys.exit(1)
+
+im = Image.open(xbmfilename)
+imname = "image"
+with open(xbmfilename, 'r') as fh:
+    pattern = r'static\s+unsigned\s+char\s+(\w+)_bits$$$$'
+    for line in fh:
+        match = re.search(pattern, line)
+        if match:
+            imname = match.group(1) 
+            break
+bytecount = int(im.width * im.height / 8)
+
+print(f"#ifndef _{imname.upper()}_H_")
+print(f"#define _{imname.upper()}_H_ 1\n")
+print(f"#define {imname}_width {im.width}")
+print(f"#define {imname}_height {im.height}")
+print(f"const unsigned char {imname}_bits[{bytecount}] PROGMEM = {{")
+
+n = 0
+print("   ", end='')
+f = im.tobytes()
+
+switched_bytes = bytearray()
+for i in range(0, len(f), 2):
+    # Switch LSB and MSB
+    switched_bytes.append(f[i + 1])  # Append MSB
+    switched_bytes.append(f[i])      # Append LSB
+ 
+#for b in im.tobytes():
+for b in switched_bytes:
+    #b2 = 0
+    #for i in range(8):
+    #    # b2 |= ((b >> i) & 1) << (7 - i)
+    #    b2 <<= 1
+    #    b2 |= b & 1
+    #    b >>= 1
+    n += 1
+    print(f"0x{b:02x}", end='')
+    if n < bytecount:
+        print(', ', end='')
+    if n % 12 == 0:
+      print("\n   ", end='')
+print("};\n\n#endif")

lib/sensors/GwSensor.cpp

@@ -17,4 +17,4 @@
 
 void SensorList::add(SensorBase::Ptr sensor){
         this->push_back(sensor);
-    }
+    }