Work on tracker configuration page

History Buffer + Wind Calculation CleanUp

.gitignore

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

extra_script.py

@@ -205,11 +205,6 @@ def generateCfg(inFile,outFile,impl):
                 secret="false";
                 if item.get('type') == 'password':
                     secret="true"
-                """
-                PSRAM Allocator TODO Tests
-                new (heap_caps_malloc(sizeof(GwConfigInterface), MALLOC_CAP_SPIRAM))
-                """
-                #data+="     new (heap_caps_malloc(sizeof(GwConfigInterface), MALLOC_CAP_SPIRAM)) GwConfigInterface(%s,\"%s\",%s);\n"%(name,item.get('default'),secret)
                 data+="     new GwConfigInterface(%s,\"%s\",%s);\n"%(name,item.get('default'),secret)
             data+='}\n'  
     writeFileIfChanged(outFile,data)    
@@ -506,12 +501,10 @@ def prebuild(env):
     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{}{}".format(datetime.now().strftime("%Y%m%d"), "-ext")
+    version="dev"+datetime.now().strftime("%Y%m%d")
     env.Append(CPPDEFINES=[('GWDEVVERSION',version)])
 
 def cleangenerated(source, target, env):
-    # TODO source / target order?
-    print("CLEAN: {} - {}".format(source, target))
     od=outPath()
     if os.path.isdir(od):
         print("#cleaning up %s"%od)
@@ -521,6 +514,7 @@ def cleangenerated(source, target, env):
             fn=os.path.join(od,f)
             os.unlink(f)
 
+
 print("#prescript...")
 prebuild(env)
 board="PLATFORM_BOARD_%s"%env["BOARD"].replace("-","_").upper()

extra_script.py.new

@@ -0,0 +1,542 @@
+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

@@ -0,0 +1,518 @@
+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,7 +2,6 @@
 #define _GWAPI_H
 #include "GwMessage.h"
 #include "N2kMsg.h"
-#include "Nmea2kTwai.h"
 #include "NMEA0183Msg.h"
 #include "GWConfig.h"
 #include "GwBoatData.h"
@@ -24,7 +23,6 @@ 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
@@ -224,7 +222,6 @@ 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 GwBoatData *getBoatData()=0;
         virtual ~GwApi(){}
 };

lib/boatData/GwBoatData.cpp

@@ -2,6 +2,11 @@
 #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
 {
@@ -10,9 +15,7 @@ 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
@@ -249,10 +252,6 @@ 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());
@@ -289,8 +288,6 @@ 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)
@@ -304,7 +301,6 @@ void GwSatInfoList::houseKeeping(unsigned long ts)
                    }),
                sats.end());
 }
-
 void GwSatInfoList::update(GwSatInfo entry, unsigned long validTill)
 {
     entry.validTill = validTill;
@@ -347,63 +343,6 @@ 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;
@@ -573,11 +512,6 @@ 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,13 +9,6 @@
 #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
@@ -65,7 +58,6 @@ class GwBoatItemBase{
         GWSC(formatRot);
         GWSC(formatDate);
         GWSC(formatTime);
-        GWSC(formatName);
     protected:
         int type;
         unsigned long lastSet=0;
@@ -100,7 +92,6 @@ 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);
@@ -129,17 +120,7 @@ template<class T> class GwBoatItem : public GwBoatItemBase{
             if (! isValid(millis())) return defaultv;
             return data;
         }
-        virtual double getDoubleValue(){
+        virtual double getDoubleValue(){return (double)data;}
-            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;}
@@ -196,55 +177,6 @@ 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:
@@ -303,9 +235,7 @@ 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/gwupdate/GwUpdate.cpp

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

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(200, contentType, found->start, found->len);
+      AsyncWebServerResponse *response=request->beginResponse_P(200,contentType,found->start,found->len);
       response->addHeader(F("Content-Encoding"), F("gzip"));
       request->send(response);
     }

lib/nmea0183ton2k/NMEA0183DataToN2K.cpp

@@ -355,7 +355,6 @@ 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/obp60task/BoatDataCalibration.cpp

@@ -38,7 +38,7 @@ void CalibrationDataList::readConfig(GwConfigHandler* config, GwLog* logger)
 
         instance = std::string(config->getString(calInstance, "---").c_str());
         if (instance == "---") {
-            logger->logDebug(GwLog::LOG, "no calibration data for instance no. %d", i + 1);
+            LOG_DEBUG(GwLog::LOG, "no calibration data for instance no. %d", i + 1);
             continue;
         }
         calibMap[instance] = { 0.0f, 1.0f, 1.0f, 0.0f, false };
@@ -101,10 +101,10 @@ void CalibrationDataList::readConfig(GwConfigHandler* config, GwLog* logger)
         calibMap[instance].slope = slope;
         calibMap[instance].smooth = smooth;
         calibMap[instance].isCalibrated = false;
-        logger->logDebug(GwLog::LOG, "calibration data: %s, offset: %f, slope: %f, smoothing: %f", instance.c_str(),
+        LOG_DEBUG(GwLog::LOG, "calibration data: %s, offset: %f, slope: %f, smoothing: %f", instance.c_str(),
             calibMap[instance].offset, calibMap[instance].slope, calibMap[instance].smooth);
     }
-    logger->logDebug(GwLog::LOG, "all calibration data read");
+    LOG_DEBUG(GwLog::LOG, "all calibration data read");
 }
 
 void CalibrationDataList::calibrateInstance(GwApi::BoatValue* boatDataValue, GwLog* logger)
@@ -117,7 +117,7 @@ void CalibrationDataList::calibrateInstance(GwApi::BoatValue* boatDataValue, GwL
     std::string format = "";
 
     if (calibMap.find(instance) == calibMap.end()) {
-        logger->logDebug(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;
     } else if (!boatDataValue->valid) { // no valid boat data value, so we don't want to apply calibration data
         calibMap[instance].isCalibrated = false;
@@ -127,7 +127,7 @@ void CalibrationDataList::calibrateInstance(GwApi::BoatValue* boatDataValue, GwL
         slope = calibMap[instance].slope;
         dataValue = boatDataValue->value;
         format = boatDataValue->getFormat().c_str();
-        logger->logDebug(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;
@@ -156,7 +156,7 @@ void CalibrationDataList::calibrateInstance(GwApi::BoatValue* boatDataValue, GwL
         calibrationData.smoothInstance(boatDataValue, logger); // smooth the boat data value
         calibMap[instance].value = boatDataValue->value; // store the calibrated + smoothed value in the list
 
-        logger->logDebug(GwLog::DEBUG, "BoatDataCalibration: %s: Offset: %f, Slope: %f, Result: %f", instance.c_str(), offset, slope, calibMap[instance].value);
+        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: Offset: %f, Slope: %f, Result: %f", instance.c_str(), offset, slope, calibMap[instance].value);
     }
 }
 
@@ -173,7 +173,7 @@ void CalibrationDataList::smoothInstance(GwApi::BoatValue* boatDataValue, GwLog*
     if (!boatDataValue->valid) { // no valid boat data value, so we don't want to smoothen value
         return;
     } else if (calibMap.find(instance) == calibMap.end()) {
-        logger->logDebug(GwLog::DEBUG, "BoatDataCalibration: smooth factor for %s not found in calibration list", instance.c_str());
+        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: smooth factor for %s not found in calibration list", instance.c_str());
         return;
     } else {
         smoothFactor = calibMap[instance].smooth;

lib/obp60task/BoatDataCalibration.h

@@ -3,6 +3,7 @@
 #ifndef _BOATDATACALIBRATION_H
 #define _BOATDATACALIBRATION_H
 
+// #include "Pagedata.h"
 #include "GwApi.h"
 #include <string>
 #include <unordered_map>

lib/obp60task/ConfigMenu.cpp

@@ -1,204 +0,0 @@
-/*
-  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

@@ -1,66 +0,0 @@
-#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

@@ -0,0 +1,6 @@
+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/LedSpiTask.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #include <FreeRTOS.h>
 #include "LedSpiTask.h"
 #include "GwHardware.h"
@@ -15,30 +14,6 @@ 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;
@@ -84,12 +59,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){
-        logger->logDebug(GwLog::ERROR, "unable to set gpio mode for %d: %d", pin, (int)err);
+        LOG_DEBUG(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){
-        logger->logDebug(GwLog::ERROR, "unable to set gpio level for %d: %d", pin, (int)err);
+        LOG_DEBUG(GwLog::ERROR,"unable to set gpio level for %d: %d",pin,(int)err);
         return false;
     }
     return true;
@@ -115,8 +90,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){
-        logger->logDebug(GwLog::ERROR, "unable to initialize SPI bus %d,mosi=%d, error=%d",
+        LOG_DEBUG(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 = {
@@ -134,16 +109,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){
-        logger->logDebug(GwLog::ERROR, "unable to add device to SPI bus %d,mosi=%d, error=%d",
+        LOG_DEBUG(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){
-        logger->logDebug(GwLog::ERROR,"unable to acquire SPI bus %d,mosi=%d, error=%d",
+        LOG_DEBUG(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;
@@ -173,7 +148,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)
         {
-            logger->logDebug(GwLog::ERROR, "unable to allocate %d bytes of DMA buffer", (int)bufferSize);
+            LOG_DEBUG(GwLog::ERROR, "unable to allocate %d bytes of DMA buffer", (int)bufferSize);
             return false;
         }
     }
@@ -194,12 +169,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)
     {
-        logger->logDebug(GwLog::ERROR, "unable to send led data: %d", (int)ret);
+        LOG_DEBUG(GwLog::ERROR, "unable to send led data: %d", (int)ret);
         rv = false;
     }
     else
     {
-        logger->logDebug(GwLog::DEBUG, "successfully send led data for %d leds, %lld us", numLeds, end - now);
+        LOG_DEBUG(GwLog::DEBUG, "successfully send led data for %d leds, %lld us", numLeds, end - now);
     }
     if (ownsBuffer)
     {
@@ -212,10 +187,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();
-    logger->logDebug(GwLog::ERROR, "spi led task initialized");
+    LOG_DEBUG(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;
@@ -234,15 +209,15 @@ void handleSpiLeds(void *param){
         LedInterface newLeds=taskData->getLedData();
         if (first || current.backlightChanged(newLeds) || current.flasChanged(newLeds)){
             first=false;
-            logger->logDebug(GwLog::ERROR, "handle SPI leds");
+            LOG_DEBUG(GwLog::ERROR,"handle SPI leds");
             if (current.backlightChanged(newLeds) || first){
-                logger->logDebug(GwLog::ERROR, "setting backlight r=%02d,g=%02d,b=%02d",
+                LOG_DEBUG(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){
-                logger->logDebug(GwLog::ERROR, "setting flashr=%02d,g=%02d,b=%02d",
+                LOG_DEBUG(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;
@@ -252,11 +227,6 @@ void handleSpiLeds(void *param){
     vTaskDelete(NULL);
 }
 
-void createSpiLedTask(LedTaskData *param) {
+void createSpiLedTask(LedTaskData *param){
-    TaskHandle_t xHandle = NULL;
+    xTaskCreate(handleSpiLeds,"handleLeds",4000,param,3,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,8 +22,6 @@ 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

@@ -0,0 +1,939 @@
+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

@@ -0,0 +1,939 @@
+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/OBP60Extensions.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include <Arduino.h>
@@ -25,7 +24,6 @@
 #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
 
 // E-Ink Display
 #define GxEPD_WIDTH 400     // Display width
@@ -34,20 +32,30 @@
 #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_Out(PCF8574_I2C_ADDR1); // First digital output modul PCF8574 from Horter
@@ -63,7 +71,6 @@ 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
@@ -82,7 +89,7 @@ void hardwareInit(GwApi *api)
 
     Wire.begin();
     // Init PCF8574 digital outputs
-    Wire.setClock(I2C_SPEED);       // Set I2C clock as defined
+    Wire.setClock(I2C_SPEED);       // Set I2C clock on 10 kHz
     if(pcf8574_Out.begin()){        // Initialize PCF8574
         pcf8574_Out.write8(255);    // Clear all outputs
     }
@@ -213,17 +220,17 @@ void deepSleep(CommonData &common){
     setFlashLED(false);                     // Flash LED Off
     buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
     // Shutdown EInk display
-    epd->setFullWindow();                   // Set full Refresh
+    getdisplay().setFullWindow();               // Set full Refresh
-    epd->fillScreen(common.bgcolor);        // Clear screen
+    getdisplay().fillScreen(common.bgcolor);    // Clear screen
-    epd->setTextColor(common.fgcolor);
+    getdisplay().setTextColor(common.fgcolor);
-    epd->setFont(&Ubuntu_Bold20pt8b);
+    getdisplay().setFont(&Ubuntu_Bold20pt8b);
-    epd->setCursor(85, 150);
+    getdisplay().setCursor(85, 150);
-    epd->print("Sleep Mode");
+    getdisplay().print("Sleep Mode");
-    epd->setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-    epd->setCursor(65, 175);
+    getdisplay().setCursor(65, 175);
-    epd->print("To wake up press key and wait 5s");
+    getdisplay().print("To wake up press key and wait 5s");
-    epd->nextPage();                        // Update display contents
+    getdisplay().nextPage();                // Update display contents
-    epd->powerOff();                        // Display power off
+    getdisplay().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
@@ -237,18 +244,18 @@ void deepSleep(CommonData &common){
     setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
     setFlashLED(false);                     // Flash LED Off
     // Shutdown EInk display
-    epd->setFullWindow();               // Set full Refresh
+    getdisplay().setFullWindow();               // Set full Refresh
-    //epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+    //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-    epd->fillScreen(common.bgcolor);    // Clear screen
+    getdisplay().fillScreen(common.bgcolor);    // Clear screen
-    epd->setTextColor(common.fgcolor);
+    getdisplay().setTextColor(common.fgcolor);
-    epd->setFont(&Ubuntu_Bold20pt8b);
+    getdisplay().setFont(&Ubuntu_Bold20pt8b);
-    epd->setCursor(85, 150);
+    getdisplay().setCursor(85, 150);
-    epd->print("Sleep Mode");
+    getdisplay().print("Sleep Mode");
-    epd->setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-    epd->setCursor(65, 175);
+    getdisplay().setCursor(65, 175);
-    epd->print("To wake up press wheel and wait 5s");
+    getdisplay().print("To wake up press wheel and wait 5s");
-    epd->nextPage();                // Partial update
+    getdisplay().nextPage();                // Partial update
-    epd->powerOff();                // Display power off
+    getdisplay().powerOff();                // Display power off
     setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
     setPortPin(OBP_POWER_SD, false);        // Power off SD card
     // Stop system
@@ -293,31 +300,31 @@ 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 setFlashLED(bool status) {
+void setFlashLED(bool status){
     if (ledTaskData == nullptr) return;
-    Color c = status ? COLOR_RED : COLOR_BLACK;
+    Color c=status?COLOR_RED:COLOR_BLACK;
-    LedInterface current = ledTaskData->getLedData();
+    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;
 }
 
@@ -347,29 +354,26 @@ void setBuzzerPower(uint power){
     buzzerpower = power;
 }
 
-// Delete xdr prefix from string and optional limit length
+// Delete xdr prefix from string
-String xdrDelete(String input, uint8_t maxlen) {
+String xdrDelete(String input){
-    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) {
-    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[1].x, p4[1].y, p4[2].x, p4[2].y, color);
-    epd->fillTriangle(p4[0].x, p4[0].y, p4[2].x, p4[2].y, p4[3].x, p4[3].y, color);
+    getdisplay().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++) {
-        epd->drawLine(points[i].x, points[i].y, points[i+1].x, points[i+1].y, color);
+        getdisplay().drawLine(points[i].x, points[i].y, points[i+1].x, points[i+1].y, color);
     }
     // close path
-    epd->drawLine(points[polysize-1].x, points[polysize-1].y, points[0].x, points[0].y, color);
+    getdisplay().drawLine(points[polysize-1].x, points[polysize-1].y, points[0].x, points[0].y, color);
 }
 
 // Split string into words, whitespace separated
@@ -419,51 +423,52 @@ 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;
-    epd->getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
+    getdisplay().getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
-    epd->setCursor(cx - w / 2, cy + h / 2);
+    getdisplay().setCursor(cx - w / 2, cy + h / 2);
-    epd->print(text);
+    getdisplay().print(text);
 }
 
 // Draw right aligned text
 void drawTextRalign(int16_t x, int16_t y, String text) {
     int16_t x1, y1;
     uint16_t w, h;
-    epd->getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
+    getdisplay().getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
-    epd->setCursor(x - w, y);
+    getdisplay().setCursor(x - w, y);
-    epd->print(text);
+    getdisplay().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) {
-        epd->fillRect(box.x, box.y, box.w, box.h, fg);
+        getdisplay().fillRect(box.x, box.y, box.w, box.h, fg);
-        epd->setTextColor(bg);
+        getdisplay().setTextColor(bg);
     } else {
         if (border) {
-            epd->fillRect(box.x + 1, box.y + 1, box.w - 2, box.h - 2, bg);
+            getdisplay().fillRect(box.x + 1, box.y + 1, box.w - 2, box.h - 2, bg);
-            epd->drawRect(box.x, box.y, box.w, box.h, fg);
+            getdisplay().drawRect(box.x, box.y, box.w, box.h, fg);
         }
-        epd->setTextColor(fg);
+        getdisplay().setTextColor(fg);
     }
     uint16_t border_offset = box.h / 4; // 25% of box height
-    epd->setCursor(box.x + border_offset, box.y + box.h - border_offset);
+    getdisplay().setCursor(box.x + border_offset, box.y + box.h - border_offset);
-    epd->print(text);
+    getdisplay().print(text);
-    epd->setTextColor(fg);
+    getdisplay().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){
-    epd->fillTriangle(x, y, x+size*2, y, x+size, y-size*2, color);
+    getdisplay().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){
-    epd->fillTriangle(x, y, x+size*2, y, x+size, y+size*2, color);
+    getdisplay().fillTriangle(x, y, x+size*2, y, x+size, y+size*2, color);
 }
 
 // Show header informations
-void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop){
+void displayHeader(CommonData &commonData, 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;
@@ -475,65 +480,31 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
     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
-        epd->setTextColor(commonData.fgcolor);
+        getdisplay().setTextColor(commonData.fgcolor);
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(0, 15);
+        getdisplay().setCursor(0, 15);
-        if (commonData.status.wifiApOn) {
+        if(commonData.status.wifiApOn){
-            if (symbolmode) {
+        getdisplay().print(" AP ");
-                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){
-            if (symbolmode) {
+        getdisplay().print("TCP ");
-                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){
-            if (symbolmode) {
+        getdisplay().print("N2K ");
-                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){
-            if (symbolmode) {
+        getdisplay().print("183 ");
-                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){
-            if (symbolmode) {
+        getdisplay().print("USB ");
-                epd->drawXBitmap(symbol_x, 1, iconmap["USB"], icon_width, icon_height, commonData.fgcolor);
-                symbol_x += symbol_offset;
-            } else {
-                epd->print("USB ");
-            }
         }
-        double gpshdop = commonData.fmt->formatValue(hdop, commonData).value;
+        double gpshdop = formatValue(hdop, commonData).value;
         if(commonData.config->getString(commonData.config->useGPS) != "off" &&  gpshdop <= commonData.config->getInt(commonData.config->hdopAccuracy) && hdop->valid == true){
-            if (symbolmode) {
+        getdisplay().print("GPS");
-                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;
@@ -550,26 +521,26 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
 #ifdef HARDWARE_V21
         // Display key lock status
         if (commonData.keylock) {
-            epd->drawXBitmap(170, 1, lock_bits, icon_width, icon_height, commonData.fgcolor);
+            getdisplay().drawXBitmap(170, 1, lock_bits, icon_width, icon_height, commonData.fgcolor);
         } else {
-            epd->drawXBitmap(166, 1, swipe_bits, swipe_width, swipe_height, commonData.fgcolor);
+            getdisplay().drawXBitmap(166, 1, swipe_bits, swipe_width, swipe_height, commonData.fgcolor);
         }
 #endif
 #ifdef LIPO_ACCU_1200
         if (commonData.data.BatteryChargeStatus == 1) {
-             epd->drawXBitmap(170, 1, battery_loading_bits, battery_width, battery_height, commonData.fgcolor);
+             getdisplay().drawXBitmap(170, 1, battery_loading_bits, battery_width, battery_height, commonData.fgcolor);
         } else {
 #ifdef VOLTAGE_SENSOR
             if (commonData.data.batteryLevelLiPo < 10) {
-                epd->drawXBitmap(170, 1, battery_0_bits, battery_width, battery_height, commonData.fgcolor);
+                getdisplay().drawXBitmap(170, 1, battery_0_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 25) {
-                epd->drawXBitmap(170, 1, battery_25_bits, battery_width, battery_height, commonData.fgcolor);
+                getdisplay().drawXBitmap(170, 1, battery_25_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 50) {
-                epd->drawXBitmap(170, 1, battery_50_bits, battery_width, battery_height, commonData.fgcolor);
+                getdisplay().drawXBitmap(170, 1, battery_50_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 75) {
-                epd->drawXBitmap(170, 1, battery_75_bits, battery_width, battery_height, commonData.fgcolor);
+                getdisplay().drawXBitmap(170, 1, battery_75_bits, battery_width, battery_height, commonData.fgcolor);
             } else {
-                epd->drawXBitmap(170, 1, battery_100_bits, battery_width, battery_height, commonData.fgcolor);
+                getdisplay().drawXBitmap(170, 1, battery_100_bits, battery_width, battery_height, commonData.fgcolor);
             }
 #endif // VOLTAGE_SENSOR
         }
@@ -577,33 +548,33 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
 
         // Heartbeat as page number
         if (heartbeat) {
-            epd->setTextColor(commonData.bgcolor);
+            getdisplay().setTextColor(commonData.bgcolor);
-            epd->fillRect(201, 0, 23, 19, commonData.fgcolor);
+            getdisplay().fillRect(201, 0, 23, 19, commonData.fgcolor);
         } else {
-            epd->setTextColor(commonData.fgcolor);
+            getdisplay().setTextColor(commonData.fgcolor);
-            epd->drawRect(201, 0, 23, 19, commonData.fgcolor);
+            getdisplay().drawRect(201, 0, 23, 19, commonData.fgcolor);
         }
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
         drawTextCenter(211, 9, String(commonData.data.actpage));
         heartbeat = !heartbeat;
 
         // Date and time
-        fmtDate fmttype = commonData.fmt->getDateFormat(commonData.config->getString(commonData.config->dateFormat));
+        String fmttype = commonData.config->getString(commonData.config->dateFormat);
         String timesource = commonData.config->getString(commonData.config->timeSource);
         double tz = commonData.config->getString(commonData.config->timeZone).toDouble();
-        epd->setTextColor(commonData.fgcolor);
+        getdisplay().setTextColor(commonData.fgcolor);
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(230, 15);
+        getdisplay().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);
-                epd->print(formatTime(fmtTime::MMHH, local_tm->tm_hour, local_tm->tm_min, 0));
+                getdisplay().print(formatTime('m', local_tm->tm_hour, local_tm->tm_min, 0));
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(formatDate(fmttype, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
+                getdisplay().print(formatDate(fmttype, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(tz == 0 ? "UTC" : "LOT");
+                getdisplay().print(tz == 0 ? "UTC" : "LOT");
             } else {
                 drawTextRalign(396, 15, "RTC invalid");
             }
@@ -611,18 +582,18 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
         else if (timesource == "GPS") {
             // Show date and time if date present
             if(date->valid == true){
-                String acttime = commonData.fmt->formatValue(time, commonData).svalue;
+                String acttime = formatValue(time, commonData).svalue;
                 acttime = acttime.substring(0, 5);
-                String actdate = commonData.fmt->formatValue(date, commonData).svalue;
+                String actdate = formatValue(date, commonData).svalue;
-                epd->print(acttime);
+                getdisplay().print(acttime);
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(actdate);
+                getdisplay().print(actdate);
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(tz == 0 ? "UTC" : "LOT");
+                getdisplay().print(tz == 0 ? "UTC" : "LOT");
             }
             else{
                 if(commonData.config->getBool(commonData.config->useSimuData) == true){
-                    epd->print("12:00 01.01.2024 LOT");
+                    getdisplay().print("12:00 01.01.2024 LOT");
                 }
                 else{
                     drawTextRalign(396, 15, "No GPS data");
@@ -630,15 +601,15 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
             }
         } // timesource == "GPS"
         else {
-            epd->print("No time source");
+            getdisplay().print("No time source");
         }
     }
 }
 
 void displayFooter(CommonData &commonData) {
 
-    epd->setFont(&Atari16px);
+    getdisplay().setFont(&Atari16px);
-    epd->setTextColor(commonData.fgcolor);
+    getdisplay().setTextColor(commonData.fgcolor);
 
 #ifdef HARDWARE_V21
     // Frame around key icon area
@@ -647,14 +618,14 @@ void displayFooter(CommonData &commonData) {
         const uint16_t top = 280;
         const uint16_t bottom = 299;
         // horizontal stub lines
-        epd->drawLine(commonData.keydata[0].x, top, commonData.keydata[0].x+10, top, commonData.fgcolor);
+        getdisplay().drawLine(commonData.keydata[0].x, top, commonData.keydata[0].x+10, top, commonData.fgcolor);
         for (int i = 1; i <= 5; i++) {
-            epd->drawLine(commonData.keydata[i].x-10, top, commonData.keydata[i].x+10, top, commonData.fgcolor);
+            getdisplay().drawLine(commonData.keydata[i].x-10, top, commonData.keydata[i].x+10, 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);
+        getdisplay().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++) {
-            epd->drawLine(commonData.keydata[i].x + commonData.keydata[i].w, top, commonData.keydata[i].x + commonData.keydata[i].w, bottom, commonData.fgcolor);
+            getdisplay().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;
@@ -665,7 +636,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;
-                        epd->drawXBitmap(x, y, iconmap[icon_name], icon_width, icon_height, commonData.fgcolor);
+                        getdisplay().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;
@@ -680,8 +651,8 @@ void displayFooter(CommonData &commonData) {
             }
         }
     } else {
-        epd->setCursor(65, 295);
+        getdisplay().setCursor(65, 295);
-        epd->print("Press 1 and 6 fast to unlock keys");
+        getdisplay().print("Press 1 and 6 fast to unlock keys");
     }
 #endif
 #ifdef BOARD_OBP40S3
@@ -692,21 +663,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)) {
-            epd->fillCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
+            getdisplay().fillCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
         } else {
-            epd->drawCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
+            getdisplay().drawCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
         }
     }
     // key indicators
     // left side = top key "menu"
-    epd->drawLine(0, 280, 10, 280, commonData.fgcolor);
+    getdisplay().drawLine(0, 280, 10, 280, commonData.fgcolor);
-    epd->drawLine(55, 280, 65, 280, commonData.fgcolor);
+    getdisplay().drawLine(55, 280, 65, 280, commonData.fgcolor);
-    epd->drawLine(65, 280, 65, 299, commonData.fgcolor);
+    getdisplay().drawLine(65, 280, 65, 299, commonData.fgcolor);
     drawTextCenter(33, 291, commonData.keydata[0].label);
     // right side = bottom key "exit"
-    epd->drawLine(390, 280, 399, 280, commonData.fgcolor);
+    getdisplay().drawLine(390, 280, 399, 280, commonData.fgcolor);
-    epd->drawLine(335, 280, 345, 280, commonData.fgcolor);
+    getdisplay().drawLine(335, 280, 345, 280, commonData.fgcolor);
-    epd->drawLine(335, 280, 335, 399, commonData.fgcolor);
+    getdisplay().drawLine(335, 280, 335, 399, commonData.fgcolor);
     drawTextCenter(366, 291, commonData.keydata[1].label);
 #endif
 }
@@ -719,31 +690,31 @@ void displayAlarm(CommonData &commonData) {
     const uint16_t w = 300;
     const uint16_t h = 150;
 
-    epd->setFont(&Atari16px);
+    getdisplay().setFont(&Atari16px);
-    epd->setTextColor(commonData.fgcolor);
+    getdisplay().setTextColor(commonData.fgcolor);
 
     // overlay
-    epd->drawRect(x, y, w, h, commonData.fgcolor);
+    getdisplay().drawRect(x, y, w, h, commonData.fgcolor);
-    epd->fillRect(x + 1, y + 1, w - 1, h - 1, commonData.bgcolor);
+    getdisplay().fillRect(x + 1, y + 1, w - 1, h - 1, commonData.bgcolor);
-    epd->drawRect(x + 3, y + 3, w - 5, h - 5, commonData.fgcolor);
+    getdisplay().drawRect(x + 3, y + 3, w - 5, h - 5, commonData.fgcolor);
 
     // exclamation icon in left top corner
-    epd->drawXBitmap(x + 16, y + 16, exclamation_bits, exclamation_width, exclamation_height, commonData.fgcolor);
+    getdisplay().drawXBitmap(x + 16, y + 16, exclamation_bits, exclamation_width, exclamation_height, commonData.fgcolor);
 
     // title
-    epd->setCursor(x + 64, y + 30);
+    getdisplay().setCursor(x + 64, y + 30);
-    epd->print("A L A R M");
+    getdisplay().print("A L A R M");
-    epd->setCursor(x + 64, y + 48);
+    getdisplay().setCursor(x + 64, y + 48);
-    epd->print("#" + commonData.alarm.id);
+    getdisplay().print("#" + commonData.alarm.id);
-    epd->print(" from ");
+    getdisplay().print(" from ");
-    epd->print(commonData.alarm.source);
+    getdisplay().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) {
-        epd->setCursor(x + 16, y + 80 + n);
+        getdisplay().setCursor(x + 16, y + 80 + n);
-        epd->print(l);
+        getdisplay().print(l);
         n += 16;
         if (n > 64) {
             break;
@@ -836,20 +807,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);
-        epd->fillRect(xb, yb, 100, 80, pcolor);
+        getdisplay().fillRect(xb, yb, 100, 80, pcolor);
         if(percent < 99){
-            epd->fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
+            getdisplay().fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
         }
         // Plus pol 20x15
         int xp = xb + 20;
         int yp = yb - 15 + t;
-        epd->fillRect(xp, yp, 20, 15, pcolor);
+        getdisplay().fillRect(xp, yp, 20, 15, pcolor);
-        epd->fillRect(xp+t, yp+t, 20-(2*t), 15-(2*t), bcolor);
+        getdisplay().fillRect(xp+t, yp+t, 20-(2*t), 15-(2*t), bcolor);
         // Minus pol 20x15
         int xm = xb + 60;
         int ym = yb -15 + t;
-        epd->fillRect(xm, ym, 20, 15, pcolor);
+        getdisplay().fillRect(xm, ym, 20, 15, pcolor);
-        epd->fillRect(xm+t, ym+t, 20-(2*t), 15-(2*t), bcolor);
+        getdisplay().fillRect(xm+t, ym+t, 20-(2*t), 15-(2*t), bcolor);
 }
 
 // Solar graphic with fill level
@@ -861,17 +832,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);
-        epd->fillRect(xb, yb, 100, 80, pcolor);
+        getdisplay().fillRect(xb, yb, 100, 80, pcolor);
         if(percent < 99){
-            epd->fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
+            getdisplay().fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
         }
         // Draw horizontel lines
-        epd->fillRect(xb, yb+28-t, 100, t, pcolor);
+        getdisplay().fillRect(xb, yb+28-t, 100, t, pcolor);
-        epd->fillRect(xb, yb+54-t, 100, t, pcolor);
+        getdisplay().fillRect(xb, yb+54-t, 100, t, pcolor);
         // Draw vertical lines
-        epd->fillRect(xb+19+t, yb, t, 80, pcolor);
+        getdisplay().fillRect(xb+19+t, yb, t, 80, pcolor);
-        epd->fillRect(xb+39+2*t, yb, t, 80, pcolor);
+        getdisplay().fillRect(xb+39+2*t, yb, t, 80, pcolor);
-        epd->fillRect(xb+59+3*t, yb, t, 80, pcolor);
+        getdisplay().fillRect(xb+59+3*t, yb, t, 80, pcolor);
 
 }
 
@@ -883,13 +854,13 @@ void generatorGraphic(uint x, uint y, int pcolor, int bcolor){
         int t = 4;      // Line thickness
 
         // Generator corpus with radius 45
-        epd->fillCircle(xb, yb, 45, pcolor);
+        getdisplay().fillCircle(xb, yb, 45, pcolor);
-        epd->fillCircle(xb, yb, 41, bcolor);
+        getdisplay().fillCircle(xb, yb, 41, bcolor);
         // Insert G
-        epd->setTextColor(pcolor);
+        getdisplay().setTextColor(pcolor);
-        epd->setFont(&Ubuntu_Bold32pt8b);
+        getdisplay().setFont(&Ubuntu_Bold32pt8b);
-        epd->setCursor(xb-22, yb+20);
+        getdisplay().setCursor(xb-22, yb+20);
-        epd->print("G");
+        getdisplay().print("G");
 }
 
 // Function to handle HTTP image request
@@ -903,7 +874,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 = epd->getBuffer(); // EPD framebuffer
+    uint8_t *fb = getdisplay().getBuffer(); // EPD framebuffer
     std::vector<uint8_t> imageBuffer;       // image in webserver transferbuffer
     String mimetype;
 
@@ -926,7 +897,7 @@ void doImageRequest(GwApi *api, int *pageno, const PageStruct pages[MAX_PAGE_NUM
         createPBM(fb, &imageBuffer, GxEPD_WIDTH, GxEPD_HEIGHT);
     }
 
-    AsyncWebServerResponse *response = request->beginResponse(200, mimetype, (const uint8_t*)imageBuffer.data(), imageBuffer.size());
+    AsyncWebServerResponse *response = request->beginResponse_P(200, mimetype, (const uint8_t*)imageBuffer.data(), imageBuffer.size());
     response->addHeader("Content-Disposition", "inline; filename=" + filename);
     request->send(response);
 

lib/obp60task/OBP60Extensions.h

@@ -1,10 +1,8 @@
-// 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
@@ -39,8 +37,6 @@ 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,22 +51,23 @@ extern const GFXfont Ubuntu_Bold16pt8b;
 extern const GFXfont Ubuntu_Bold20pt8b;
 extern const GFXfont Ubuntu_Bold32pt8b;
 extern const GFXfont Atari16px;
-extern const GFXfont Atari6px;
 
 // Global functions
 #ifdef DISPLAY_GDEW042T2
-typedef GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> gxepd2display;
+GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> & getdisplay();
 #endif
+
 #ifdef DISPLAY_GDEY042T81
-typedef GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> gxepd2display;
+GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> & getdisplay();
 #endif
+
 #ifdef DISPLAY_GYE042A87
-typedef GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> gxepd2display;
+GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> & getdisplay();
 #endif
+
 #ifdef DISPLAY_SE0420NQ04
-typedef GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> gxepd2display;
+GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> & getdisplay();
 #endif
-extern gxepd2display *epd;
 
 // Page display return values
 #define PAGE_OK 0          // all ok, do nothing
@@ -103,7 +100,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, uint8_t maxlen = 0); // Delete xdr prefix from string and optional limit length
+String xdrDelete(String input);                 // Delete xdr prefix from string
 
 void drawTextCenter(int16_t cx, int16_t cy, String text);
 void drawTextRalign(int16_t x, int16_t y, String text);
@@ -112,7 +109,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, bool symbolmode, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop); // Draw display header
+void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop); // Draw display header
 void displayFooter(CommonData &commonData);
 void displayAlarm(CommonData &commonData);
 
@@ -160,62 +157,24 @@ 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 };
 
-// Header symbols
+static unsigned char ap_bits[] PROGMEM = {
-
-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 gps_bits[] PROGMEM = {
+static unsigned char dish_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},
-    {"GPS", gps_bits},
+    {"DISH", dish_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,27 +3,79 @@
 #include <Arduino.h>
 #include "GwApi.h"
 #include "Pagedata.h"
-#include "OBP60Formatter.h"
 
 // ToDo
 // simulation data
 // hold values by missing data
 
-Formatter::Formatter(GwConfigHandler *config) {
+String formatDate(String fmttype, uint16_t year, uint8_t month, uint8_t day) {
-    // Load configuration values
+    char buffer[12];
-    // TODO do not use strings but enums, see header file
+    if (fmttype == "GB") {
-    stimeZone = config->getString(config->timeZone);
+        snprintf(buffer, 12, "%02d/%02d/%04d", day , month, year);
-    timeZone = stimeZone.toDouble();
+    }
-    lengthFormat = config->getString(config->lengthFormat);
+    else if (fmttype == "US") {
-    distanceFormat = config->getString(config->distanceFormat);
+        snprintf(buffer, 12, "%02d/%02d/%04d", month, day, year);
-    speedFormat = config->getString(config->speedFormat);
+    }
-    windspeedFormat = config->getString(config->windspeedFormat);
+    else if (fmttype == "ISO") {
-    tempFormat = config->getString(config->tempFormat);
+        snprintf(buffer, 12, "%04d-%02d-%02d", year, month, day);
-    dateFormat = config->getString(config->dateFormat);
+    }
-    dateFmt = getDateFormat(dateFormat);
+    else {
-    usesimudata = config->getBool(config->useSimuData);
+        snprintf(buffer, 12, "%02d.%02d.%04d", day, month, year);
-    precision = config->getString(config->valueprecision);
+    }
+    return String(buffer);
+}
 
+String formatTime(char fmttype, uint8_t hour, uint8_t minute, uint8_t second) {
+    // fmttype: s: with seconds, m: only minutes
+    char buffer[10];
+    if (fmttype == 'm') {
+        snprintf(buffer, 10, "%02d:%02d", hour , minute);
+    }
+    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");
+}
+
+FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
+    GwLog *logger = commondata.logger;
+    FormattedData result;
+    static int dayoffset = 0;
+    double rawvalue = 0;
+
+    // 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]
+    bool usesimudata = commondata.config->getBool(commondata.config->useSimuData);              // [on|off]
+    String precision = commondata.config->getString(commondata.config->valueprecision);         // [1|2]
+
+    // If boat value not valid
+    if (! value->valid && !usesimudata){
+        result.svalue = "---";
+        return result;
+    }
+
+    const char* fmt_dec_1;
+    const char* fmt_dec_10;
+    const char* fmt_dec_100;
     if (precision == "1") {
         fmt_dec_1 = "%3.1f";
         fmt_dec_10 = "%3.0f";
@@ -34,51 +86,6 @@ Formatter::Formatter(GwConfigHandler *config) {
         fmt_dec_100 = "%3.0f";
     }
 
-}
-
-fmtType Formatter::stringToFormat(const char* formatStr) {
-    auto it = formatMap.find(formatStr);
-    if (it != formatMap.end()) {
-        return it->second;
-    }
-    return fmtType::XDR_G; // generic as default
-}
-
-fmtDate Formatter::getDateFormat(String sformat) {
-    if (sformat == "DE") {
-        return fmtDate::DE;
-    }
-    if (sformat == "GB") {
-        return fmtDate::GB;
-    }
-    if (sformat == "US") {
-        return fmtDate::US;
-    }
-    return fmtDate::ISO; // default
-}
-
-fmtTime Formatter::getTimeFormat(String sformat) {
-    if (sformat == "MMHH") {
-        return fmtTime::MMHH;
-    }
-    if (sformat == "MMHHSS") {
-        return fmtTime::MMHHSS;
-    }
-    return fmtTime::MMHH; // default
-}
-
-FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &commondata){
-    GwLog *logger = commondata.logger;
-    FormattedData result;
-    static int dayoffset = 0;
-    double rawvalue = 0;
-
-    // If boat value not valid
-    if (! value->valid && !usesimudata){
-        result.svalue = placeholder;
-        return result;
-    }
-
 //    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];
@@ -118,7 +125,12 @@ FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &common
         else{
             snprintf(buffer, bsize, "01.01.2022"); 
         }
-        result.unit = ((timeZone == 0) ? "UTC" : "LOT");
+        if(timeZone == 0){
+            result.unit = "UTC";
+        }
+        else{
+            result.unit = "LOT";
+        }
     }
     //########################################################
     else if(value->getFormat() == "formatTime"){
@@ -148,7 +160,12 @@ FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &common
             snprintf(buffer, bsize, "11:36:%02i", int(sec));
             lasttime = millis();
         }
-        result.unit = ((timeZone == 0) ? "UTC" : "LOT");
+        if(timeZone == 0){
+            result.unit = "UTC";
+        }
+        else{
+            result.unit = "LOT";
+        }
     }
     //########################################################
     else if (value->getFormat() == "formatFixed0"){
@@ -308,13 +325,13 @@ FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &common
         if (rotation < -100){
             rotation = -99;
         }
-        else if (rotation > 100){
+        if (rotation > 100){
             rotation = 99;
         }
         if (rotation > -10 && rotation < 10){
             snprintf(buffer, bsize, "%3.2f", rotation);
         }
-        else {
+        if (rotation <= -10 || rotation >= 10){
             snprintf(buffer, bsize, "%3.0f", rotation);
         }
     }
@@ -352,7 +369,12 @@ FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &common
             String latdir = "";
             float degree = abs(int(lat));
             float minute = abs((lat - int(lat)) * 60);
-            latdir = (lat > 0) ? "N" : "S";
+            if (lat > 0){
+                latdir = "N";
+            }
+            else {
+                latdir = "S";
+            }
             latitude = String(degree,0) + "\x90 " + String(minute,4) + "' " + latdir;
             result.unit = "";
             strcpy(buffer, latitude.c_str());
@@ -371,7 +393,12 @@ FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &common
             String londir = "";
             float degree = abs(int(lon));
             float minute = abs((lon - int(lon)) * 60);
-            londir = (lon > 0) ? "E" : "W";
+            if (lon > 0){
+                londir = "E";
+            }
+            else {
+                londir = "W";
+            }
             longitude = String(degree,0) + "\x90 " + String(minute,4) + "' " + londir;
             result.unit = "";
             strcpy(buffer, longitude.c_str());
@@ -393,7 +420,7 @@ FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &common
             depth = rawvalue;
         }
         if(String(lengthFormat) == "ft"){
-            depth = depth * 3.28084; // TODO use global defined factor
+            depth = depth * 3.28084;
             result.unit = "ft";
         }
         else{
@@ -412,29 +439,33 @@ FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &common
     //########################################################
     else if (value->getFormat() == "formatXte"){
         double xte = 0;
-        if (usesimudata == false) {
+        if(usesimudata == false) {
             xte = value->value;
             rawvalue = value->value;
-        } else {
+        }
+        else{
             rawvalue = 6.0 + float(random(0, 4));
             xte = rawvalue;
         }
-        if (distanceFormat == "km") {
+        if(String(distanceFormat) == "km"){
             xte = xte * 0.001;
             result.unit = "km";
-        } else if (distanceFormat == "nm") {
+        }
-            xte = xte * 0.000539957; // TODO use global defined factor
+        else if(String(distanceFormat) == "nm"){
+            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);
         }
-        else {
+        if(xte >= 100){
-            snprintf(buffer, bsize, "%3.0f", xte);
+            snprintf(buffer,bsize,"%3.0f",xte);
         }
     }
     //########################################################
@@ -459,7 +490,7 @@ FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &common
         else{
             result.unit = "K";
         }
-        if (temp < 10) {
+        if(temp < 10) {
             snprintf(buffer, bsize, fmt_dec_1, temp);
         }
         else if (temp < 100) {
@@ -485,7 +516,7 @@ FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &common
             result.unit = "km";
         }
         else if (String(distanceFormat) == "nm") {
-            distance = distance * 0.000539957; // TODO use global defined factor
+            distance = distance * 0.000539957;
             result.unit = "nm";
         }
         else {
@@ -814,49 +845,4 @@ FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &common
     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

@@ -1,172 +0,0 @@
-// 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;
-    String svalue;
-    String 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);
-    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/OBP60Keypad.h

@@ -1,9 +1,8 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+#ifndef _OBP60FUNCTIONS_H
-#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+#define _OBP60FUNCTIONS_H
+
 #include <Arduino.h>
 #include "OBP60Hardware.h"
-#include "OBP60Extensions.h" // for buzzer
-#include "OBPKeyboardTask.h"
   
 // Global vars
 
@@ -59,9 +58,9 @@ 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) {
+  int readKeypad(GwLog* logger, uint thSensitivity, bool use_syspage) {
     
     // Touch sensor values
     // 35000 - Not touched
@@ -234,35 +233,35 @@ int readKeypad(GwLog* logger, uint thSensitivity) {
     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) {
+      else if(digitalRead(DOWN) == LOW){
         keycode = 9;  // Right swipe
-    }
+      }
-    else if (digitalRead(CONF) == LOW) {
+      else if(digitalRead(CONF) == LOW){
         keycode = 3;  // Key 3
-    }
+      }
-    else if (digitalRead(MENUE) == LOW) {
+      else if(digitalRead(MENUE) == LOW){
         keycode = 1;  // Key 1
-    }
+      }
-    else if (digitalRead(EXIT) == LOW) {
+      else if(digitalRead(EXIT) == LOW){
         keycode = 2;  // Key 2
-    }
+      }
-    else {
+      else{
         keycode = 0;  // No key activ
+      }
+      return keycode;
     }
-    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);
@@ -274,68 +273,31 @@ int readKeypad(GwLog* logger, uint thSensitivity, bool use_syspage) {
 
     // 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/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)){
-        epd->fillRect(box_x, box_y, box_s, box_s, fgcolor);
+        getdisplay().fillRect(box_x, box_y, box_s, box_s, fgcolor);
       } else {
-        epd->fillRect(box_x, box_y, box_s, box_s, bgcolor);
+        getdisplay().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;
   }
-  epd->setFont(&Ubuntu_Bold32pt8b);
+  getdisplay().setFont(&Ubuntu_Bold32pt8b);
-  epd->setTextColor(fgcolor);
+  getdisplay().setTextColor(fgcolor);
-  epd->setCursor(140, 285);
+  getdisplay().setCursor(140, 285);
-  epd->print("WiFi");
+  getdisplay().print("WiFi");
-  epd->nextPage();                 // Full Refresh
+  getdisplay().nextPage();                 // Full Refresh
 }
 
 #endif

lib/obp60task/OBPKeyboardTask.h

@@ -1,16 +0,0 @@
-// 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,4 +1,3 @@
-// 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
@@ -91,16 +90,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
@@ -500,24 +499,24 @@ void sensorTask(void *param){
         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
@@ -556,24 +555,19 @@ 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
         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
@@ -791,12 +785,8 @@ void sensorTask(void *param){
     vTaskDelete(NULL);
 }
 
-void createSensorTask(SharedData *shared) {
+
-    TaskHandle_t xHandle = NULL;
+void createSensorTask(SharedData *shared){
-    GwLog *logger = shared->api->getLogger();
+    xTaskCreate(sensorTask,"readSensors",10000,shared,3,NULL);
-    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,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 #include "GwSynchronized.h"
 #include "GwApi.h"

lib/obp60task/OBPTrackerTask.cpp

@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+#include <WiFi.h>
+#include <PubSubClient.h>
+#include "OBPTrackerTask.h"
+
+/*
+
+Regatta Hero: use PubSubClient preferred over MQTTClient. Less
+functionality but smaller and easier.
+
+JSON-data to send to server:
+    Payload = {
+        "passcode": "[code]",
+        "orgid": "[orgname]",
+        "raceid": "[raceid]",
+        "gps": {
+            "lat": 47.823938240041436,
+            "lon": 8.1386857025205,
+            "speed": 5.5,
+            "odo": 1000,
+            "age": 1000,
+            "bat": 0.7,
+            "timestamp": "2011-10-05T14:48:00.000Z"
+        },
+        "boat": {
+            "boatid": "c32d8b45-92fe-44f6-8b61-42c2107dfe45",
+            "sailno": "GER 11",
+             "team": "OBP60team",
+             "boatclass": "One off",
+             "handicap": 114.0,
+             "club": "BSC",
+             "boatname": "Delfin"
+        }
+    }
+
+mqttClient.state()
+
+*/
+
+void mqttCallback(char *topic, byte *payload, unsigned int length) {
+
+    if (String(topic) == "hero/race") {
+    }
+
+}
+
+void trackerTask(void *param) {
+    TrackerData *data = (TrackerData *)param;
+
+    // TCP client connection is needed
+    GwApi::Status status;
+    data->api->getStatus(status);
+    if (status.wifiClientConnected) {
+        data->logger->logDebug(GwLog::ERROR, "No WiFi connection. Cannot start tracker task.");
+        vTaskDelete(NULL);
+    }
+
+    WiFiClient wificlient;
+    PubSubClient mqtt(wificlient);
+
+    String broker = "mqtt.regattahero.com";
+    String mqttUsername = "obp60";
+    String mqttPassword = "23qwecv";
+    // String mqttClientID = generateClientID();
+
+    mqtt.setServer(broker.c_str(), 1883);
+    mqtt.setBufferSize(2048); // Erhöht die maximale Payload-Größe auf 512 Bytes   *** TODO WTF?
+    mqtt.setCallback(mqttCallback);
+    // mqtt.connect(mqttClientID.c_str(), mqttUsername.c_str(), mqttPassword.c_str())
+
+    String subRaceStatus = "regattahero/racestatus/[orgname]/#";
+    // mqtt.subscribe(subRaceStatus.c_str());
+
+    String subOrgStatus = "regattahero/orgstatus/[orgname]/#";
+    // mqtt.subscribe(subOrgStatus.c_str());
+
+    while (true) {    
+        delay(1000); // Loop time one second
+    }
+    vTaskDelete(NULL);
+}
+
+void createTrackerTask(TrackerData *param) {
+    TaskHandle_t xHandle = NULL;
+    if (xTaskCreate(trackerTask, "tracker", configMINIMAL_STACK_SIZE + 2048, param, configMAX_PRIORITIES-1, &xHandle)) {
+        param->logger->logDebug(GwLog::ERROR, "Failed to create tracker task!");
+    }
+}
+#endif

lib/obp60task/OBPTrackerTask.h

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#include "GwApi.h"
+
+typedef struct {
+    GwApi *api = nullptr;
+    GwLog *logger = nullptr;
+} TrackerData;
+
+void createTrackerTask(TrackerData *param);

lib/obp60task/PageAIS.cpp

@@ -1,178 +0,0 @@
-// 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

@@ -1,432 +0,0 @@
-// 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,138 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
-
-#include "Pagedata.h"
-#include "OBP60Extensions.h"
-
-/*
-  Autopilot
-
-*/
-
-class PageAutopilot : public Page
-{
-private:
-    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");
-
-    }
-
-    void displayModeConfig() {
-
-        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;
-        }
-        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 PageAutopilot; 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 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
- * and we provide the number of user parameters we expect
- * this will be number of BoatValue pointers in pageData.values
- */
-PageDescription registerPageAutopilot(
-    "Autopilot",    // 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)
-    false           // Show display header on/off
-);
-
-#endif

lib/obp60task/PageBME280.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,21 +5,13 @@
 
 class PageBME280 : public Page
 {
-private:
+    public:
-    String tempformat;
+    PageBME280(CommonData &common){
-    String useenvsensor;
+        commonData = &common;
-
+        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);
     }
 
-    int handleKey(int key){
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -30,6 +21,8 @@ public:
     }
 
     int displayPage(PageData &pageData){
+        GwConfigHandler *config = commonData->config;
+        GwLog *logger = commonData->logger;
 
         double value1 = 0;
         double value2 = 0;
@@ -38,6 +31,13 @@ public:
         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
@@ -99,82 +99,82 @@ public:
         }
 
         // Logging boat values
-        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);
+        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);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 55);
+        getdisplay().setCursor(20, 55);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 90);
+        getdisplay().setCursor(20, 90);
-        epd->print(unit1);                           // Unit
+        getdisplay().print(unit1);                           // Unit
 
         // Switch font if format for any values
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 90);
+        getdisplay().setCursor(180, 90);
 
         // Show bus data
-        epd->print(svalue1);                         // Real value as formated string
+        getdisplay().print(svalue1);                         // Real value as formated string
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 145);
+        getdisplay().setCursor(20, 145);
-        epd->print(name2);                           // Page name
+        getdisplay().print(name2);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 180);
+        getdisplay().setCursor(20, 180);
-        epd->print(unit2);                           // Unit
+        getdisplay().print(unit2);                           // Unit
 
         // Switch font if format for any values
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 180);
+        getdisplay().setCursor(180, 180);
 
         // Show bus data
-        epd->print(svalue2);                         // Real value as formated string
+        getdisplay().print(svalue2);                         // Real value as formated string
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 235);
+        getdisplay().setCursor(20, 235);
-        epd->print(name3);                           // Page name
+        getdisplay().print(name3);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 270);
+        getdisplay().setCursor(20, 270);
-        epd->print(unit3);                           // Unit
+        getdisplay().print(unit3);                           // Unit
 
         // Switch font if format for any values
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(140, 270);
+        getdisplay().setCursor(140, 270);
 
         // Show bus data
-        epd->print(svalue3);                         // Real value as formated string
+        getdisplay().print(svalue3);                         // Real value as formated string
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageBarograph.cpp

@@ -1,238 +0,0 @@
-// 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,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,25 +5,20 @@
 
 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) : Page(common)
+    PageBattery(CommonData &common){
-    {
+        commonData = &common;
-        logger->logDebug(GwLog::LOG, "Instantiate PageBattery");
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageBattery");
-
-        // Get config data
-        String powsensor1 = config->getString(config->usePowSensor1);
     }
 
-    void setupKeys(){
+    virtual void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "AVG";
     }
 
-    int handleKey(int key){
+    virtual int handleKey(int key){
         // Change average
         if(key == 1){
             average ++;
@@ -40,17 +34,9 @@ public:
         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;
@@ -63,6 +49,14 @@ public:
         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"){
@@ -151,141 +145,147 @@ public:
         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
-        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);
+        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);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
         // Show average settings
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
         switch (average) {
             case 0:
-                epd->setCursor(60, 90);
+                getdisplay().setCursor(60, 90);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
-                epd->setCursor(60, 180);
+                getdisplay().setCursor(60, 180);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
-                epd->setCursor(60, 270);
+                getdisplay().setCursor(60, 270);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
                 break;
             case 1:
-                epd->setCursor(60, 90);
+                getdisplay().setCursor(60, 90);
-                epd->print("Avg: 10s");
+                getdisplay().print("Avg: 10s");
-                epd->setCursor(60, 180);
+                getdisplay().setCursor(60, 180);
-                epd->print("Avg: 10s");
+                getdisplay().print("Avg: 10s");
-                epd->setCursor(60, 270);
+                getdisplay().setCursor(60, 270);
-                epd->print("Avg: 10s");
+                getdisplay().print("Avg: 10s");
                 break;
             case 2:
-                epd->setCursor(60, 90);
+                getdisplay().setCursor(60, 90);
-                epd->print("Avg: 60s");
+                getdisplay().print("Avg: 60s");
-                epd->setCursor(60, 180);
+                getdisplay().setCursor(60, 180);
-                epd->print("Avg: 60s");
+                getdisplay().print("Avg: 60s");
-                epd->setCursor(60, 270);
+                getdisplay().setCursor(60, 270);
-                epd->print("Avg: 60s");
+                getdisplay().print("Avg: 60s");
                 break;
             case 3:
-                epd->setCursor(60, 90);
+                getdisplay().setCursor(60, 90);
-                epd->print("Avg: 300s");
+                getdisplay().print("Avg: 300s");
-                epd->setCursor(60, 180);
+                getdisplay().setCursor(60, 180);
-                epd->print("Avg: 300s");
+                getdisplay().print("Avg: 300s");
-                epd->setCursor(60, 270);
+                getdisplay().setCursor(60, 270);
-                epd->print("Avg: 300s");
+                getdisplay().print("Avg: 300s");
                 break;
             default:
-                epd->setCursor(60, 90);
+                getdisplay().setCursor(60, 90);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
-                epd->setCursor(60, 180);
+                getdisplay().setCursor(60, 180);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
-                epd->setCursor(60, 270);
+                getdisplay().setCursor(60, 270);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
                 break;
         } 
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 55);
+        getdisplay().setCursor(20, 55);
-        epd->print(name1);                           // Value name
+        getdisplay().print(name1);                           // Value name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 90);
+        getdisplay().setCursor(20, 90);
-        epd->print(unit1);                           // Unit
+        getdisplay().print(unit1);                           // Unit
 
         // Show value
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 90);
+        getdisplay().setCursor(180, 90);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            epd->print(value1,2);                    // Real value as formated string
+            getdisplay().print(value1,2);                    // Real value as formated string
         }
         else{
-            epd->print(commonData->fmt->placeholder);  // No sensor data (sensor is off)
+            getdisplay().print("---");                       // No sensor data (sensor is off)
         }
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 145);
+        getdisplay().setCursor(20, 145);
-        epd->print(name2);                           // Value name
+        getdisplay().print(name2);                           // Value name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 180);
+        getdisplay().setCursor(20, 180);
-        epd->print(unit2);                           // Unit
+        getdisplay().print(unit2);                           // Unit
 
         // Show value
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 180);
+        getdisplay().setCursor(180, 180);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            epd->print(value2,1);                    // Real value as formated string
+            getdisplay().print(value2,1);                    // Real value as formated string
         }
         else{
-            epd->print(commonData->fmt->placeholder); // No sensor data (sensor is off)
+            getdisplay().print("---");                       // No sensor data (sensor is off)
         }
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 235);
+        getdisplay().setCursor(20, 235);
-        epd->print(name3);                           // Value name
+        getdisplay().print(name3);                           // Value name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 270);
+        getdisplay().setCursor(20, 270);
-        epd->print(unit3);                           // Unit
+        getdisplay().print(unit3);                           // Unit
 
         // Show value
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 270);
+        getdisplay().setCursor(180, 270);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            epd->print(value3,1);                    // Real value as formated string
+            getdisplay().print(value3,1);                    // Real value as formated string
         }
         else{
-            epd->print(commonData->fmt->placeholder);  // No sensor data (sensor is off)
+            getdisplay().print("---");                       // No sensor data (sensor is off)
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageBattery2.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -7,34 +6,23 @@
 
 class PageBattery2 : public Page
 {
-private:
+bool init = false;                  // Marker for init done
-    String batVoltage;
+int average = 0;                    // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
-    int batCapacity;
+bool trend = true;                  // Trend indicator [0|1], 0=off, 1=on
-    String batType;
+double raw = 0;
-    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) : Page(common)
+    PageBattery2(CommonData &common){
-    {
+        commonData = &common;
-        logger->logDebug(GwLog::LOG, "Instantiate PageBattery2");
+        common.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);
     }
 
-    void setupKeys(){
+    virtual void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "AVG";
     }
 
-    int handleKey(int key) {
+    virtual int handleKey(int key){
          // Change average
         if(key == 1){
             average ++;
@@ -56,7 +44,11 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData) {
+    int displayPage(PageData &pageData)
+    {
+        GwConfigHandler *config = commonData->config;
+        GwLog *logger = commonData->logger;
+
         // 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
@@ -65,6 +57,16 @@ 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
@@ -140,133 +142,149 @@ public:
         if(batRange > 99) batRange = 99;
 
         // Optical warning by limit violation
-        if (flashLED == "Limit Violation") {
+        if(String(flashLED) == "Limit Violation"){
-            bool violation = false;
+            // Limits for Pb battery
-            if (batType == "Pb") {
+            if(String(batType) == "Pb" && (raw < 11.8 || raw > 14.8)){
-                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
-        logger->logDebug(GwLog::LOG, "Drawing at PageBattery2, Type:%s %s:=%f", batType.c_str(), name1.c_str(), raw);
+        LOG_DEBUG(GwLog::LOG,"Drawing at PageBattery2, Type:%s %s:=%f", batType.c_str(), name1.c_str(), raw);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(10, 65);
+        getdisplay().setCursor(10, 65);
-        epd->print("Bat.");
+        getdisplay().print("Bat.");
 
          // Show battery type
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(90, 65);
+        getdisplay().setCursor(90, 65);
-        epd->print(batType);
+        getdisplay().print(batType);
 
         // Show voltage type
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 140);
+        getdisplay().setCursor(10, 140);
         int bvoltage = 0;
         if(String(batVoltage) == "12V") bvoltage = 12;
         else bvoltage = 24;
-        epd->print(bvoltage);
+        getdisplay().print(bvoltage);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("V");
+        getdisplay().print("V");
 
         // Show battery capacity
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 200);
+        getdisplay().setCursor(10, 200);
-        if(batCapacity <= 999) epd->print(batCapacity, 0);
+        if(batCapacity <= 999) getdisplay().print(batCapacity, 0);
-        if(batCapacity > 999) epd->print(float(batCapacity/1000.0), 1);
+        if(batCapacity > 999) getdisplay().print(float(batCapacity/1000.0), 1);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        if(batCapacity <= 999) epd->print("Ah");
+        if(batCapacity <= 999) getdisplay().print("Ah");
-        if(batCapacity > 999) epd->print("kAh");
+        if(batCapacity > 999) getdisplay().print("kAh");
 
         // Show info
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 235);
+        getdisplay().setCursor(10, 235);
-        epd->print("Installed");
+        getdisplay().print("Installed");
-        epd->setCursor(10, 255);
+        getdisplay().setCursor(10, 255);
-        epd->print("Battery Type");
+        getdisplay().print("Battery Type");
 
         // Show battery with fill level
         batteryGraphic(150, 45, batPercentage, commonData->fgcolor, commonData->bgcolor);
 
         // Show average settings
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(150, 145);
+        getdisplay().setCursor(150, 145);
         switch (average) {
             case 0:
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
                 break;
             case 1:
-                epd->print("Avg: 10s");
+                getdisplay().print("Avg: 10s");
                 break;
             case 2:
-                epd->print("Avg: 60s");
+                getdisplay().print("Avg: 60s");
                 break;
             case 3:
-                epd->print("Avg: 300s");
+                getdisplay().print("Avg: 300s");
                 break;
             default:
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
                 break;
         } 
 
         // Show fill level in percent
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(150, 200);
+        getdisplay().setCursor(150, 200);
-        epd->print(batPercentage);
+        getdisplay().print(batPercentage);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("%");
+        getdisplay().print("%");
 
         // Show time to full discharge
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(150, 260);
+        getdisplay().setCursor(150, 260);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(batRange < 9.9) epd->print(batRange, 1);
+            if(batRange < 9.9) getdisplay().print(batRange, 1);
-            else epd->print(batRange, 0);
+            else getdisplay().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 = "";
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(270, 60);
+        getdisplay().setCursor(270, 60);
-        if(powerSensor == "off") epd->print("Internal");
+        if(powerSensor == "off") getdisplay().print("Internal");
         if(powerSensor == "INA219"){
-            epd->print("INA219");
+            getdisplay().print("INA219");
         }
         if(powerSensor == "INA226"){
-            epd->print("INA226");
+            getdisplay().print("INA226");
             i2cAddr = " (0x" + String(INA226_I2C_ADDR1, HEX) + ")";
         }
-        epd->print(i2cAddr);
+        getdisplay().print(i2cAddr);
-        epd->setCursor(270, 80);
+        getdisplay().setCursor(270, 80);
-        epd->print("Sensor Modul");
+        getdisplay().print("Sensor Modul");
 
         // Reading bus data or using simulation data
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 140);
+        getdisplay().setCursor(260, 140);
         if(simulation == true){
             if(batVoltage == "12V"){
                 value1 = 12.0;
@@ -275,50 +293,46 @@ public:
                 value1 = 24.0;
             }
             value1 += float(random(0, 5)) / 10;         // Simulation data
-            epd->print(value1,1);
+            getdisplay().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) epd->print(value1, 2);
+                if(value1 <= 9.9) getdisplay().print(value1, 2);
-                if(value1 > 9.9 && value1 <= 99.9)epd->print(value1, 1);
+                if(value1 > 9.9 && value1 <= 99.9)getdisplay().print(value1, 1);
-                if(value1 > 99.9) epd->print(value1, 0);
+                if(value1 > 99.9) getdisplay().print(value1, 0);
             }
             else{
-                epd->print(commonData->fmt->placeholder); // Missing bus data
+            getdisplay().print("---");                       // Missing bus data
             }
         }
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("V");
+        getdisplay().print("V");
 
         // Show actual current in A
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 200);
+        getdisplay().setCursor(260, 200);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value2 <= 9.9) epd->print(value2, 2);
+            if(value2 <= 9.9) getdisplay().print(value2, 2);
-            if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1);
+            if(value2 > 9.9 && value2 <= 99.9)getdisplay().print(value2, 1);
-            if(value2 > 99.9) epd->print(value2, 0);
+            if(value2 > 99.9) getdisplay().print(value2, 0);
         }
-        else {
+        else  getdisplay().print("---");
-            epd->print(commonData->fmt->placeholder);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        }
+        getdisplay().print("A");
-        epd->setFont(&Ubuntu_Bold16pt8b);
-        epd->print("A");
 
         // Show actual consumption in W
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 260);
+        getdisplay().setCursor(260, 260);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value3 <= 9.9) epd->print(value3, 2);
+            if(value3 <= 9.9) getdisplay().print(value3, 2);
-            if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1);
+            if(value3 > 9.9 && value3 <= 99.9)getdisplay().print(value3, 1);
-            if(value3 > 99.9) epd->print(value3, 0);
+            if(value3 > 99.9) getdisplay().print(value3, 0);
         }
-        else {
+        else  getdisplay().print("---");
-            epd->print(commonData->fmt->placeholder);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        }
+        getdisplay().print("W");
-        epd->setFont(&Ubuntu_Bold16pt8b);
-        epd->print("W");
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageClock.cpp

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

lib/obp60task/PageCompass.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -25,58 +24,58 @@ const float Compass_LineDelta = 8.0;// compass band: 1deg = 5 Pixels, 10deg = 50
 
 class PageCompass : public Page
 {
-private:
     int WhichDataCompass = ShowHDM; 
     int WhichDataDisplay = ShowHDM; 
 
-public:
+    public:
-    PageCompass(CommonData &common) : Page(common)
+    PageCompass(CommonData &common){
-    {
+        commonData = &common;
-        logger->logDebug(GwLog::LOG, "Instantiate PageCompass");
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageCompass");
     }
 
-    void setupKeys(){
+    virtual void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "CMP";
         commonData->keydata[1].label = "SRC";
-    }
+   }
     
-    int handleKey(int key){
+    virtual 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;
     }
 
-    void displayNew(PageData &pageData) {
+    int displayPage(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) {
     
         // 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];
@@ -88,15 +87,21 @@ public:
 
         for (int i = 0; i < HowManyValues; i++){
             bvalue = pageData.values[i];
-            TheFormattedData = commonData->fmt->formatValue(bvalue, *commonData);   
+            TheFormattedData = formatValue(bvalue, *commonData);   
             DataName[i] = xdrDelete(bvalue->getName());
             DataName[i] = DataName[i].substring(0, 6);  // String length limit for value name
-            DataUnits[i] = commonData->fmt->formatValue(bvalue, *commonData).unit;   
+            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
-            logger->logDebug(GwLog::LOG, "Drawing at PageCompass: %d %s %f %s %s",  i,  DataName[i], DataValue[i], DataFormat[i], DataText[i] );
+            LOG_DEBUG(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?
@@ -104,27 +109,27 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // Horizontal line 2 pix top & bottom
         // Print data on top half
-        epd->fillRect(0, 130, 400, 2, commonData->fgcolor); 
+        getdisplay().fillRect(0, 130, 400, 2, commonData->fgcolor); 
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(10, 70);
+        getdisplay().setCursor(10, 70);
-        epd->print(DataName[WhichDataDisplay]);                         // Page name
+        getdisplay().print(DataName[WhichDataDisplay]);                         // Page name
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 120);
+        getdisplay().setCursor(10, 120);
-        epd->print(DataUnits[WhichDataDisplay]); 
+        getdisplay().print(DataUnits[WhichDataDisplay]); 
-        epd->setCursor(190, 120);
+        getdisplay().setCursor(190, 120);
-        epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
   
         if(holdvalues == false){
-            epd->print(DataText[WhichDataDisplay]);                     // Real value as formated string
+            getdisplay().print(DataText[WhichDataDisplay]);                     // Real value as formated string
         }
         else{
-            epd->print(OldDataText[WhichDataDisplay]);                  // Old value as formated string
+            getdisplay().print(OldDataText[WhichDataDisplay]);                  // Old value as formated string
         }
         if(DataValid[WhichDataDisplay] == true){
             OldDataText[WhichDataDisplay] = DataText[WhichDataDisplay];         // Save the old value
@@ -143,14 +148,14 @@ public:
         char buffer[bsize+1];
         buffer[0]=0;              
 
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(10, Compass_Y0-60);
+        getdisplay().setCursor(10, Compass_Y0-60);
-        epd->print(DataName[WhichDataCompass]);                         // Page name
+        getdisplay().print(DataName[WhichDataCompass]);                         // Page name
  
      
         // Draw compass base line and pointer
-        epd->fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);            
+        getdisplay().fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);            
-        epd->fillTriangle(Compass_X0,Compass_Y0-40,Compass_X0-10,Compass_Y0-80,Compass_X0+10,Compass_Y0-80,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;
@@ -159,7 +164,7 @@ public:
             else
                     x1 = Compass_X0 - 20 * ( i + 1 );
 
-            epd->fillRect(x1, Compass_Y0 -55, 10, 6, commonData->fgcolor);            
+            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
@@ -169,28 +174,28 @@ public:
         for ( int i = 0; i <=4; i++ ){
                 int x0;
                 x0 = Compass_X0 + Delta_X + 2 * i * 5 * Compass_LineDelta;
-                epd->fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
+                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;
-                epd->fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
+                getdisplay().fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
 
                 x0 = Compass_X0 + Delta_X - 2 * i * 5 * Compass_LineDelta;
-                epd->fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
+                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;
-                epd->fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
+                getdisplay().fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
             }
 
-        epd->fillRect(0, Compass_Y0, 400, 3, 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;
-        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
 
         do {
-                epd->setCursor(x0 - 40, Compass_Y0 + 40);
+                getdisplay().setCursor(x0 - 40, Compass_Y0 + 40);
                 snprintf(buffer,bsize,"%03.0f", AngleToDisplay);
-                epd->print(buffer);
+                getdisplay().print(buffer);
                 AngleToDisplay += 20;
                 if ( AngleToDisplay >= 360.0 )
                     AngleToDisplay -= 360.0;
@@ -203,7 +208,7 @@ public:
 
         x0 = Compass_X0 + Delta_X + 4 * 5 * Compass_LineDelta;
         do {
-            epd->setCursor(x0 - 40, Compass_Y0 + 40);
+            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 )
@@ -213,7 +218,7 @@ public:
             else if ( ( x0 - 40 )  >  325 ) 
                 buffer[2] = 0;
                 
-            epd->print(buffer);             
+            getdisplay().print(buffer);             
 
             AngleToDisplay -= 20;
             if ( AngleToDisplay < 0 )
@@ -225,8 +230,8 @@ public:
         // x_test += 2;
 
         // snprintf(buffer,bsize,"%03d", x_test);
-        // epd->setCursor(x_test, Compass_Y0 - 60);
+        // getdisplay().setCursor(x_test, Compass_Y0 - 60);
-        // epd->print(buffer);
+        // getdisplay().print(buffer);
         // if ( x_test > 390)
         //     x_test = 320;
 

lib/obp60task/PageDST810.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,19 +5,13 @@
 
 class PageDST810 : public Page
 {
-private:
-    String lengthformat;
-
 public:
-    PageDST810(CommonData &common) : Page(common)
+    PageDST810(CommonData &common){
-    {
+        commonData = &common;
-        logger->logDebug(GwLog::LOG, "Instantiate PageDST810");
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageDST810");
-
-        // Get config data
-        lengthformat = config->getString(config->lengthFormat);
     }
 
-    int handleKey(int key) {
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -27,7 +20,9 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData) {
+    int displayPage(PageData &pageData){
+        GwConfigHandler *config = commonData->config;
+        GwLog *logger = commonData->logger;
 
         // Old values for hold function
         static String svalue1old = "";
@@ -39,14 +34,21 @@ public:
         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 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = 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
+        String unit1 = 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)
@@ -54,8 +56,8 @@ public:
         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 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = 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
+        String unit2 = 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)
@@ -63,8 +65,8 @@ public:
         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 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = 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)
@@ -72,8 +74,8 @@ public:
         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 = commonData->fmt->formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit4 = commonData->fmt->formatValue(bvalue4, *commonData).unit;        // Unit of value
+        String unit4 = formatValue(bvalue4, *commonData).unit;        // Unit of value
 
         // Optical warning by limit violation (unused)
         if(String(flashLED) == "Limit Violation"){
@@ -83,43 +85,43 @@ public:
 
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        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);
+        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);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 55);
+        getdisplay().setCursor(20, 55);
-        epd->print("Depth");                         // Page name
+        getdisplay().print("Depth");                         // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 90);
+        getdisplay().setCursor(20, 90);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Set font
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 90);
+        getdisplay().setCursor(180, 90);
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -129,35 +131,35 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 145);
+        getdisplay().setCursor(20, 145);
-        epd->print("Speed");                         // Page name
+        getdisplay().print("Speed");                         // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 180);
+        getdisplay().setCursor(20, 180);
         if(holdvalues == false){
-            epd->print(unit2);                       // Unit
+            getdisplay().print(unit2);                       // Unit
         }
         else{
-            epd->print(unit2old);
+            getdisplay().print(unit2old);
         }
 
         // Setfont
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 180);
+        getdisplay().setCursor(180, 180);
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue2);                                     // Real value as formated string
+            getdisplay().print(svalue2);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue2old);                                  // Old value as formated string
+            getdisplay().print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -167,35 +169,35 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 220);
+        getdisplay().setCursor(20, 220);
-        epd->print("Log");                           // Page name
+        getdisplay().print("Log");                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 240);
+        getdisplay().setCursor(20, 240);
         if(holdvalues == false){
-            epd->print(unit3);                       // Unit
+            getdisplay().print(unit3);                       // Unit
         }
         else{
-            epd->print(unit3old);
+            getdisplay().print(unit3old);
         }
 
         // Set font
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(80, 270);
+        getdisplay().setCursor(80, 270);
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue3);                                     // Real value as formated string
+            getdisplay().print(svalue3);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue3old);                                  // Old value as formated string
+            getdisplay().print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
@@ -205,35 +207,35 @@ public:
         // ############### Vertical Line ################
 
         // Vertical line 3 pix
-        epd->fillRect(200, 195, 3, 75, commonData->fgcolor);
+        getdisplay().fillRect(200, 195, 3, 75, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(220, 220);
+        getdisplay().setCursor(220, 220);
-        epd->print("Temp");                           // Page name
+        getdisplay().print("Temp");                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(220, 240);
+        getdisplay().setCursor(220, 240);
         if(holdvalues == false){
-            epd->print(unit4);                       // Unit
+            getdisplay().print(unit4);                       // Unit
         }
         else{
-            epd->print(unit4old);
+            getdisplay().print(unit4old);
         }
 
         // Set font
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(280, 270);
+        getdisplay().setCursor(280, 270);
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue4);                                     // Real value as formated string
+            getdisplay().print(svalue4);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue4old);                                  // Old value as formated string
+            getdisplay().print(svalue4old);                                  // Old value as formated string
         }
         if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value

lib/obp60task/PageEPropulsion.cpp

@@ -1,145 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
-
-#include "Pagedata.h"
-#include "OBP60Extensions.h"
-
-/*
-  Electric propulsion
-
-  - Current, voltage, power 
-  - 12, 24, 48 etc. Voltage
-  - rpm
-  - throttle position
-  - controller state
-  - error codes
-  - temperature engine, controller, batteries
-
-*/
-
-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,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -67,22 +66,25 @@ static unsigned char fish_bits[] = {
 
 class PageFluid : public Page
 {
-private:
+    bool simulation = false;
     double simgoto;
     double simval;
     double simstep;
+    bool holdvalues = false;
     int fluidtype;
 
-public:
+    public:
-    PageFluid(CommonData &common) : Page(common)
+    PageFluid(CommonData &common){
-    {
+        commonData = &common;
-        logger->logDebug(GwLog::LOG, "Instantiate PageFluid");
+        common.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;
     }
 
-    int handleKey(int key) {
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -91,23 +93,28 @@ public:
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+    virtual void displayNew(PageData &pageData){
-        fluidtype = config->getInt("page" + String(pageData.pageNumber) + "fluid", 0);
+        fluidtype = commonData->config->getInt("page" + String(pageData.pageNumber) + "fluid", 0);
-        logger->logDebug(GwLog::LOG, "New PageFluid: fluidtype=%d", fluidtype);
+        commonData->logger->logDebug(GwLog::LOG,"New PageFluid: fluidtype=%d", fluidtype);
-#ifdef BOARD_OBP60S3
-        // Clear optical warning
-        if (flashLED == "Limit Violation") {
-            setBlinkingLED(false);
-            setFlashLED(false);
-        }
-#endif
     }
 
-    int displayPage(PageData &pageData) {
+    int displayPage(PageData &pageData){
+        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);
+        }
+
         GwApi::BoatValue *bvalue1 = pageData.values[0];
         String name1 = bvalue1->getName();
         double fluidlevel = bvalue1->value;
@@ -125,23 +132,23 @@ public:
         }
 
         // Logging boat values
-        logger->logDebug(GwLog::LOG, "Drawing at PageFluid: value=%f", bvalue1->value);
+        LOG_DEBUG(GwLog::LOG,"Drawing at PageFluid: value=%f", bvalue1->value);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height());
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height());
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // descriptions
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 60);
+        getdisplay().setCursor(20, 60);
-        epd->print("Fluid");
+        getdisplay().print("Fluid");
 
-        epd->setCursor(300, 60);
+        getdisplay().setCursor(300, 60);
-        epd->print(xdrDelete(name1).substring(0, 6));
+        getdisplay().print(xdrDelete(name1).substring(0, 6));
 
         // analog instrument
         // scale from -120 to 120
@@ -151,11 +158,11 @@ public:
         uint8_t r = 110;
 
         // circular frame
-        epd->drawCircle(c.x, c.y, r+5, commonData->fgcolor);
+        getdisplay().drawCircle(c.x, c.y, r+5, commonData->fgcolor);
-        epd->fillCircle(c.x, c.y, r+2, commonData->fgcolor);
+        getdisplay().fillCircle(c.x, c.y, r+2, commonData->fgcolor);
-        epd->fillCircle(c.x, c.y, r-1, commonData->bgcolor);
+        getdisplay().fillCircle(c.x, c.y, r-1, commonData->bgcolor);
         // center of pointer as dot 
-        epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
+        getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
 
         // value down centered
         char buffer[6];
@@ -169,32 +176,32 @@ public:
         // draw symbol (as bitmap)
         switch (fluidtype) {
             case 0:
-                epd->drawXBitmap(c.x-8, c.y-50, fuel_bits, fuel_width, fuel_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, fuel_bits, fuel_width, fuel_height, commonData->fgcolor);
                 break;
             case 1:
-                epd->drawXBitmap(c.x-8, c.y-50, water_bits, water_width, water_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, water_bits, water_width, water_height, commonData->fgcolor);
                 break;
             case 2: // gray water no symbol yet
-                // epd->drawXBitmap(c.x-8, c.y-50, gray_bits, gray_width, gray_height, commonData->fgcolor);
+                // getdisplay().drawXBitmap(c.x-8, c.y-50, gray_bits, gray_width, gray_height, commonData->fgcolor);
                 break;
             case 3:
-                epd->drawXBitmap(c.x-8, c.y-50, fish_bits, fish_width, fish_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, fish_bits, fish_width, fish_height, commonData->fgcolor);
                 break;
             case 4:
-                epd->drawXBitmap(c.x-8, c.y-50, oil_bits, oil_width, oil_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, oil_bits, oil_width, oil_height, commonData->fgcolor);
                 break;
             case 5:
-                epd->drawXBitmap(c.x-8, c.y-50, waste_bits, waste_width, waste_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, waste_bits, waste_width, waste_height, commonData->fgcolor);
                 break;
             case 6:
-                epd->drawXBitmap(c.x-8, c.y-50, gasoline_bits, gasoline_width, gasoline_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, gasoline_bits, gasoline_width, gasoline_height, commonData->fgcolor);
                 break;
         }
 
         Point p, pr;
 
         // scale texts
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
         p = {c.x, c.y - r + 30};
         drawTextCenter(p.x, p.y, "1/2");
         pr = rotatePoint(c, p, -60);
@@ -203,7 +210,7 @@ public:
         drawTextCenter(pr.x, pr.y, "3/4");
 
         // empty and full
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().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);
@@ -229,7 +236,7 @@ public:
                 continue;
             }
             p = rotatePoint(c, {c.x, c.y - r + 10}, angle);
-            epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
+            getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
         }
 
         // pointer
@@ -242,7 +249,7 @@ public:
             };
             fillPoly4(rotatePoints(c, pts, -120 + fluidlevel * 2.4), commonData->fgcolor);
             // Pointer axis is white
-            epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
+            getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
         }
  
         return PAGE_UPDATE;

lib/obp60task/PageFourValues.cpp

@@ -1,28 +1,18 @@
-// 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 PageFourValues : public Page
 {
-private:
+    public:
-    String lengthformat;
+    PageFourValues(CommonData &common){
-
+        commonData = &common;
-public:
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageFourValues");
-    PageFourValues(CommonData &common) : Page(common)
-    {
-        logger->logDebug(GwLog::LOG, "Instantiate PageFourValues");
-
-        // Get config data
-        lengthformat = config->getString(config->lengthFormat);
     }
 
-    int handleKey(int key){
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -31,17 +21,9 @@ public:
         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 = "";
@@ -53,103 +35,108 @@ public:
         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
-#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 svalue1 = 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
+        String unit1 = 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 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = 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
+        String unit2 = 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 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
 
         // Get boat values #4
         GwApi::BoatValue *bvalue4 = pageData.values[3]; // Fourth element in list
         String name4 = xdrDelete(bvalue4->getName());   // Value name
         name4 = name4.substring(0, 6);                  // String length limit for value name
-#ifdef ENABLE_CALIBRATION
         calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated
-#endif
         double value4 = bvalue4->value;                 // Value as double in SI unit
         bool valid4 = bvalue4->valid;                   // Valid information 
-        String svalue4 = commonData->fmt->formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit4 = commonData->fmt->formatValue(bvalue4, *commonData).unit;        // Unit of value
+        String unit4 = 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?
-        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);
+        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);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(20, 45);
+        getdisplay().setCursor(20, 45);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 65);
+        getdisplay().setCursor(20, 65);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(120, 55);
+            getdisplay().setCursor(120, 55);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(150, 58);
+            getdisplay().setCursor(150, 58);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(180, 65);
+            getdisplay().setCursor(180, 65);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -159,45 +146,45 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 80, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 80, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(20, 113);
+        getdisplay().setCursor(20, 113);
-        epd->print(name2);                           // Page name
+        getdisplay().print(name2);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 133);
+        getdisplay().setCursor(20, 133);
         if(holdvalues == false){
-            epd->print(unit2);                       // Unit
+            getdisplay().print(unit2);                       // Unit
         }
         else{
-            epd->print(unit2old);
+            getdisplay().print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(120, 123);
+            getdisplay().setCursor(120, 123);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(150, 123);
+            getdisplay().setCursor(150, 123);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(180, 133);
+            getdisplay().setCursor(180, 133);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue2);                                     // Real value as formated string
+            getdisplay().print(svalue2);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue2old);                                  // Old value as formated string
+            getdisplay().print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -207,45 +194,45 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 146, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 146, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(20, 181);
+        getdisplay().setCursor(20, 181);
-        epd->print(name3);                           // Page name
+        getdisplay().print(name3);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 201);
+        getdisplay().setCursor(20, 201);
         if(holdvalues == false){
-            epd->print(unit3);                       // Unit
+            getdisplay().print(unit3);                       // Unit
         }
         else{
-            epd->print(unit3old);
+            getdisplay().print(unit3old);
         }
 
         // Switch font if format for any values
         if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(120, 191);
+            getdisplay().setCursor(120, 191);
         }
         else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(150, 191);
+            getdisplay().setCursor(150, 191);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(180, 201);
+            getdisplay().setCursor(180, 201);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue3);                                     // Real value as formated string
+            getdisplay().print(svalue3);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue3old);                                  // Old value as formated string
+            getdisplay().print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
@@ -255,45 +242,45 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 214, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 214, 400, 3, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(20, 249);
+        getdisplay().setCursor(20, 249);
-        epd->print(name4);                           // Page name
+        getdisplay().print(name4);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 269);
+        getdisplay().setCursor(20, 269);
         if(holdvalues == false){
-            epd->print(unit4);                       // Unit
+            getdisplay().print(unit4);                       // Unit
         }
         else{
-            epd->print(unit4old);
+            getdisplay().print(unit4old);
         }
 
         // Switch font if format for any values
         if(bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(120, 259);
+            getdisplay().setCursor(120, 259);
         }
         else if(bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(150, 259);
+            getdisplay().setCursor(150, 259);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(180, 269);
+            getdisplay().setCursor(180, 269);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue4);                                     // Real value as formated string
+            getdisplay().print(svalue4);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue4old);                                  // Old value as formated string
+            getdisplay().print(svalue4old);                                  // Old value as formated string
         }
         if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value
@@ -302,11 +289,6 @@ public:
 
         return PAGE_UPDATE;
     };
-
-    void leavePage(PageData &pageData) {
-        logger->logDebug(GwLog::LOG, "Leaving PageFourvalues");
-    }
-
 };
 
 static Page *createPage(CommonData &common){

lib/obp60task/PageFourValues2.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -7,19 +6,13 @@
 
 class PageFourValues2 : public Page
 {
-private:
+    public:
-    String lengthformat;
+    PageFourValues2(CommonData &common){
-
+        commonData = &common;
-public:
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageFourValues2");
-    PageFourValues2(CommonData &common) : Page(common)
-    {
-        logger->logDebug(GwLog::LOG, "Instantiate PageFourValues2");
-
-        // Get config data
-        lengthformat = config->getString(config->lengthFormat);
     }
 
-    int handleKey(int key) {
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;         // Toggle keylock
@@ -28,17 +21,9 @@ public:
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+    int displayPage(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) {
 
         // Old values for hold function
         static String svalue1old = "";
@@ -50,103 +35,108 @@ public:
         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
-#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 svalue1 = 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
+        String unit1 = 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)
         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 svalue2 = 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
+        String unit2 = 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)
         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 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = 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)
         String name4 = xdrDelete(bvalue4->getName());   // Value name
         name4 = name4.substring(0, 6);                  // String length limit for value name
-#ifdef ENABLE_CALIBRATION
         calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated
-#endif
         double value4 = bvalue4->value;                 // Value as double in SI unit
         bool valid4 = bvalue4->valid;                   // Valid information 
-        String svalue4 = commonData->fmt->formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit4 = commonData->fmt->formatValue(bvalue4, *commonData).unit;        // Unit of value
+        String unit4 = 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?
-        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);
+        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);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 55);
+        getdisplay().setCursor(20, 55);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 90);
+        getdisplay().setCursor(20, 90);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(100, 90);
+            getdisplay().setCursor(100, 90);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(180, 77);
+            getdisplay().setCursor(180, 77);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-            epd->setCursor(180, 90);
+            getdisplay().setCursor(180, 90);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -156,45 +146,45 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 145);
+        getdisplay().setCursor(20, 145);
-        epd->print(name2);                           // Page name
+        getdisplay().print(name2);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 180);
+        getdisplay().setCursor(20, 180);
         if(holdvalues == false){
-            epd->print(unit2);                       // Unit
+            getdisplay().print(unit2);                       // Unit
         }
         else{
-            epd->print(unit2old);
+            getdisplay().print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(100, 180);
+            getdisplay().setCursor(100, 180);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(180, 158);
+            getdisplay().setCursor(180, 158);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-            epd->setCursor(180, 180);
+            getdisplay().setCursor(180, 180);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue2);                                     // Real value as formated string
+            getdisplay().print(svalue2);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue2old);                                  // Old value as formated string
+            getdisplay().print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -204,45 +194,45 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 220);
+        getdisplay().setCursor(20, 220);
-        epd->print(name3);                           // Page name
+        getdisplay().print(name3);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 240);
+        getdisplay().setCursor(20, 240);
         if(holdvalues == false){
-            epd->print(unit3);                       // Unit
+            getdisplay().print(unit3);                       // Unit
         }
         else{
-            epd->print(unit3old);
+            getdisplay().print(unit3old);
         }
 
         // Switch font if format for any values
         if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(50, 240);
+            getdisplay().setCursor(50, 240);
         }
         else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(100, 240);
+            getdisplay().setCursor(100, 240);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(80, 270);
+            getdisplay().setCursor(80, 270);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue3);                                     // Real value as formated string
+            getdisplay().print(svalue3);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue3old);                                  // Old value as formated string
+            getdisplay().print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
@@ -252,45 +242,45 @@ public:
         // ############### Vertical Line ################
 
         // Vertical line 3 pix
-        epd->fillRect(200, 195, 3, 75, commonData->fgcolor);
+        getdisplay().fillRect(200, 195, 3, 75, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(220, 220);
+        getdisplay().setCursor(220, 220);
-        epd->print(name4);                           // Page name
+        getdisplay().print(name4);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(220, 240);
+        getdisplay().setCursor(220, 240);
         if(holdvalues == false){
-            epd->print(unit4);                       // Unit
+            getdisplay().print(unit4);                       // Unit
         }
         else{
-            epd->print(unit4old);
+            getdisplay().print(unit4old);
         }
 
         // Switch font if format for any values
         if(bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(250, 240);
+            getdisplay().setCursor(250, 240);
         }
         else if(bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(300, 240);
+            getdisplay().setCursor(300, 240);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(280, 270);
+            getdisplay().setCursor(280, 270);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue4);                                     // Real value as formated string
+            getdisplay().print(svalue4);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue4old);                                  // Old value as formated string
+            getdisplay().print(svalue4old);                                  // Old value as formated string
         }
         if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value

lib/obp60task/PageGenerator.cpp

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

lib/obp60task/PageKeelPosition.cpp

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

lib/obp60task/PageOneValue.cpp

@@ -1,28 +1,18 @@
-// 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 PageOneValue : public Page
 {
-private:
+    public:
-    String lengthformat;
+    PageOneValue(CommonData &common){
-
+        commonData = &common;
-public:
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageOneValue");
-    PageOneValue(CommonData &common) : Page(common)
-    {
-        logger->logDebug(GwLog::LOG, "Instantiate PageOneValue");
-
-        // Get config data
-        lengthformat = config->getString(config->lengthFormat);
     }
 
-    int handleKey(int key) {
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -31,81 +21,83 @@ public:
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+    int displayPage(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) {
 
         // Old values for hold function
         static String svalue1old = "";
         static String unit1old = "";
 
+        // 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
         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 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = 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
+        String unit1 = formatValue(bvalue1, *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?
-        logger->logDebug(GwLog::LOG, "Drawing at PageOneValue, %s: %f", name1.c_str(), value1);
+        LOG_DEBUG(GwLog::LOG,"Drawing at PageOneValue, %s: %f", name1.c_str(), value1);
 
         // Draw page
         //***********************************************************
 
         /// Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
         // Show name
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold32pt8b);
+        getdisplay().setFont(&Ubuntu_Bold32pt8b);
-        epd->setCursor(20, 100);
+        getdisplay().setCursor(20, 100);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(270, 100);
+        getdisplay().setCursor(270, 100);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(20, 180);
+            getdisplay().setCursor(20, 180);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold32pt8b);
+            getdisplay().setFont(&Ubuntu_Bold32pt8b);
-            epd->setCursor(20, 200);
+            getdisplay().setCursor(20, 200);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic60pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b);
-            epd->setCursor(20, 240);
+            getdisplay().setCursor(20, 240);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value

lib/obp60task/PageRollPitch.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,30 +5,14 @@
 
 class PageRollPitch : public Page
 {
-private:
-    String lengthformat;
-    int rolllimit;
-    String roffset;
-    double rolloffset;
-    String poffset;
-    double pitchoffset;
-
 public:
-    PageRollPitch(CommonData &common) : Page(common)
+    PageRollPitch(CommonData &common){
-    {
+        commonData = &common;
-        logger->logDebug(GwLog::LOG, "Instantiate PageRollPitch");
+        common.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
-    int handleKey(int key){
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -38,7 +21,9 @@ 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;
@@ -47,6 +32,19 @@ 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
@@ -99,70 +97,71 @@ public:
         }
 
         // Optical warning by limit violation
-        if (flashLED == "Limit Violation") {
+        if(String(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?
-        logger->logDebug(GwLog::LOG, "Drawing at PageRollPitch, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
+        LOG_DEBUG(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
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // Show roll limit
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 65);
+        getdisplay().setCursor(10, 65);
-        epd->print(rolllimit);                   // Value
+        getdisplay().print(rolllimit);                   // Value
-        //epd->print(svalue1);                   // Value
+        //getdisplay().print(svalue1);                   // Value
 
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 95);
+        getdisplay().setCursor(10, 95);
-        epd->print("Limit");                     // Name
+        getdisplay().print("Limit");                     // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 115);
+        getdisplay().setCursor(10, 115);
-        epd->print("DEG");
+        getdisplay().print("DEG");
 
         // Horizintal separator left
-        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show roll value
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 270);
+        getdisplay().setCursor(10, 270);
-        if(holdvalues == false) epd->print(svalue1); // Value
+        if(holdvalues == false) getdisplay().print(svalue1); // Value
-        else epd->print(svalue1old);
+        else getdisplay().print(svalue1old);
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 220);
+        getdisplay().setCursor(10, 220);
-        epd->print(name1);                           // Name
+        getdisplay().print(name1);                           // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 190);
+        getdisplay().setCursor(10, 190);
-        epd->print("Deg");
+        getdisplay().print("Deg");
 
         // Horizintal separator right
-        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
+        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show pitch value
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(295, 270);
+        getdisplay().setCursor(295, 270);
-        if(holdvalues == false) epd->print(svalue2); // Value
+        if(holdvalues == false) getdisplay().print(svalue2); // Value
-        else epd->print(svalue2old);
+        else getdisplay().print(svalue2old);
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(335, 220);
+        getdisplay().setCursor(335, 220);
-        epd->print(name2);                           // Name
+        getdisplay().print(name2);                           // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(335, 190);
+        getdisplay().setCursor(335, 190);
-        epd->print("Deg");
+        getdisplay().print("Deg");
 
 //*******************************************************************************************
 
@@ -170,8 +169,8 @@ public:
         int rInstrument = 100;     // Radius of instrument
         float pi = 3.141592;
 
-        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -195,17 +194,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
-                epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+                getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-                epd->setCursor(x-w/2, y+h/2);
+                getdisplay().setCursor(x-w/2, y+h/2);
                 if(i % 20 == 0){
-                    epd->setFont(&Ubuntu_Bold8pt8b);
+                    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                    epd->print(ii);
+                    getdisplay().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);
-                epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+                getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
                 float sinx=sin(i/180.0*M_PI);
                 float cosx=cos(i/180.0*M_PI);
 
@@ -216,10 +215,10 @@ public:
                     float xx2 = +dx;
                     float yy1 =  -(rInstrument-10);
                     float yy2 =  -(rInstrument+10);
-                    epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                    getdisplay().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);
-                    epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                    getdisplay().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);
                 }
@@ -240,7 +239,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.7);
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().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
@@ -250,28 +249,28 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.7);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().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
-            epd->fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
+            getdisplay().fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
         }
 
         // Center circle
-        epd->fillCircle(200, 150, startwidth + 22, commonData->bgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 22, commonData->bgcolor);
-        epd->fillCircle(200, 150, startwidth + 20, commonData->fgcolor);      // Boat circle
+        getdisplay().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);
-        epd->fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (right triangle)
+        getdisplay().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);
-        epd->fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (left triangle)
+        getdisplay().fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (left triangle)
-        epd->fillRect(150, 160, 100, 4, commonData->fgcolor);                 // Water line
+        getdisplay().fillRect(150, 160, 100, 4, commonData->fgcolor);                 // Water line
 
         // Draw roll pointer
         startwidth = 4;     // Start width of pointer
@@ -284,7 +283,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument - 15);
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().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
@@ -294,15 +293,15 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument - 15);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().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
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(145, 200);
+            getdisplay().setCursor(145, 200);
-            epd->print("No sensor data");            // Info missing sensor
+            getdisplay().print("No sensor data");            // Info missing sensor
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageRudderPosition.cpp

@@ -1,29 +1,19 @@
-// 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) : Page(common)
+    PageRudderPosition(CommonData &common){
-    {
+        commonData = &common;
-        logger->logDebug(GwLog::LOG, "Instantiate PageRudderPosition");
+        common.logger->logDebug(GwLog::LOG,"Show PageRudderPosition");
-
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
     }
 
     // Key functions
-    int handleKey(int key) {
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -32,64 +22,69 @@ public:
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+   int displayPage(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 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 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = 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
+        String unit1 = 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 * M_PI;
+                value1 = (3 + float(random(0, 50)) / 10.0)/360*2*PI;
                 unit1 = "Deg";
-            } else {
+            }
+            else{
                 value1 = 0;
             }
         }
 
-        // Log boat values
+        // Optical warning by limit violation (unused)
-        logger->logDebug(GwLog::LOG, "Drawing at PageRudderPosition, %s:%f", name1.c_str(), value1);
+        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 PageRudderPosition, %s:%f", name1.c_str(), value1);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
 //*******************************************************************************************
         
         // Draw RudderPosition
         int rInstrument = 110;     // Radius of RudderPosition
-        const float pi = 3.141592;
+        float pi = 3.141592;
 
-        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
-        epd->fillRect(0, 30, 400, 122, commonData->bgcolor);                      // Delete half top circle
+        getdisplay().fillRect(0, 30, 400, 122, commonData->bgcolor);                      // Delete half top circle
 
         for(int i=90; i<=270; i=i+10)
         {
@@ -97,50 +92,51 @@ 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 30 : ii=" "; break;
+            case 0: ii=" "; break;      // Use a blank for a empty scale value
-                case 60 : ii=" "; break;
+            case 30 : ii=" "; break;
-                case 90 : ii="45"; break;
+            case 60 : ii=" "; break;
-                case 120 : ii="30"; break;
+            case 90 : ii="45"; break;
-                case 150 : ii="15"; break;
+            case 120 : ii="30"; break;
-                case 180 : ii="0"; break;
+            case 150 : ii="15"; break;
-                case 210 : ii="15"; break;
+            case 180 : ii="0"; break;
-                case 240 : ii="30"; break;
+            case 210 : ii="15"; break;
-                case 270 : ii="45"; break;
+            case 240 : ii="30"; break;
-                case 300 : ii=" "; break;
+            case 270 : ii="45"; break;
-                case 330 : ii=" "; break;
+            case 300 : ii=" "; break;
-                default: break;
+            case 330 : ii=" "; 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
-            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            epd->setCursor(x-w/2, y+h/2);
+            getdisplay().setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                epd->setFont(&Ubuntu_Bold8pt8b);
+                getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                epd->print(ii);
+                getdisplay().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);
-            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            getdisplay().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);
-                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                getdisplay().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);
-                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                getdisplay().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);
             }
@@ -148,28 +144,28 @@ public:
         }
 
         // Print label
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(80, 70);
+        getdisplay().setCursor(80, 70);
-        epd->print("Rudder Position");               // Label
+        getdisplay().print("Rudder Position");               // Label
 
         // Print Unit in RudderPosition
         if(valid1 == true || simulation == true){
             if(holdvalues == false){
-                epd->setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                epd->setCursor(175, 110);
+                getdisplay().setCursor(175, 110);
-                epd->print(unit1);                   // Unit
+                getdisplay().print(unit1);                   // Unit
             }
             else{
-                epd->setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                epd->setCursor(175, 110);
+                getdisplay().setCursor(175, 110);
-                epd->print(unit1old);                // Unit
+                getdisplay().print(unit1old);                // Unit
             }
         }
         else{
             // Print Unit of keel position
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(145, 110);
+            getdisplay().setCursor(145, 110);
-            epd->print("No sensor data");            // Info missing sensor
+            getdisplay().print("No sensor data");            // Info missing sensor
             }
 
         // Calculate rudder position
@@ -192,7 +188,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.5); 
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().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
@@ -202,14 +198,14 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.5);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().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
-        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageSixValues.cpp

@@ -1,12 +1,8 @@
-// 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;
@@ -18,13 +14,13 @@ const int HowManyValues = 6;
 
 class PageSixValues : public Page
 {
-public:
+    public:
-    PageSixValues(CommonData &common) : Page(common)
+    PageSixValues(CommonData &common){
-    {
+        commonData = &common;
-        logger->logDebug(GwLog::LOG, "Instantiate PageSixValues");
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageSixValues");
     }
 
-    int handleKey(int key) {
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -33,133 +29,130 @@ public:
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+    int displayPage(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) {
          
-        // Old values for hold function
+            // Old values for hold function
-        static String OldDataText[HowManyValues] = {"", "", "", "", "", ""};
+            static String OldDataText[HowManyValues] = {"", "", "", "", "", ""};
-        static String OldDataUnits[HowManyValues] = {"", "", "", "", "", ""};
+            static String OldDataUnits[HowManyValues] = {"", "", "", "", "", ""};
     
-        // Get config data
+            // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
+            String lengthformat = config->getString(config->lengthFormat);
-        // bool simulation = config->getBool(config->useSimuData);
+            // bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
+            bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
+            String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
+            String backlightMode = config->getString(config->backlight);
             
-        GwApi::BoatValue *bvalue;
+            GwApi::BoatValue *bvalue;
-        String DataName[HowManyValues];
+            String DataName[HowManyValues];
-        double DataValue[HowManyValues];
+            double DataValue[HowManyValues];
-        bool DataValid[HowManyValues];
+            bool DataValid[HowManyValues];
-        String DataText[HowManyValues];
+            String DataText[HowManyValues];
-        String DataUnits[HowManyValues];
+            String DataUnits[HowManyValues];
-        String DataFormat[HowManyValues];
+            String DataFormat[HowManyValues];
     
-        for (int i = 0; i < HowManyValues; i++){
+            for (int i = 0; i < HowManyValues; i++){
-            bvalue = pageData.values[i];
+                bvalue = pageData.values[i];
-            DataName[i] = xdrDelete(bvalue->getName());
+                DataName[i] = xdrDelete(bvalue->getName());
-            DataName[i] = DataName[i].substring(0, 6);                  // String length limit for value name
+                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
-            calibrationData.calibrateInstance(bvalue, logger);          // Check if boat data value is to be calibrated
+                DataValue[i] = bvalue->value;                 // Value as double in SI unit
-#endif
+                DataValid[i] = bvalue->valid;
-            DataValue[i] = bvalue->value;                 // Value as double in SI unit
+                DataText[i] = formatValue(bvalue, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-            DataValid[i] = bvalue->valid;
+                DataUnits[i] = formatValue(bvalue, *commonData).unit;   
-            DataText[i] = commonData->fmt->formatValue(bvalue, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+                DataFormat[i] = bvalue->getFormat();     // Unit of value
-            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
+            // Optical warning by limit violation (unused)
-                epd->setFont(&Ubuntu_Bold12pt8b);
+            if(String(flashLED) == "Limit Violation"){
-                epd->setCursor(x0, y0+25);
+                setBlinkingLED(false);
-                epd->print(DataName[ValueIndex]);                           // Page name
+                setFlashLED(false); 
+            }
     
-                // Show unit
+            if (bvalue == NULL) return PAGE_OK; // WTF why this statement?
-                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
+            // Draw page
-                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
+            // Set display in partial refresh mode
-                if (holdvalues == false) {
+            getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-                    epd->print(DataText[ValueIndex]); // Real value as formated string
+            getdisplay().setTextColor(commonData->fgcolor);
-                } else{
+
-                    epd->print(OldDataText[ValueIndex]); // Old value as formated string
+            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
-                if (DataValid[ValueIndex] == true) {
+                   // Horizontal line 3 pix
-                    OldDataText[ValueIndex] = DataText[ValueIndex];                                       // Save the old value
+                    getdisplay().fillRect(0, SixValues_y1+(i+1)*SixValues_DeltaY, 400, 3, commonData->fgcolor);
-                    OldDataUnits[ValueIndex] = DataUnits[ValueIndex];                                           // Save the old unit
+                }
-                }
+                for (int j = 0; j < 2; j++){
-            } // for j
+                    int ValueIndex = i * 2 + j;
-            // Vertical line 3 pix
+                    int x0 = SixValues_x1 + j * SixValues_DeltaX;
-            epd->fillRect(SixValues_x1+SixValues_DeltaX-8, SixValues_y1+i*SixValues_DeltaY, 3, SixValues_DeltaY, commonData->fgcolor);
+                    int y0 = SixValues_y1 + i * SixValues_DeltaY;
-        } // for i
+                    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;
+        };
     
-        return PAGE_UPDATE;
     };
-    
-};
-
 static Page *createPage(CommonData &common){
     return new PageSixValues(common);
 }/**

lib/obp60task/PageSkyView.cpp

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

lib/obp60task/PageSolar.cpp

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

lib/obp60task/PageThreeValues.cpp

@@ -1,28 +1,18 @@
-// 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
 {
-private:
+    public:
-    String lengthformat;
+    PageThreeValues(CommonData &common){
-
+        commonData = &common;
-public:
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageThreeValue");
-    PageThreeValues(CommonData &common) : Page(common)
-    {
-        logger->logDebug(GwLog::LOG, "Instantiate PageThreeValue");
-
-        // Get config data
-        lengthformat = config->getString(config->lengthFormat);
     }
 
-    int handleKey(int key){
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -31,17 +21,9 @@ public:
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+    int displayPage(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) {
 
         // Old values for hold function
         static String svalue1old = "";
@@ -51,92 +33,97 @@ public:
         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 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = 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
+        String unit1 = 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 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = 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
+        String unit2 = 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 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
 
-        // Log boat values
+        // Optical warning by limit violation (unused)
-        logger->logDebug(GwLog::LOG, "Drawing at PageThreeValues, %s: %f, %s: %f, %s: %f",
+        if(String(flashLED) == "Limit Violation"){
-            name1.c_str(), value1,
+            setBlinkingLED(false);
-            name2.c_str(), value2,
+            setFlashLED(false); 
-            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
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 55);
+        getdisplay().setCursor(20, 55);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 90);
+        getdisplay().setCursor(20, 90);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(50, 90);
+            getdisplay().setCursor(50, 90);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(170, 68);
+            getdisplay().setCursor(170, 68);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-            epd->setCursor(180, 90);
+            getdisplay().setCursor(180, 90);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -146,45 +133,45 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 145);
+        getdisplay().setCursor(20, 145);
-        epd->print(name2);                           // Page name
+        getdisplay().print(name2);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 180);
+        getdisplay().setCursor(20, 180);
         if(holdvalues == false){
-            epd->print(unit2);                       // Unit
+            getdisplay().print(unit2);                       // Unit
         }
         else{
-            epd->print(unit2old);
+            getdisplay().print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(50, 180);
+            getdisplay().setCursor(50, 180);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(170, 158);
+            getdisplay().setCursor(170, 158);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-            epd->setCursor(180, 180);
+            getdisplay().setCursor(180, 180);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue2);                                     // Real value as formated string
+            getdisplay().print(svalue2);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue2old);                                  // Old value as formated string
+            getdisplay().print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -194,45 +181,45 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 235);
+        getdisplay().setCursor(20, 235);
-        epd->print(name3);                           // Page name
+        getdisplay().print(name3);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 270);
+        getdisplay().setCursor(20, 270);
         if(holdvalues == false){
-            epd->print(unit3);                       // Unit
+            getdisplay().print(unit3);                       // Unit
         }
         else{
-            epd->print(unit3old);
+            getdisplay().print(unit3old);
         }
 
         // Switch font if format for any values
         if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(50, 270);
+            getdisplay().setCursor(50, 270);
         }
         else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(170, 248);
+            getdisplay().setCursor(170, 248);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-            epd->setCursor(180, 270);
+            getdisplay().setCursor(180, 270);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue3);                                     // Real value as formated string
+            getdisplay().print(svalue3);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue3old);                                  // Old value as formated string
+            getdisplay().print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value

lib/obp60task/PageTracker.cpp

@@ -1,58 +1,220 @@
 // 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
+
+  In start phase big timer.
+  Eventually after start other display because timer not needed any 
+  more. Race timer smaller on top right corner. Reserved space for
+  message area. 
+
+    4 Positions for flags
+    +-----+-----+
+    |  1  |  2  |
+    +-----+-----+
+    |  3  |  4  |
+    +-----+-----+
+
+
 */
 
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+
+// Flags
+#include "images/alpha.xbm"
+#include "images/answer.xbm"
+#include "images/black.xbm"
+#include "images/blue.xbm"
+#include "images/charlie.xbm"
+#include "images/class.xbm"
+#include "images/finish.xbm"
+#include "images/hotel.xbm"
+#include "images/india.xbm"
+#include "images/november.xbm"
+#include "images/orange.xbm"
+#include "images/papa.xbm"
+#include "images/repeat_one.xbm"
+#include "images/sierra.xbm"
+#include "images/start.xbm"
+#include "images/uniform.xbm"
+#include "images/xray.xbm"
+#include "images/yankee.xbm"
+#include "images/zulu.xbm"
+
 class PageTracker : public Page
 {
 private:
-
     char mode = 'N'; // (N)ormal, (C)onfig
+    bool simulation = false;
+    String flashLED;
+
+    String trackerType;
+    String trackerOrganisation;
+    String trackerTeam;
+    String sailClub;
+    String boatName;
+    String boatClass;
+    String boatSailNumber;
+    float boatHandicap;
 
     void displayModeNormal(PageData &pageData) {
 
         // TBD Boatvalues: ...
 
-        logger->logDebug(GwLog::DEBUG,"Drawing at PageTracker");
-
         // Title
-        epd->setTextColor(commonData->fgcolor);
+/*        getdisplay().setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(8, 48);
+        getdisplay().setCursor(8, 48);
-        epd->print("Tracker");
+        getdisplay().print("Tracker"); */
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setCursor(8, 42);
+        if (trackerType == "NONE") {
+            getdisplay().print("Disabled!");
+        } else {
+            getdisplay().print(trackerType);
+        }
+
+        // Timer
+        getdisplay().setCursor(16, 120);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
+        getdisplay().print("-00:00");
+
+        getdisplay().drawXBitmap(4, 140, class_bits, class_width, class_height, commonData->fgcolor);
+        getdisplay().drawXBitmap(102, 140, start_bits, start_width, start_height, commonData->fgcolor);
+        getdisplay().drawXBitmap(202, 140, finish_bits, finish_width, finish_height, commonData->fgcolor);
+
+        getdisplay().drawXBitmap(4, 210, alpha_bits, alpha_width, alpha_height, commonData->fgcolor);
+        getdisplay().drawXBitmap(102, 210, answer_bits, answer_width, answer_height, commonData->fgcolor);
+        getdisplay().drawXBitmap(202, 210, papa_bits, papa_width, papa_height, commonData->fgcolor);
+        getdisplay().drawXBitmap(302, 210, yankee_bits, yankee_width, yankee_height, commonData->fgcolor);
 
     }
 
     void displayModeConfig() {
 
-        epd->setTextColor(commonData->fgcolor);
+        uint16_t x0 = 8;  // left label column
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        uint16_t x1 = 112; // data starts here
-        epd->setCursor(8, 48);
+        uint16_t y0 = 48;
-        epd->print("Tracker configuration");
 
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setTextColor(commonData->fgcolor);
-        // TODO
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setCursor(x0, 48);
+        getdisplay().print("Tracker configuration");
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+
+        // Boat data left column
+        getdisplay().setFont(&Ubuntu_Bold10pt8b);
+        getdisplay().setCursor(x0, 75);
+        getdisplay().print("Boat data");
+
+        y0 = 96;
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setCursor(x0, y0);
+        getdisplay().print("Boat name");
+        getdisplay().setCursor(x1, y0);
+        getdisplay().print(boatName);
+
+        getdisplay().setCursor(x0, y0 + 16);
+        getdisplay().print("Boat class");
+        getdisplay().setCursor(x1, y0 + 16);
+        getdisplay().print(boatClass);
+
+        getdisplay().setCursor(x0, y0 + 32);
+        getdisplay().print("Handicap");
+        getdisplay().setCursor(x1, y0 + 32);
+        getdisplay().print(boatHandicap, 1);
+
+        getdisplay().setCursor(x0, y0 + 48);
+        getdisplay().print("Sail club");
+        getdisplay().setCursor(x1, y0 + 48);
+        getdisplay().print(sailClub);
+
+        getdisplay().setCursor(x0, y0 + 64);
+        getdisplay().print("Sail number");
+        getdisplay().setCursor(x1, y0 + 64);
+        getdisplay().print(boatSailNumber);
+
+        // Tracker data, right column
+        x0 = 208;
+        x1 = 304;
+        getdisplay().setFont(&Ubuntu_Bold10pt8b);
+        getdisplay().setCursor(x0, 75);
+        getdisplay().print("Tracker info");
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+
+        getdisplay().setCursor(x0, y0);
+        getdisplay().print("Status");
+        getdisplay().setCursor(x1, y0);
+        if (trackerType == "NONE") {
+            getdisplay().print("Disabled");
+        } else {
+            getdisplay().printf("Type: %s", trackerType);
+        }
+
+        getdisplay().setCursor(x0, y0 + 16);
+        getdisplay().print("Org.");
+        getdisplay().setCursor(x1, y0 + 16);
+        getdisplay().print(trackerOrganisation);
+
+        getdisplay().setCursor(x0, y0 + 32);
+        getdisplay().print("Team");
+        getdisplay().setCursor(x1, y0 + 32);
+        getdisplay().print(trackerTeam);
+
+
+        // Ragatta selection
+        y0 = 180;
+        getdisplay().setFont(&Ubuntu_Bold10pt8b);
+        getdisplay().setCursor(x0, y0);
+        getdisplay().print("Regattas");
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+
+        // A) Regatta Hero:
+        // Server Hostname, IP, Port
+        // Organisation
+        // Boat name
+        //
+
+        // B) SD-Card: check if card available
+        // log interval: via config in seconds. min=?
+
+        // C) Server: e.g. Raspi in Boat WLAN, own Internet-Server
+        // display connection state to server here
 
     }
 
 public:
-    PageTracker(CommonData &common) : Page(common)
+    PageTracker(CommonData &common)
     {
-        logger->logDebug(GwLog::LOG, "Instantiate PageTracker");
+        commonData = &common;
+        common.logger->logDebug(GwLog::LOG, "Instantiate PageTracker");
+        flashLED = common.config->getString(common.config->flashLED);
+        simulation = common.config->getBool(common.config->useSimuData);
+
+        trackerType = common.config->getString(common.config->trackerType);
+        trackerOrganisation = common.config->getString(common.config->trackerOrg);
+        trackerTeam = common.config->getString(common.config->trackerTeam);
+
+        boatName = common.config->getString(common.config->boatName);
+        boatClass = common.config->getString(common.config->boatClass);
+        boatSailNumber = common.config->getString(common.config->boatSailnumber);
+        sailClub = common.config->getString(common.config->sailClub);
+        boatHandicap = common.config->getString(common.config->boatHandicap).toFloat();
+
     }
 
     void setupKeys(){
         Page::setupKeys();
-        commonData->keydata[0].label = "START";
+        commonData->keydata[0].label = "MODE";
-        commonData->keydata[1].label = "STOP";
     }
 
     int handleKey(int key){
@@ -82,18 +244,19 @@ public:
     };
 
     int displayPage(PageData &pageData){
+        GwLog *logger = commonData->logger;
 
         // 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());
+        getdisplay().setPartialWindow(0, 0,getdisplay().width(), getdisplay().height());
 
-       if (mode == 'N') {
+        if (mode == 'N') {
-           displayModeNormal(pageData);
+            displayModeNormal(pageData);
-       } else if (mode == 'C') {
+        } else if (mode == 'C') {
-           displayModeConfig();
+            displayModeConfig();
-       }
+        }
 
         return PAGE_UPDATE;
     };
@@ -114,7 +277,7 @@ 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)
+    {"LAT", "LON", "SOG"}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
     true        // Show display header on/off
 );
 

lib/obp60task/PageTwoValues.cpp

@@ -1,28 +1,18 @@
-// 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 PageTwoValues : public Page
 {
-private:
+    public:
-    String lengthformat;
+    PageTwoValues(CommonData &common){
-
+        commonData = &common;
-public:
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageTwoValue");
-    PageTwoValues(CommonData &common) : Page(common)
-    {
-        logger->logDebug(GwLog::LOG, "Instantiate PageTwoValue");
-
-        // Get config data
-        lengthformat = config->getString(config->lengthFormat);
     }
 
-    int handleKey(int key){
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -31,17 +21,9 @@ public:
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+    int displayPage(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) {
 
         // Old values for hold function
         static String svalue1old = "";
@@ -49,79 +31,87 @@ public:
         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);
         
         // 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 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = 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
+        String unit1 = 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 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = 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
+        String unit2 = 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?
-        logger->logDebug(GwLog::LOG, "Drawing at PageTwoValues, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2);
+        LOG_DEBUG(GwLog::LOG,"Drawing at PageTwoValues, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 80);
+        getdisplay().setCursor(20, 80);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 130);
+        getdisplay().setCursor(20, 130);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(50, 130);
+            getdisplay().setCursor(50, 130);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(170, 105);
+            getdisplay().setCursor(170, 105);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
-            epd->setCursor(180, 130);
+            getdisplay().setCursor(180, 130);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -131,45 +121,45 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 145, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 145, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 190);
+        getdisplay().setCursor(20, 190);
-        epd->print(name2);                           // Page name
+        getdisplay().print(name2);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 240);
+        getdisplay().setCursor(20, 240);
         if(holdvalues == false){
-            epd->print(unit2);                       // Unit
+            getdisplay().print(unit2);                       // Unit
         }
         else{
-            epd->print(unit2old);
+            getdisplay().print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(50, 240);
+            getdisplay().setCursor(50, 240);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(170, 215);
+            getdisplay().setCursor(170, 215);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
-            epd->setCursor(180, 240);
+            getdisplay().setCursor(180, 240);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue2);                                     // Real value as formated string
+            getdisplay().print(svalue2);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue2old);                                  // Old value as formated string
+            getdisplay().print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value

lib/obp60task/PageVoltage.cpp

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

lib/obp60task/PageWhite.cpp

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

lib/obp60task/PageWind.cpp

@@ -1,13 +1,9 @@
-// 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
@@ -218,21 +214,15 @@ static unsigned char front_bits[] PROGMEM = {
 
 class PageWind : public Page
 {
-private:
+bool keylock = false;               // Keylock
-    String lengthformat;
+int8_t lp = 80;                     // Pointer length
-    bool keylock = false;   // Keylock
+char mode = 'N';                    // page mode (N)ormal | (L)ens | e(X)ample
-    int8_t lp = 80;         // Pointer length
+char source = 'A';                  // data source (A)pparent | (T)rue
-    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) : Page(common)
+    PageWind(CommonData &common){
-    {
+        commonData = &common;
-        logger->logDebug(GwLog::LOG, "Instantiate PageWind");
+        common.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);
@@ -240,7 +230,7 @@ public:
         }
     }
 
-    void setupKeys() {
+    virtual void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "MODE";
         if (mode == 'X') {
@@ -252,7 +242,7 @@ public:
     }
 
     // Key functions
-    int handleKey(int key) {
+    virtual int handleKey(int key){
 
         if(key == 1){               // Mode switch
             if(mode == 'N'){
@@ -306,23 +296,23 @@ public:
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+    int displayPage(PageData &pageData)
-#ifdef BOARD_OBP60S3
+    {
-        // Clear optical warning
+        GwConfigHandler *config = commonData->config;
-        if (flashLED == "Limit Violation") {
+        GwLog *logger = commonData->logger;
-            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
 
@@ -334,13 +324,11 @@ 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 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = 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
+        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
 
         // Get boat values for angle (AWD/TWD)
         if (source == 'A') {
@@ -350,70 +338,74 @@ 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 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = 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
+        String unit2 = 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?
-        logger->logDebug(GwLog::LOG, "Drawing at PageWind, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
+        LOG_DEBUG(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
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
 
         if (mode == 'X') {
             // Original example code with scaling circle
 
             // Show values AWS/TWS
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(20, 50);
+            getdisplay().setCursor(20, 50);
-            epd->print(name1);                       // Value name
+            getdisplay().print(name1);                       // Value name
-            epd->print(": ");
+            getdisplay().print(": ");
             if(holdvalues == false){
-                epd->print(svalue1);                     // Value
+                getdisplay().print(svalue1);                     // Value
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(unit1);                       // Unit
+                getdisplay().print(unit1);                       // Unit
             }
             else{
-                epd->print(svalue1old);                  // Value old
+                getdisplay().print(svalue1old);                  // Value old
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(unit1old);                    // Unit old
+                getdisplay().print(unit1old);                    // Unit old
             }
 
             // Show values AWD/TWD
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(20, 260);
+            getdisplay().setCursor(20, 260);
-            epd->print(name2);                       // Value name
+            getdisplay().print(name2);                       // Value name
-            epd->print(": ");
+            getdisplay().print(": ");
             if(holdvalues == false){
-                epd->print(svalue2);                     // Value
+                getdisplay().print(svalue2);                     // Value
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(unit2);                       // Unit
+                getdisplay().print(unit2);                       // Unit
             }
             else{
-                epd->print(svalue2old);                  // Value old
+                getdisplay().print(svalue2old);                  // Value old
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(unit2old);                    // Unit old
+                getdisplay().print(unit2old);                    // Unit old
             }
 
             Point c = {200, 145};
 
             // Draw instrument
-            epd->fillCircle(c.x, c.y, lp + 5, commonData->fgcolor);
+            getdisplay().fillCircle(c.x, c.y, lp + 5, commonData->fgcolor);
-            epd->fillCircle(c.x, c.y, lp + 1, commonData->bgcolor);
+            getdisplay().fillCircle(c.x, c.y, lp + 1, commonData->bgcolor);
 
             // Wind pointer
             if (bvalue2->valid or simulation) {
@@ -428,7 +420,7 @@ public:
                 };
                 fillPoly4(rotatePoints(c, pts, RadToDeg(value2)), commonData->fgcolor);
             } else {
-                epd->setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 
@@ -446,7 +438,7 @@ public:
             };
             int angle;
 
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
 
             // starbord
             // text with line
@@ -461,7 +453,7 @@ public:
             for (int i = 30; i < 138; i += 6) {
                  if (i % 15 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      epd->fillCircle(p.x, p.y, 2, commonData->fgcolor);
+                      getdisplay().fillCircle(p.x, p.y, 2, commonData->fgcolor);
                  }
             }
 
@@ -478,17 +470,17 @@ public:
             for (int i = 228; i < 330; i += 6) {
                  if (i % 15 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      epd->fillCircle(p.x, p.y, 2, commonData->fgcolor);
+                      getdisplay().fillCircle(p.x, p.y, 2, commonData->fgcolor);
                  }
             }
 
             // data source
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(8, 50);
+            getdisplay().setCursor(8, 50);
             if (source == 'A') {
-                epd->print("APP");
+                getdisplay().print("APP");
             } else {
-                epd->print("TRUE");
+                getdisplay().print("TRUE");
             }
 
             // Wind pointer (angle)
@@ -508,7 +500,7 @@ public:
                     alpha *= -1;
                 }
 
-                epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
+                getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
                 pts = {
                     {c.x - 1, c.y - (r - 20)},
                     {c.x + 1, c.y - (r - 20)},
@@ -516,39 +508,39 @@ public:
                     {c.x - 6, c.y + 15}
                 };
                 fillPoly4(rotatePoints(c, pts, alpha), commonData->fgcolor);
-                epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
+                getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
             } else {
-                epd->setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 
             // Wind speed as decimal number
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(150, 250);
+            getdisplay().setCursor(150, 250);
             if (holdvalues == false) {
-                epd->print(svalue1);
+                getdisplay().print(svalue1);
             } else {
-                epd->print(svalue1old);
+                getdisplay().print(svalue1old);
             }
             // unit
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(220, 265);
+            getdisplay().setCursor(220, 265);
-            epd->print("kts");
+            getdisplay().print("kts");
         }
         else {
             // Normal mode
 
             // data source
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(8, 50);
+            getdisplay().setCursor(8, 50);
             if (source == 'A') {
-                epd->print("APP");
+                getdisplay().print("APP");
             } else {
-                epd->print("TRUE");
+                getdisplay().print("TRUE");
             }
 
             // draw ship front symbol (as bitmap)
-            epd->drawXBitmap(140, 30, front_bits, front_width, front_height, commonData->fgcolor);
+            getdisplay().drawXBitmap(140, 30, front_bits, front_width, front_height, commonData->fgcolor);
 
             Point c = {200, 155};
             uint16_t r = 150;
@@ -573,7 +565,7 @@ public:
             for (int i = 30; i < 150; i += 10) {
                  if (i % 30 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
+                      getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
                  }
             }
 
@@ -590,27 +582,27 @@ public:
             for (int i = 210; i < 340; i += 10) {
                  if (i % 30 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
+                      getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
                  }
             }
 
             // Wind speed as decimal number
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(150, 250);
+            getdisplay().setCursor(150, 250);
             if (holdvalues == false) {
-                epd->print(svalue1);
+                getdisplay().print(svalue1);
             } else {
-                epd->print(svalue1old);
+                getdisplay().print(svalue1old);
             }
             // unit
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(220, 265);
+            getdisplay().setCursor(220, 265);
-            epd->print("kts");
+            getdisplay().print("kts");
 
             // Wind pointer (angle)
             if (bvalue2->valid or simulation) {
                 float alpha = RadToDeg(value2);
-                epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
+                getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
                 pts = {
                     {c.x - 1, c.y - (r - 20)},
                     {c.x + 1, c.y - (r - 20)},
@@ -618,9 +610,9 @@ public:
                     {c.x - 6, c.y + 15}
                 };
                 fillPoly4(rotatePoints(c, pts, alpha), commonData->fgcolor);
-                epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
+                getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
             } else {
-                epd->setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 

lib/obp60task/PageWindPlot.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -77,7 +76,7 @@ int getRng(const RingBuffer<int16_t>& windDirHstry, int center, size_t amount)
 
 // ****************************************************************
 class PageWindPlot : public Page {
-private:
+
     bool keylock = false; // Keylock
     char chrtMode = 'D'; // Chart mode: 'D' for TWD, 'S' for TWS, 'B' for both
     bool showTruW = true; // Show true wind or apparant wind in chart area
@@ -85,16 +84,28 @@ private:
 
     int dataIntv = 1; // Update interval for wind history chart:
                       // (1)|(2)|(3)|(4) seconds for approx. 4, 8, 12, 16 min. history chart
+    bool useSimuData;
+    String flashLED;
+    String backlightMode;
 
 public:
-    PageWindPlot(CommonData& common) : Page(common)
+    PageWindPlot(CommonData& common)
     {
-        logger->logDebug(GwLog::LOG, "Instantiate PageWindPlot");
+        commonData = &common;
+        common.logger->logDebug(GwLog::LOG, "Instantiate PageWindPlot");
+
+        // 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);
+
     }
 
-    void setupKeys() {
+    virtual void setupKeys()
+    {
         Page::setupKeys();
-        //        commonData->keydata[0].label = "MODE";
+        // commonData->keydata[0].label = "MODE";
 #if defined BOARD_OBP60S3
         commonData->keydata[1].label = "SRC";
         commonData->keydata[4].label = "INTV";
@@ -104,7 +115,8 @@ public:
     }
 
     // Key functions
-    int handleKey(int key) {
+    virtual int handleKey(int key)
+    {
         // Set chart mode TWD | TWS -> to be implemented
         if (key == 1) {
             if (chrtMode == 'D') {
@@ -149,14 +161,7 @@ public:
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+    virtual void displayNew(PageData &pageData){
-#ifdef BOARD_OBP60S3
-        // Clear optical warning
-        if (flashLED == "Limit Violation") {
-            setBlinkingLED(false);
-            setFlashLED(false);
-        }
-#endif
 #ifdef BOARD_OBP40S3
         String wndSrc; // Wind source true/apparant wind - preselection for OBP40
 
@@ -171,7 +176,10 @@ public:
         oldShowTruW = !showTruW; // makes wind source being initialized at initial page call
     }
 
-    int displayPage(PageData& pageData) {
+    int displayPage(PageData& pageData)
+    {
+        GwConfigHandler* config = commonData->config;
+        GwLog* logger = commonData->logger;
 
         static RingBuffer<int16_t>* wdHstry; // Wind direction data buffer
         static RingBuffer<uint16_t>* wsHstry; // Wind speed data buffer
@@ -221,12 +229,12 @@ public:
         int chrtVal; // Current wind value
         static int chrtPrevVal; // Last wind value in chart area for check if value crosses 180 degree line
 
-        logger->logDebug(GwLog::LOG, "Display PageWindPlot");
+        LOG_DEBUG(GwLog::LOG, "Display PageWindPlot");
         ulong timer = millis();
 
         if (!isInitialized) {
-            width = epd->width();
+            width = getdisplay().width();
-            height = epd->height();
+            height = getdisplay().height();
             xCenter = width / 2;
             cHeight = height - yOffset - 22;
             numNoData = 0;
@@ -290,14 +298,14 @@ public:
                 bufStart = max(0, bufStart - numAddedBufVals);
             }
         }
-        logger->logDebug(GwLog::DEBUG, "PageWindPlot Dataset: count: %d, xWD: %.1f, xWS: %.2f, xWD_valid? %d, intvBufSize: %d, numWndVals: %d, bufStart: %d, numAddedBufVals: %d, lastIdx: %d, wind source: %s",
+        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Dataset: count: %d, xWD: %.1f, xWS: %.2f, xWD_valid? %d, intvBufSize: %d, numWndVals: %d, bufStart: %d, numAddedBufVals: %d, lastIdx: %d, wind source: %s",
             count, wdHstry->getLast() / 1000.0 * radToDeg, wsHstry->getLast() / 1000.0 * 1.94384, BDataValid[0], intvBufSize, numWndVals, bufStart, numAddedBufVals, wdHstry->getLastIdx(),
             showTruW ? "True" : "App");
 
         // Set wndCenter from 1st real buffer value
         if (wndCenter == INT_MAX || (wndCenter == 0 && count == 1)) {
             wndCenter = getCntr(*wdHstry, numWndVals);
-            logger->logDebug(GwLog::DEBUG, "PageWindPlot Range Init: count: %d, xWD: %.1f, wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", count, wdHstry->getLast() / 1000.0 * radToDeg,
+            LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range Init: count: %d, xWD: %.1f, wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", count, wdHstry->getLast() / 1000.0 * radToDeg,
                 wndCenter, diffRng, chrtRng, wdHstry->getMin(numWndVals) / 1000.0 * radToDeg, wdHstry->getMax(numWndVals) / 1000.0 * radToDeg);
         } else {
             // check and adjust range between left, center, and right chart limit
@@ -307,7 +315,7 @@ public:
                 chrtRng = int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10; // Round up to next 10 degree value
             } else if (diffRng + 10 < chrtRng) { // Reduce chart range for higher resolution if possible
                 chrtRng = max(dfltRng, int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10);
-                logger->logDebug(GwLog::DEBUG, "PageWindPlot Range adjust: wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", wndCenter, diffRng, chrtRng,
+                LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range adjust: wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", wndCenter, diffRng, chrtRng,
                     wdHstry->getMin(numWndVals) / 1000.0 * radToDeg, wdHstry->getMax(numWndVals) / 1000.0 * radToDeg);
             }
         }
@@ -323,37 +331,37 @@ public:
         //***********************************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, width, height); // Set partial update
+        getdisplay().setPartialWindow(0, 0, width, height); // Set partial update
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // chart lines
-        epd->fillRect(0, yOffset, width, 2, commonData->fgcolor);
+        getdisplay().fillRect(0, yOffset, width, 2, commonData->fgcolor);
-        epd->fillRect(xCenter, yOffset, 1, cHeight, commonData->fgcolor);
+        getdisplay().fillRect(xCenter, yOffset, 1, cHeight, commonData->fgcolor);
 
         // chart labels
         char sWndLbl[4]; // char buffer for Wind angle label
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(xCenter - 88, yOffset - 3);
+        getdisplay().setCursor(xCenter - 88, yOffset - 3);
-        epd->print(wdName); // Wind data name
+        getdisplay().print(wdName); // Wind data name
         snprintf(sWndLbl, 4, "%03d", (wndCenter < 0) ? (wndCenter + 360) : wndCenter);
         drawTextCenter(xCenter, yOffset - 11, sWndLbl);
-        epd->drawCircle(xCenter + 25, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
+        getdisplay().drawCircle(xCenter + 25, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
-        epd->drawCircle(xCenter + 25, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
+        getdisplay().drawCircle(xCenter + 25, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
-        epd->setCursor(1, yOffset - 3);
+        getdisplay().setCursor(1, yOffset - 3);
         snprintf(sWndLbl, 4, "%03d", (wndLeft < 0) ? (wndLeft + 360) : wndLeft);
-        epd->print(sWndLbl); // Wind left value
+        getdisplay().print(sWndLbl); // Wind left value
-        epd->drawCircle(46, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
+        getdisplay().drawCircle(46, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
-        epd->drawCircle(46, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
+        getdisplay().drawCircle(46, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
-        epd->setCursor(width - 50, yOffset - 3);
+        getdisplay().setCursor(width - 50, yOffset - 3);
         snprintf(sWndLbl, 4, "%03d", (wndRight < 0) ? (wndRight + 360) : wndRight);
-        epd->print(sWndLbl); // Wind right value
+        getdisplay().print(sWndLbl); // Wind right value
-        epd->drawCircle(width - 5, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
+        getdisplay().drawCircle(width - 5, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
-        epd->drawCircle(width - 5, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
+        getdisplay().drawCircle(width - 5, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
 
         if (wdHstry->getMax() == wdMAX_VAL) {
             // only <MAX_VAL> values in buffer -> no valid wind data available
             wndDataValid = false;
-        } else if (!BDataValid[0] && !simulation) {
+        } else if (!BDataValid[0] && !useSimuData) {
             // currently no valid xWD data available and no simulation mode
             numNoData++;
             wndDataValid = true;
@@ -378,7 +386,7 @@ public:
                     y = yOffset + cHeight - i; // Position in chart area
 
                     if (i >= (numWndVals / dataIntv) - 1) // log chart data of 1 line (adjust for test purposes)
-                        logger->logDebug(GwLog::DEBUG, "PageWindPlot Chart: i: %d, chrtVal: %d, bufStart: %d, count: %d, linesToShow: %d", i, chrtVal, bufStart, count, (numWndVals / dataIntv));
+                        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Chart: i: %d, chrtVal: %d, bufStart: %d, count: %d, linesToShow: %d", i, chrtVal, bufStart, count, (numWndVals / dataIntv));
 
                     if ((i == 0) || (chrtPrevVal == wdMAX_VAL)) {
                         // just a dot for 1st chart point or after some invalid values
@@ -392,15 +400,15 @@ public:
                         if (((chrtPrevVal180 >= -180) && (chrtPrevVal180 < -90) && (chrtVal180 > 90)) || ((chrtPrevVal180 <= 179) && (chrtPrevVal180 > 90) && chrtVal180 <= -90)) {
                             // If current value crosses chart borders compared to previous value, split line
                             int xSplit = (((chrtPrevVal180 > 0 ? wndRight : wndLeft) - wndLeft + 360) % 360) * chrtScl;
-                            epd->drawLine(prevX, prevY, xSplit, y, commonData->fgcolor);
+                            getdisplay().drawLine(prevX, prevY, xSplit, y, commonData->fgcolor);
-                            epd->drawLine(prevX, prevY - 1, ((xSplit != prevX) ? xSplit : xSplit - 1), ((xSplit != prevX) ? y - 1 : y), commonData->fgcolor);
+                            getdisplay().drawLine(prevX, prevY - 1, ((xSplit != prevX) ? xSplit : xSplit - 1), ((xSplit != prevX) ? y - 1 : y), commonData->fgcolor);
                             prevX = (((chrtVal180 > 0 ? wndRight : wndLeft) - wndLeft + 360) % 360) * chrtScl;
                         }
                     }
 
                     // Draw line with 2 pixels width + make sure vertical line are drawn correctly
-                    epd->drawLine(prevX, prevY, x, y, commonData->fgcolor);
+                    getdisplay().drawLine(prevX, prevY, x, y, commonData->fgcolor);
-                    epd->drawLine(prevX, prevY - 1, ((x != prevX) ? x : x - 1), ((x != prevX) ? y - 1 : y), commonData->fgcolor);
+                    getdisplay().drawLine(prevX, prevY - 1, ((x != prevX) ? x : x - 1), ((x != prevX) ? y - 1 : y), commonData->fgcolor);
                     chrtPrevVal = chrtVal;
                     prevX = x;
                     prevY = y;
@@ -411,13 +419,13 @@ public:
 
                     int minWndDir = wdHstry->getMin(numWndVals) / 1000.0 * radToDeg;
                     int maxWndDir = wdHstry->getMax(numWndVals) / 1000.0 * radToDeg;
-                    logger->logDebug(GwLog::DEBUG, "PageWindPlot FreeTop: Minimum: %d, Maximum: %d, OldwndCenter: %d", minWndDir, maxWndDir, wndCenter);
+                    LOG_DEBUG(GwLog::DEBUG, "PageWindPlot FreeTop: Minimum: %d, Maximum: %d, OldwndCenter: %d", minWndDir, maxWndDir, wndCenter);
                     // if (((minWndDir - wndCenter >= 0) && (minWndDir - wndCenter < 180)) || ((maxWndDir - wndCenter <= 0) && (maxWndDir - wndCenter >=180))) {
                     if ((wndRight > wndCenter && (minWndDir >= wndCenter && minWndDir <= wndRight)) || (wndRight <= wndCenter && (minWndDir >= wndCenter || minWndDir <= wndRight)) || (wndLeft < wndCenter && (maxWndDir <= wndCenter && maxWndDir >= wndLeft)) || (wndLeft >= wndCenter && (maxWndDir <= wndCenter || maxWndDir >= wndLeft))) {
                         // Check if all wind value are left or right of center value -> optimize chart center
                         wndCenter = getCntr(*wdHstry, numWndVals);
                     }
-                    logger->logDebug(GwLog::DEBUG, "PageWindPlot FreeTop: cHeight: %d, bufStart: %d, numWndVals: %d, wndCenter: %d", cHeight, bufStart, numWndVals, wndCenter);
+                    LOG_DEBUG(GwLog::DEBUG, "PageWindPlot FreeTop: cHeight: %d, bufStart: %d, numWndVals: %d, wndCenter: %d", cHeight, bufStart, numWndVals, wndCenter);
                     break;
                 }
             }
@@ -443,46 +451,46 @@ public:
             wsValue = wsHstry->getLast();
             wsBVal->value = wsValue / 1000.0; // temp variable to retreive data unit from OBP60Formater
             wsBVal->valid = (static_cast<uint16_t>(wsValue) != wsHstry->getMinVal());
-            String swsValue = commonData->fmt->formatValue(wsBVal, *commonData).svalue; // value (string)
+            String swsValue = formatValue(wsBVal, *commonData).svalue; // value (string)
-            wsUnit = commonData->fmt->formatValue(wsBVal, *commonData).unit; // Unit of value
+            wsUnit = formatValue(wsBVal, *commonData).unit; // Unit of value
-            epd->fillRect(xPosTws - 4, yPosTws - 38, 142, 44, commonData->bgcolor); // Clear area for TWS value
+            getdisplay().fillRect(xPosTws - 4, yPosTws - 38, 142, 44, commonData->bgcolor); // Clear area for TWS value
-            epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-            epd->setCursor(xPosTws, yPosTws);
+            getdisplay().setCursor(xPosTws, yPosTws);
-            epd->print(swsValue); // Value
+            getdisplay().print(swsValue); // Value
 /*            if (!wsBVal->valid) {
-                epd->print("--.-");
+                getdisplay().print("--.-");
             } else {
-                wsValue = wsValue / 10.0 * 1.94384; // Wind speed value in knots
+                wsValue = wsValue / 1000.0 * 1.94384; // Wind speed value in knots
                 if (wsValue < 10.0) {
-                    epd->printf("!%3.1f", wsValue); // Value, round to 1 decimal
+                    getdisplay().printf("!%3.1f", wsValue); // Value, round to 1 decimal
                 } else {
-                    epd->printf("%4.1f", wsValue); // Value, round to 1 decimal
+                    getdisplay().printf("%4.1f", wsValue); // Value, round to 1 decimal
                 }
             } */
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(xPosTws + 82, yPosTws - 14);
+            getdisplay().setCursor(xPosTws + 82, yPosTws - 14);
-            epd->print(wsName); // Name
+            getdisplay().print(wsName); // Name
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(xPosTws + 82, yPosTws + 1);
+            getdisplay().setCursor(xPosTws + 82, yPosTws + 1);
-            epd->print(wsUnit); // Unit
+            getdisplay().print(wsUnit); // Unit
 
         } else {
             // No valid data available
             LOG_DEBUG(GwLog::LOG, "PageWindPlot: No valid data available");
-            epd->setFont(&Ubuntu_Bold10pt8b);
+            getdisplay().setFont(&Ubuntu_Bold10pt8b);
-            epd->fillRect(xCenter - 33, height / 2 - 20, 66, 24, commonData->bgcolor); // Clear area for message
+            getdisplay().fillRect(xCenter - 33, height / 2 - 20, 66, 24, commonData->bgcolor); // Clear area for message
             drawTextCenter(xCenter, height / 2 - 10, "No data");
         }
 
         // chart Y axis labels; print at last to overwrite potential chart lines in label area
         int yPos;
         int chrtLbl;
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
         for (int i = 1; i <= 3; i++) {
             yPos = yOffset + (i * 60);
-            epd->fillRect(0, yPos, width, 1, commonData->fgcolor);
+            getdisplay().fillRect(0, yPos, width, 1, commonData->fgcolor);
-            epd->fillRect(0, yPos - 8, 24, 16, commonData->bgcolor); // Clear small area to remove potential chart lines
+            getdisplay().fillRect(0, yPos - 8, 24, 16, commonData->bgcolor); // Clear small area to remove potential chart lines
-            epd->setCursor(1, yPos + 4);
+            getdisplay().setCursor(1, yPos + 4);
             if (count >= intvBufSize) {
                 // Calculate minute value for label
                 chrtLbl = ((i - 1 + (prevY < yOffset + 30)) * dataIntv) * -1; // change label if last data point is more than 30 lines (= seconds) from chart line
@@ -490,10 +498,10 @@ public:
                 int j = 3 - i;
                 chrtLbl = (int((((numWndVals / dataIntv) - 50) * dataIntv / 60) + 1) - (j * dataIntv)) * -1; // 50 lines left below last chart line
             }
-            epd->printf("%3d", chrtLbl); // Wind value label
+            getdisplay().printf("%3d", chrtLbl); // Wind value label
         }
 
-        logger->logDebug(GwLog::DEBUG, "PageWindPlot time: %ld", millis() - timer);
+        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot time: %ld", millis() - timer);
         return PAGE_UPDATE;
     };
 };
@@ -512,7 +520,7 @@ PageDescription registerPageWindPlot(
     "WindPlot", // Page name
     createPage, // Action
     0, // Number of bus values depends on selection in Web configuration
-    { "TWD", "AWD"}, // Bus values we need in the page
+    { "TWD", "AWD" }, // Bus values we need in the page
     true // Show display header on/off
 );
 

lib/obp60task/PageWindRose.cpp

@@ -1,30 +1,21 @@
-// 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 PageWindRose : public Page
 {
-private:
+int16_t lp = 80;                    // Pointer length
-    String lengthformat;
-    int16_t lp = 80; // Pointer length
 
 public:
-    PageWindRose(CommonData &common) : Page(common)
+    PageWindRose(CommonData &common){
-    {
+        commonData = &common;
-        logger->logDebug(GwLog::LOG, "Instantiate PageWindRose");
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageWindRose");
-
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
     }
 
     // Key functions
-    int handleKey(int key) {
+    virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -33,179 +24,222 @@ public:
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+    int displayPage(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 = "";
+        static String svalue3old = "";
+        static String unit3old = "";
+        static String svalue4old = "";
+        static String unit4old = "";
+        static String svalue5old = "";
+        static String unit5old = "";
+        static String svalue6old = "";
+        static String unit6old = "";
 
-        // storage for hold valued
+        // Get config data
-        static FormattedData bvf_awa_old;
+        String lengthformat = config->getString(config->lengthFormat);
-        static FormattedData bvf_aws_old;
+        bool simulation = config->getBool(config->useSimuData);
-        static FormattedData bvf_twd_old;
+        bool holdvalues = config->getBool(config->holdvalues);
-        static FormattedData bvf_tws_old;
+        String flashLED = config->getString(config->flashLED);
-        static FormattedData bvf_dbt_old;
+        String backlightMode = config->getString(config->backlight);
-        static FormattedData bvf_stw_old;
 
         // Get boat value for AWA
-        GwApi::BoatValue *bv_awa = pageData.values[0];     // First element in list
+        GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
-        String name_awa = xdrDelete(bv_awa->getName(), 6); // get name without prefix and limit length
+        String name1 = xdrDelete(bvalue1->getName());   // Value name
-#ifdef ENABLE_CALIBRATION
+        name1 = name1.substring(0, 6);                  // String length limit for value name
-        calibrationData.calibrateInstance(bv_awa, logger); // Check if boat data value is to be calibrated
+        calibrationData.calibrateInstance(bvalue1, logger); // Check if boat data value is to be calibrated
-#endif
+        double value1 = bvalue1->value;                 // Value as double in SI unit
-        FormattedData bvf_awa = commonData->fmt->formatValue(bv_awa, *commonData);
+        bool valid1 = bvalue1->valid;                   // Valid information
-        if (bv_awa->valid) { // Save formatted data for hold feature
+        value1 = formatValue(bvalue1, *commonData).value;// Format only nesaccery for simulation data for pointer
-            bvf_awa_old = bvf_awa;
+        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 *bv_aws = pageData.values[1]; // Second element in list
+        GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list
-        String name_aws = xdrDelete(bv_aws->getName(), 6); // get name without prefix and limit length
+        String name2 = xdrDelete(bvalue2->getName());   // Value name
-#ifdef ENABLE_CALIBRATION
+        name2 = name2.substring(0, 6);                  // String length limit for value name
-        calibrationData.calibrateInstance(bv_aws, logger); // Check if boat data value is to be calibrated
+        calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated
-#endif
+        double value2 = bvalue2->value;                 // Value as double in SI unit
-        FormattedData bvf_aws = commonData->fmt->formatValue(bv_aws, *commonData);
+        bool valid2 = bvalue2->valid;                   // Valid information 
-        if (bv_aws->valid) { // Save formatted data for hold feature
+        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-            bvf_aws_old = bvf_aws;
+        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 *bv_twd = pageData.values[2];  // Third element in list
+        GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third element in list
-        String name_twd = xdrDelete(bv_twd->getName(), 6); // get name without prefix and limit length
+        String name3 = xdrDelete(bvalue3->getName());   // Value name
-#ifdef ENABLE_CALIBRATION
+        name3 = name3.substring(0, 6);                  // String length limit for value name
-        calibrationData.calibrateInstance(bv_twd, logger); // Check if boat data value is to be calibrated
+        calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated
-#endif
+        double value3 = bvalue3->value;                 // Value as double in SI unit
-        FormattedData bvf_twd = commonData->fmt->formatValue(bv_twd, *commonData);
+        bool valid3 = bvalue3->valid;                   // Valid information 
-        if (bv_twd->valid) { // Save formatted data for hold feature
+        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-            bvf_twd_old = bvf_twd;
+        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
+        if(valid3 == true){
+            svalue3old = svalue3;   	                // Save old value
+            unit3old = unit3;                           // Save old unit
         }
 
         // Get boat value for TWS
-        GwApi::BoatValue *bv_tws = pageData.values[3];      // Fourth element in list
+        GwApi::BoatValue *bvalue4 = pageData.values[3]; // Fourth element in list
-        String name_tws = xdrDelete(bv_tws->getName(), 6);  // get name without prefix and limit length
+        String name4 = xdrDelete(bvalue4->getName());   // Value name
-#ifdef ENABLE_CALIBRATION
+        name4 = name4.substring(0, 6);                  // String length limit for value name
-        calibrationData.calibrateInstance(bv_tws, logger); // Check if boat data value is to be calibrated
+        calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated
-#endif
+        double value4 = bvalue4->value;                 // Value as double in SI unit
-        FormattedData bvf_tws = commonData->fmt->formatValue(bv_tws, *commonData);
+        bool valid4 = bvalue4->valid;                   // Valid information 
-        if (bv_tws->valid) { // Save formatted data for hold feature
+        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-            bvf_tws_old = bvf_tws;
+        String unit4 = formatValue(bvalue4, *commonData).unit;        // Unit of value
+        if(valid4 == true){
+            svalue4old = svalue4;   	                // Save old value
+            unit4old = unit4;                           // Save old unit
         }
 
         // Get boat value for DBT
-        GwApi::BoatValue *bv_dbt = pageData.values[4];      // Fifth element in list
+        GwApi::BoatValue *bvalue5 = pageData.values[4]; // Fifth element in list
-        String name_dbt = xdrDelete(bv_dbt->getName(), 6);  // get name without prefix and limit length
+        String name5 = xdrDelete(bvalue5->getName());   // Value name
-#ifdef ENABLE_CALIBRATION
+        name5 = name5.substring(0, 6);                  // String length limit for value name
-        calibrationData.calibrateInstance(bv_dbt, logger); // Check if boat data value is to be calibrated
+        calibrationData.calibrateInstance(bvalue5, logger); // Check if boat data value is to be calibrated
-#endif
+        double value5 = bvalue5->value;                 // Value as double in SI unit
-        FormattedData bvf_dbt = commonData->fmt->formatValue(bv_dbt, *commonData);
+        bool valid5 = bvalue5->valid;                   // Valid information 
-        if (bv_dbt->valid) { // Save formatted data for hold feature
+        String svalue5 = formatValue(bvalue5, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-            bvf_dbt_old = bvf_dbt;
+        String unit5 = formatValue(bvalue5, *commonData).unit;        // Unit of value
+        if(valid5 == true){
+            svalue5old = svalue5;   	                // Save old value
+            unit5old = unit5;                           // Save old unit
         }
 
         // Get boat value for STW
-        GwApi::BoatValue *bv_stw = pageData.values[5];      // Sixth element in list
+        GwApi::BoatValue *bvalue6 = pageData.values[5]; // Sixth element in list
-        String name_stw = xdrDelete(bv_stw->getName(), 6);  // get name without prefix and limit length
+        String name6 = xdrDelete(bvalue6->getName());   // Value name
-#ifdef ENABLE_CALIBRATION
+        name6 = name6.substring(0, 6);                  // String length limit for value name
-        calibrationData.calibrateInstance(bv_stw, logger); // Check if boat data value is to be calibrated
+        calibrationData.calibrateInstance(bvalue6, logger); // Check if boat data value is to be calibrated
-#endif
+        double value6 = bvalue6->value;                 // Value as double in SI unit
-        FormattedData bvf_stw = commonData->fmt->formatValue(bv_stw, *commonData);
+        bool valid6 = bvalue6->valid;                   // Valid information 
-        if (bv_stw->valid) { // Save formatted data for hold feature
+        String svalue6 = formatValue(bvalue6, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-            bvf_stw_old = bvf_stw;
+        String unit6 = formatValue(bvalue6, *commonData).unit;        // Unit of value
+        if(valid6 == true){
+            svalue6old = svalue6;   	                // Save old value
+            unit6old = unit6;                           // Save old unit
         }
 
-        // Log boat values
+        // Optical warning by limit violation (unused)
-        logger->logDebug(GwLog::LOG, "Drawing at PageWindRose, %s:%f,  %s:%f,  %s:%f,  %s:%f,  %s:%f,  %s:%f",
+        if(String(flashLED) == "Limit Violation"){
-            name_awa.c_str(), bv_awa->value,
+            setBlinkingLED(false);
-            name_aws.c_str(), bv_aws->value,
+            setFlashLED(false); 
-            name_twd.c_str(), bv_twd->value,
+        }
-            name_tws.c_str(), bv_tws->value,
+
-            name_dbt.c_str(), bv_dbt->value,
+        // Logging boat values
-            name_stw.c_str(), bv_stw->value);
+        if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
+        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
-        epd->setPartialWindow(0, 0, epd->width(), epd->height());
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // Show values AWA
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 65);
+        getdisplay().setCursor(10, 65);
-        epd->print(holdvalues ? bvf_awa_old.value : bvf_awa.value);
+        getdisplay().print(svalue1);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 95);
+        getdisplay().setCursor(10, 95);
-        epd->print(name_awa);
+        getdisplay().print(name1);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 115);
+        getdisplay().setCursor(10, 115);
-        epd->print(" ");
+        getdisplay().print(" ");
-        epd->print(holdvalues ? bvf_awa_old.unit : bvf_awa.unit);
+        if(holdvalues == false){
+            getdisplay().print(unit1);                   // Unit
+        }
+        else{
+            getdisplay().print(unit1old);                // Unit
+        }
 
         // Horizintal separator left
-        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show values AWS
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 270);
+        getdisplay().setCursor(10, 270);
-        epd->print(holdvalues ? bvf_aws_old.value : bvf_aws.value);
+        getdisplay().print(svalue2);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 220);
+        getdisplay().setCursor(10, 220);
-        epd->print(name_aws);
+        getdisplay().print(name2);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 190);
+        getdisplay().setCursor(10, 190);
-        epd->print(" ");
+        getdisplay().print(" ");
-        epd->print(holdvalues ? bvf_aws_old.unit : bvf_aws.unit);
+        if(holdvalues == false){
+            getdisplay().print(unit2);                   // Unit
+        }
+        else{
+            getdisplay().print(unit2old);                // Unit
+        }
 
-        // Show value TWD
+        // Show values TWD
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(295, 65);
+        getdisplay().setCursor(295, 65);
-        // TODO WTF? Der Formatter sollte das korrekt machen
+        if(valid3 == true){
-        if (bv_twd->valid) {
+            getdisplay().print(abs(value3 * 180 / PI), 0);   // Value
-            epd->print(abs(bv_twd->value * 180 / PI), 0);   // Value
         }
-        else {
+        else{
-            epd->print(commonData->fmt->placeholder);
+            getdisplay().print("---");                   // Value
+        }
+        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
-        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
+        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show values TWS
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(295, 270);
+        getdisplay().setCursor(295, 270);
-        epd->print(name_tws);
+        getdisplay().print(svalue4);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(335, 220);
+        getdisplay().setCursor(335, 220);
-        epd->print(holdvalues ? bvf_tws_old.value : bvf_tws.value);
+        getdisplay().print(name4);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(335, 190);
+        getdisplay().setCursor(335, 190);
-        epd->print(" ");
+        getdisplay().print(" ");
-        epd->print(holdvalues ? bvf_tws_old.unit : bvf_tws.unit);
+        if(holdvalues == false){
+            getdisplay().print(unit4);                   // Unit
+        }
+        else{  
+            getdisplay().print(unit4old);                // Unit
+        }
 
-        // *********************************************************************
+//*******************************************************************************************
         
         // Draw wind rose
         int rInstrument = 110;     // Radius of grafic instrument
         float pi = 3.141592;
 
-        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
-        epd->fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
+        getdisplay().fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
-        epd->fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
+        getdisplay().fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -213,36 +247,37 @@ 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 30 : ii="30"; break;
+            case 0: ii="0"; break;
-                case 60 : ii="60"; break;
+            case 30 : ii="30"; break;
-                case 90 : ii="90"; break;
+            case 60 : ii="60"; break;
-                case 120 : ii="120"; break;
+            case 90 : ii="90"; break;
-                case 150 : ii="150"; break;
+            case 120 : ii="120"; break;
-                case 180 : ii="180"; break;
+            case 150 : ii="150"; break;
-                case 210 : ii="210"; break;
+            case 180 : ii="180"; break;
-                case 240 : ii="240"; break;
+            case 210 : ii="210"; break;
-                case 270 : ii="270"; break;
+            case 240 : ii="240"; break;
-                case 300 : ii="300"; break;
+            case 270 : ii="270"; break;
-                case 330 : ii="330"; break;
+            case 300 : ii="300"; break;
-                default: break;
+            case 330 : ii="330"; 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
-            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            epd->setCursor(x-w/2, y+h/2);
+            getdisplay().setCursor(x-w/2, y+h/2);
-            if (i % 30 == 0) {
+            if(i % 30 == 0){
-                epd->setFont(&Ubuntu_Bold8pt8b); // TODO move out of loop
+                getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                epd->print(ii);
+                getdisplay().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);
-            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*pi);
             float cosx=cos(i/180.0*pi); 
 
@@ -253,10 +288,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                getdisplay().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);
-                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                getdisplay().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);
             }
@@ -264,16 +299,16 @@ public:
 
         // Draw wind pointer
         float startwidth = 8;       // Start width of pointer
-        if (bv_aws->valid || holdvalues || simulation) {
+        if(valid2 == true || holdvalues == true || simulation == true){
-            float sinx = sin(bv_awa->value);     // Wind direction
+            float sinx=sin(value1);     // Wind direction
-            float cosx = cos(bv_awa->value);
+            float cosx=cos(value1);
             // Normal pointer
             // Pointer as triangle with center base 2*width
             float xx1 = -startwidth;
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument-15); 
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().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
@@ -283,42 +318,47 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument-15);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().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
-        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
-        // *********************************************************************
+//*******************************************************************************************
 
-        // Show value DBT
+        // Show values DBT
-        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-        epd->setCursor(160, 200);
+        getdisplay().setCursor(160, 200);
-        epd->print(holdvalues ? bvf_dbt_old.value : bvf_dbt.value);
+        getdisplay().print(svalue5);                     // Value
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(190, 215);
+        getdisplay().setCursor(190, 215);
-        epd->print(" ");
+        getdisplay().print(" ");
-        epd->print(holdvalues ? bvf_dbt_old.unit : bvf_dbt.unit);
+        if(holdvalues == false){
+            getdisplay().print(unit5);                   // Unit
+        }
+        else{  
+            getdisplay().print(unit5old);                // Unit
+        }
 
-        // Show value STW
+        // Show values STW
-        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-        epd->setCursor(160, 130);
+        getdisplay().setCursor(160, 130);
-        epd->print(holdvalues ? bvf_stw_old.value : bvf_stw.value);
+        getdisplay().print(svalue6);                     // Value
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(190, 90);
+        getdisplay().setCursor(190, 90);
-        epd->print(" ");
+        getdisplay().print(" ");
-        epd->print(holdvalues ? bvf_stw_old.unit : bvf_stw.unit);
+        if(holdvalues == false){
+            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,37 +1,39 @@
-// 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
 {
-private:
+int16_t lp = 80;                    // Pointer length
-    String lengthformat;
+char source = 'A';		    // data source (A)pparent | (T)rue
-    int16_t lp = 80;         // Pointer length
+String 	ssource="App.";		    // String for Data Source 
-    char source = 'A';       // data source (A)pparent | (T)rue
-    String ssource="App.";   // String for Data Source 
 
 public:
-    PageWindRoseFlex(CommonData &common) : Page(common)
+    PageWindRoseFlex(CommonData &common){
-    {
+        commonData = &common;
-        logger->logDebug(GwLog::LOG, "Instantiate PageWindRoseFlex");
+        common.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
-    int handleKey(int key) {
+    virtual int handleKey(int key){
+	if(key == 2){ 
+	 // Code for set source 
+	    if(source == 'A'){ 
+		    source = 'T'; 
+		    ssource = "True"; // String to display
+	    } else { 
+		    source = 'A'; 
+		    ssource = "App."; // String to display
+	    } 
+	   } 
+	return key;               // Commit the key
+
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -40,17 +42,9 @@ public:
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+    int displayPage(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 = "";
@@ -65,6 +59,13 @@ public:
         static String svalue6old = "";
         static String unit6old = "";
 
+        // 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
 
@@ -76,14 +77,12 @@ 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 = commonData->fmt->formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue1 = 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
+        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
-        if (valid1 == true) {
+	if(valid1 == true){
             svalue1old = svalue1;   	                // Save old value
             unit1old = unit1;                           // Save old unit
         }
@@ -96,64 +95,58 @@ 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 = commonData->fmt->formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue2 = 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
+        String unit2 = 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
+
+
+        // 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
-#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 = commonData->fmt->formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit3 = commonData->fmt->formatValue(bvalue3, *commonData).unit;        // Unit of value
+        String unit3 = 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]; 
-        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
-#ifdef ENABLE_CALIBRATION
         calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated
-#endif
         double value4 = bvalue4->value;                 // Value as double in SI unit
         bool valid4 = bvalue4->valid;                   // Valid information 
-        String svalue4 = commonData->fmt->formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit4 = commonData->fmt->formatValue(bvalue4, *commonData).unit;        // Unit of value
+        String unit4 = formatValue(bvalue4, *commonData).unit;        // Unit of value
         if(valid4 == true){
             svalue4old = svalue4;   	                // Save old value
             unit4old = unit4;                           // Save old unit
         }
 
-        // Get boat value for bottom right corner
+        // Get boat value bottom right corner
         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
-#ifdef ENABLE_CALIBRATION
         calibrationData.calibrateInstance(bvalue5, logger); // Check if boat data value is to be calibrated
-#endif
         double value5 = bvalue5->value;                 // Value as double in SI unit
         bool valid5 = bvalue5->valid;                   // Valid information 
-        String svalue5 = commonData->fmt->formatValue(bvalue5, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue5 = formatValue(bvalue5, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit5 = commonData->fmt->formatValue(bvalue5, *commonData).unit;        // Unit of value
+        String unit5 = formatValue(bvalue5, *commonData).unit;        // Unit of value
         if(valid5 == true){
             svalue5old = svalue5;   	                // Save old value
             unit5old = unit5;                           // Save old unit
@@ -161,102 +154,126 @@ public:
 
         // Get boat value for center
         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
-#ifdef ENABLE_CALIBRATION
         calibrationData.calibrateInstance(bvalue6, logger); // Check if boat data value is to be calibrated
-#endif
         double value6 = bvalue6->value;                 // Value as double in SI unit
         bool valid6 = bvalue6->valid;                   // Valid information 
-        String svalue6 = commonData->fmt->formatValue(bvalue6, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String svalue6 = formatValue(bvalue6, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-        String unit6 = commonData->fmt->formatValue(bvalue6, *commonData).unit;        // Unit of value
+        String unit6 = 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?
-        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);
+        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);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // Show AWS or TWS top left
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 65);
+        getdisplay().setCursor(10, 65);
-        epd->print(svalue2);                     // Value
+        getdisplay().print(svalue2);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 95);
+        getdisplay().setCursor(10, 95);
-        epd->print(name2);                       // Name
+        getdisplay().print(name2);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 115);
+        getdisplay().setCursor(10, 115);
-        epd->print(" ");
+        getdisplay().print(" ");
-        epd->print(holdvalues ? unit2old : unit2);
+        if(holdvalues == false){
-
+            getdisplay().print(unit2);                   // Unit
-        // Horizintal separator left
-        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
-
-        // Show value 3 (=first user-configured parameter) at bottom left
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 270);
-        epd->print(svalue3);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 220);
-        epd->print(name3);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 190);
-        epd->print(" ");
-        epd->print(holdvalues ? unit3old : unit3);
-
-
-        // Show value 4 (=second user-configured parameter) at top right
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(295, 65);
-        if(valid3 == true){
-            epd->print(svalue4);     // Value
         }
         else{
-            epd->print(commonData->fmt->placeholder);
+            getdisplay().print(unit2old);                // Unit
         }
-        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 left
+        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
+
+        // Show value 3 (=first user-configured parameter) at bottom left
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setCursor(10, 270);
+        getdisplay().print(svalue3);                     // Value
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setCursor(10, 220);
+        getdisplay().print(name3);                       // Name
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setCursor(10, 190);
+        getdisplay().print(" ");
+        if(holdvalues == false){
+            getdisplay().print(unit3);                   // Unit
+        }
+        else{
+            getdisplay().print(unit3old);                // Unit
+        }
+
+        // Show value 4 (=second user-configured parameter) at top right
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setCursor(295, 65);
+        if(valid3 == true){
+            getdisplay().print(svalue4);     // Value
+        }
+        else{
+            getdisplay().print("---");                   // Value
+        }
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setCursor(335, 95);
+        getdisplay().print(name4);                       // Name
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setCursor(335, 115);
+        getdisplay().print(" ");
+        if(holdvalues == false){
+            getdisplay().print(unit4);                   // Unit
+        }
+        else{
+            getdisplay().print(unit4old);                // Unit
+        }
 
         // Horizintal separator right
-        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
+        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show value 5 (=third user-configured parameter) at bottom right
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(295, 270);
+        getdisplay().setCursor(295, 270);
-        epd->print(svalue5);                     // Value
+        getdisplay().print(svalue5);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(335, 220);
+        getdisplay().setCursor(335, 220);
-        epd->print(name5);                       // Name
+        getdisplay().print(name5);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(335, 190);
+        getdisplay().setCursor(335, 190);
-        epd->print(" ");
+        getdisplay().print(" ");
-        epd->print(holdvalues ? unit5old : unit5);
+        if(holdvalues == false){
+            getdisplay().print(unit5);                   // Unit
+        }
+        else{
+            getdisplay().print(unit5old);                // Unit
+        }
+
 
 //*******************************************************************************************
 
         // Draw wind rose
         int rInstrument = 110;     // Radius of grafic instrument
 
-        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
-        epd->fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
+        getdisplay().fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
-        epd->fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
+        getdisplay().fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -283,17 +300,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
-            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            epd->setCursor(x-w/2, y+h/2);
+            getdisplay().setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                epd->setFont(&Ubuntu_Bold8pt8b);
+                getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                epd->print(ii);
+                getdisplay().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);
-            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*M_PI);
             float cosx=cos(i/180.0*M_PI);
 
@@ -304,10 +321,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                getdisplay().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);
-                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                getdisplay().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);
             }
@@ -324,7 +341,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument-15);
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().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
@@ -334,50 +351,62 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument-15);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().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
-        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
 //*******************************************************************************************
 
-        // Show value6 (=fourth user-configured parameter) and ssource, so that they do not collide with the wind pointer
+	// 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 
-        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+    getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-        epd->setCursor(160, 200);
+    getdisplay().setCursor(160, 200);
-        epd->print(svalue6);                     // Value
+    getdisplay().print(svalue6);                     // Value
-        epd->setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(190, 215);
+    getdisplay().setCursor(190, 215);
-        epd->print(" ");
+    getdisplay().print(" ");
-        epd->print(holdvalues ? unit6old : unit6);
+    if(holdvalues == false){
-        if (sin(value1) > 0) {
+        getdisplay().print(unit6);                   // Unit
-            epd->setCursor(160, 130);
-        } else {
-            epd->setCursor(220, 130);
-        }
-        epd->print(ssource); // true or app.
     }
-    else {
+    else{  
-        // pointer points downwards
+        getdisplay().print(unit6old);                // Unit
-        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. 
     }
+    if (sin(value1)>0){
+	    getdisplay().setCursor(160, 130);
+    }
+    else{
+	    getdisplay().setCursor(220, 130);
+    }
+    getdisplay().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
+    }
+    if (sin(value1)>0){
+	    getdisplay().setCursor(160, 200);
+    }
+    else{
+	    getdisplay().setCursor(220, 200);
+    }
+    getdisplay().print(ssource);		//true or app. 
+}
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageXTETrack.cpp

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

lib/obp60task/Pagedata.h

@@ -1,5 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 #pragma once
 #include <Arduino.h>
 #include "GwApi.h"
@@ -100,22 +98,15 @@ 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;
@@ -126,26 +117,9 @@ typedef struct{
 
 //a base class that all pages must inherit from
 class Page{
-protected:
+  protected:
-    // TODO Future: GwApi *api;
     CommonData *commonData;
-    GwConfigHandler *config;
+  public:
-    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){}
@@ -212,3 +186,19 @@ 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;
+  String svalue;
+  String unit;
+} FormattedData;
+
+// Formatter for boat values
+FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata);

lib/obp60task/README

@@ -1,97 +0,0 @@
-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

@@ -1,19 +0,0 @@
-- 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

@@ -0,0 +1,38 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -28,4 +28,3 @@ 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")))

lib/obp60task/fonts/Atari6px8b.h

@@ -1,273 +0,0 @@
-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__ = "1.2"
+__version__ = "0.2"
 
 def detect_pages(filename):
     # returns a dictionary with page name and the number of gui fields
@@ -110,10 +110,11 @@ def create_json(device, no_of_pages, pagedata):
                 "description": "The display for field {}".format(number_to_text(field_no)),
                 "category": f"{device.upper()} Page {page_no}",
                 "capabilities": {device.lower(): "true"},
-                "condition": {
+                "condition": [
-                    f"page{page_no}type": [page for page in pages if pagedata[page] >= field_no],
+                    {f"page{page_no}type": page}
-                    "visiblePages": [vp for vp in range(page_no, no_of_pages + 1)]
+                    for page in pages
-                },
+                    if pagedata[page] >= field_no
+                ],
             }
             output.append(field_data)
 
@@ -148,13 +149,12 @@ 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:m:', ['device=','--pages=','--merge'])
+        options, remainder = getopt.getopt(sys.argv[1:], 'd:p:', ['device=','--pages='])
     except getopt.GetoptError as err:
         print(err)
         usage()
@@ -162,14 +162,11 @@ 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)
@@ -178,12 +175,5 @@ if __name__ == '__main__':
     pagedata = detect_pages("obp60task.cpp")
 
     json_output = create_json(device, no_of_pages, pagedata)
-    if merge_json and os.path.isfile(merge_json):
+    # print omitting first line containing [  of JSON array
-        with open(merge_json, 'r') as fh:
+    print(json_output[1:])
-            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

@@ -0,0 +1,12 @@
+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

@@ -1,88 +0,0 @@
-/* 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

@@ -1,21 +0,0 @@
-#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/alpha.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define alpha_width 96
+#define alpha_height 64
+static unsigned char alpha_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x35,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x0d,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0xee, 0xee, 0xee, 0x06,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x03,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x01,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0xd5, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0xee, 0xee, 0x6e, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x35, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x0d, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0xee, 0xee, 0x06, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x03, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0xbb, 0x01, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0xd5, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0xee, 0x6e, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x35, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x0d, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0xee, 0x06, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x03, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0x01, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0xd5, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x6e, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x35, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x1b, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x0d, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x06, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x03, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x01, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x03, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x06, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x0d, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x1b, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x35, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x6e, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0xd5, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0x01, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x03, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0xee, 0x06, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x0d, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x35, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0xee, 0x6e, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0xd5, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0xbb, 0x01, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x03, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0xee, 0xee, 0x06, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x0d, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x35, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0xee, 0xee, 0x6e, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0xd5, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x01,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x03,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0xee, 0xee, 0xee, 0x06,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x0d,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0x35,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0xee, 0xee, 0xee, 0x6e,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/answer.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define answer_width 96
+#define answer_height 64
+static unsigned char answer_bits[] PROGMEM = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xf7, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xab, 0xfa, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x55, 0xc5, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xab, 0xaa, 0x0a, 0xc0, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x55, 0x05, 0x00, 0xe0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xfe, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0xff, 0xff, 0x01, 0x00, 0x00,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0xfe, 0x1f, 0x00, 0x00,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xfe, 0x0f, 0x00,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0xf0, 0xff, 0x07,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xfa, 0x7f,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xfd,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x50, 0x55, 0xfd,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xa0, 0xfa, 0x7f,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0xf0, 0xff, 0x07,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0x02, 0x00, 0xfe, 0x0f, 0x00,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0x55, 0x01, 0xfe, 0x1f, 0x00, 0x00,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xaa, 0xaa, 0xff, 0xff, 0x01, 0x00, 0x00,
+   0x57, 0x55, 0x05, 0x00, 0x40, 0x55, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
+   0xab, 0xaa, 0x0a, 0x00, 0x80, 0xfe, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x55, 0x05, 0x00, 0xe0, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xab, 0xaa, 0x0a, 0xc0, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x55, 0xc5, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xab, 0xfa, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xf7, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   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/images/black.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define black_width 96
+#define black_height 64
+static unsigned char black_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0x3f, 0xc0, 0x1f, 0xff, 0x1f, 0xfc, 0x0f, 0x78, 0x7c, 0xf8, 0xff,
+   0xff, 0x3f, 0x00, 0x1f, 0xff, 0x1f, 0xfc, 0x07, 0x70, 0x3c, 0xfc, 0xff,
+   0xff, 0x3f, 0x00, 0x1e, 0xff, 0x1f, 0xfc, 0x03, 0x70, 0x1c, 0xfe, 0xff,
+   0xff, 0x3f, 0x3e, 0x1e, 0xff, 0x8f, 0xf8, 0xe1, 0x7b, 0x0c, 0xff, 0xff,
+   0xff, 0x3f, 0x3e, 0x1e, 0xff, 0x8f, 0xf8, 0xf0, 0x7f, 0x84, 0xff, 0xff,
+   0xff, 0x3f, 0x00, 0x1f, 0xff, 0x87, 0xf0, 0xf8, 0x7f, 0xc0, 0xff, 0xff,
+   0xff, 0x3f, 0x00, 0x1f, 0xff, 0xc7, 0xf1, 0xf8, 0x7f, 0xe0, 0xff, 0xff,
+   0xff, 0x3f, 0x00, 0x1e, 0xff, 0xc7, 0xf1, 0xf8, 0x7f, 0xc0, 0xff, 0xff,
+   0xff, 0x3f, 0x3e, 0x1c, 0xff, 0xc3, 0xe1, 0xf8, 0x7f, 0x84, 0xff, 0xff,
+   0xff, 0x3f, 0x7e, 0x1c, 0xff, 0x03, 0xe0, 0xf8, 0x7f, 0x8c, 0xff, 0xff,
+   0xff, 0x3f, 0x7e, 0x1c, 0xff, 0x01, 0xe0, 0xf0, 0x7f, 0x1c, 0xff, 0xff,
+   0xff, 0x3f, 0x3e, 0x1c, 0xff, 0x01, 0xc0, 0xe1, 0x7b, 0x1c, 0xfe, 0xff,
+   0xff, 0x3f, 0x00, 0x1e, 0x80, 0xf1, 0xc7, 0x01, 0x70, 0x3c, 0xfc, 0xff,
+   0xff, 0x3f, 0x00, 0x1e, 0x80, 0xf0, 0x87, 0x03, 0x70, 0x7c, 0xf8, 0xff,
+   0xff, 0x3f, 0x80, 0x1f, 0x80, 0xf8, 0x8f, 0x0f, 0x78, 0xfc, 0xf0, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/blue.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define blue_width 96
+#define blue_height 64
+static unsigned char blue_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x15, 0x40, 0x05, 0x55, 0x50, 0x51, 0x00, 0x54, 0x55, 0xd5,
+   0xef, 0xee, 0x0e, 0x80, 0x8e, 0xee, 0xe8, 0xe0, 0x00, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x15, 0x00, 0x05, 0x55, 0x50, 0x51, 0x00, 0x54, 0x55, 0xd5,
+   0xbb, 0xbb, 0x1b, 0x1b, 0x8b, 0xbb, 0xb8, 0xb1, 0xb8, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x15, 0x15, 0x05, 0x55, 0x50, 0x51, 0x50, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0x0e, 0x80, 0x8e, 0xee, 0xe8, 0xe0, 0xe8, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x15, 0x00, 0x05, 0x55, 0x50, 0x51, 0x00, 0x54, 0x55, 0xd5,
+   0xbb, 0xbb, 0x1b, 0x00, 0x8b, 0xbb, 0xb8, 0xb1, 0x00, 0xba, 0xbb, 0xfb,
+   0x57, 0x55, 0x15, 0x15, 0x04, 0x55, 0x50, 0x51, 0x00, 0x54, 0x55, 0xd5,
+   0xef, 0xee, 0x0e, 0x2e, 0x8e, 0xee, 0xe8, 0xe0, 0xe8, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x15, 0x15, 0x04, 0x55, 0x50, 0x51, 0x50, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0x1b, 0x1b, 0x8a, 0xbb, 0xb0, 0xb0, 0xb8, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x15, 0x00, 0x05, 0x40, 0x01, 0x50, 0x00, 0x54, 0x55, 0xd5,
+   0xef, 0xee, 0x0e, 0x00, 0x0e, 0xc0, 0x02, 0xec, 0x00, 0xec, 0xee, 0xee,
+   0x57, 0x55, 0x15, 0x40, 0x05, 0x40, 0x05, 0x54, 0x00, 0x54, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/charlie.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define charlie_width 96
+#define charlie_height 64
+static unsigned char charlie_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/class.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define class_width 96
+#define class_height 64
+static unsigned char class_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0xf8, 0xc3, 0x01, 0xc0, 0x07, 0xe0, 0x07, 0xfc, 0x00, 0xc0,
+   0x03, 0x00, 0xfc, 0xc7, 0x01, 0xc0, 0x07, 0xf8, 0x0f, 0xff, 0x01, 0xc0,
+   0x03, 0x00, 0xfe, 0xc7, 0x01, 0xc0, 0x07, 0xfc, 0x87, 0xff, 0x00, 0xc0,
+   0x03, 0x00, 0x0f, 0xc2, 0x01, 0xe0, 0x0e, 0x1c, 0x84, 0x83, 0x00, 0xc0,
+   0x03, 0x80, 0x07, 0xc0, 0x01, 0xe0, 0x0e, 0x1c, 0x80, 0x03, 0x00, 0xc0,
+   0x03, 0x80, 0x03, 0xc0, 0x01, 0xf0, 0x1e, 0x3c, 0x80, 0x07, 0x00, 0xc0,
+   0x03, 0x80, 0x03, 0xc0, 0x01, 0x70, 0x1c, 0xf8, 0x01, 0x3f, 0x00, 0xc0,
+   0x03, 0x80, 0x03, 0xc0, 0x01, 0x70, 0x1c, 0xf0, 0x07, 0xfe, 0x00, 0xc0,
+   0x03, 0x80, 0x03, 0xc0, 0x01, 0x78, 0x3c, 0xc0, 0x0f, 0xf8, 0x01, 0xc0,
+   0x03, 0x80, 0x03, 0xc0, 0x01, 0xf8, 0x3f, 0x00, 0x1e, 0xc0, 0x03, 0xc0,
+   0x03, 0x80, 0x07, 0xc0, 0x01, 0xfc, 0x3f, 0x00, 0x1c, 0x80, 0x03, 0xc0,
+   0x03, 0x00, 0x0f, 0xc2, 0x01, 0xfc, 0x7f, 0x08, 0x1c, 0x81, 0x03, 0xc0,
+   0x03, 0x00, 0xff, 0xc7, 0xff, 0x1c, 0x70, 0xfc, 0x9f, 0xff, 0x03, 0xc0,
+   0x03, 0x00, 0xfe, 0xc7, 0xff, 0x1e, 0xf0, 0xfc, 0x8f, 0xff, 0x01, 0xc0,
+   0x03, 0x00, 0xf8, 0xc3, 0xff, 0x0e, 0xe0, 0xf0, 0x03, 0x7e, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/finish.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define finish_width 96
+#define finish_height 64
+static unsigned char finish_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0x6e, 0x00, 0x8e, 0xc6, 0x8e, 0x8e, 0x0e, 0xe8, 0xe8, 0xe0, 0xee,
+   0x57, 0x55, 0x00, 0x04, 0x05, 0x05, 0x05, 0x05, 0x50, 0x50, 0x51, 0xd5,
+   0xbb, 0x3b, 0x00, 0x8a, 0x03, 0x8b, 0x8b, 0x03, 0xb8, 0xb8, 0xb1, 0xfb,
+   0x57, 0x55, 0x54, 0x05, 0x05, 0x05, 0x05, 0x41, 0x51, 0x50, 0x51, 0xd5,
+   0xef, 0x6e, 0xec, 0x8e, 0x06, 0x8e, 0x8e, 0xe2, 0xee, 0xe8, 0xe0, 0xee,
+   0x57, 0x55, 0x54, 0x05, 0x05, 0x04, 0x05, 0x41, 0x55, 0x50, 0x51, 0xd5,
+   0xbb, 0x3b, 0x00, 0x8b, 0x03, 0x88, 0x8b, 0x03, 0xba, 0x00, 0xb0, 0xfb,
+   0x57, 0x55, 0x00, 0x05, 0x45, 0x00, 0x05, 0x05, 0x50, 0x00, 0x50, 0xd5,
+   0xef, 0x6e, 0x00, 0x8e, 0xc6, 0x80, 0x8e, 0x2e, 0xe0, 0x00, 0xe0, 0xee,
+   0x57, 0x55, 0x54, 0x05, 0x45, 0x01, 0x05, 0x55, 0x41, 0x50, 0x51, 0xd5,
+   0xbb, 0x3b, 0xb8, 0x8b, 0x83, 0x83, 0x8b, 0xbb, 0xa3, 0xb8, 0xb1, 0xfb,
+   0x57, 0x55, 0x54, 0x05, 0x45, 0x01, 0x05, 0x55, 0x41, 0x50, 0x51, 0xd5,
+   0xef, 0x6e, 0xec, 0x8e, 0xc6, 0x86, 0x8e, 0x02, 0xe0, 0xe8, 0xe0, 0xee,
+   0x57, 0x55, 0x54, 0x05, 0x45, 0x05, 0x05, 0x01, 0x50, 0x50, 0x51, 0xd5,
+   0xbb, 0x3b, 0xb8, 0x8b, 0x83, 0x8b, 0x8b, 0x0b, 0xb8, 0xb8, 0xb1, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/hotel.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define flag_hotel_width 96
+#define flag_hotel_height 64
+static unsigned char flag_hotel_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/india.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define india_width 96
+#define india_height 64
+static unsigned char india_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0x22, 0xf2, 0x2f, 0x22, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0xff, 0xff, 0x89, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0xf2, 0xff, 0xff, 0x2f, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0xf8, 0xff, 0xff, 0x9f, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0xfe, 0xff, 0xff, 0x7f, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0xff, 0xff, 0xff, 0xff, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0xff, 0xff, 0xff, 0xff, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0xff, 0xff, 0xff, 0xff, 0x89, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0xa2, 0xff, 0xff, 0xff, 0xff, 0x23, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0xff, 0xff, 0xff, 0xff, 0x89, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0xa2, 0xff, 0xff, 0xff, 0xff, 0x23, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0xff, 0xff, 0xff, 0xff, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0xfe, 0xff, 0xff, 0x7f, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0xfc, 0xff, 0xff, 0xbf, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0xfa, 0xff, 0xff, 0x3f, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0xc8, 0xff, 0xff, 0x8b, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0x22, 0xfe, 0x7f, 0x22, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xc8,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x23, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xe2,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xc8,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/november.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define november_width 96
+#define november_height 64
+static unsigned char november_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xdf, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0xdf, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0xdf, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0xdf, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0xf7,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0xf7,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0xf7,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0xf7,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0xdf, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0xdf, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0xdf, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0xdf, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0xf7,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0xf7,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0xf7,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0xdd, 0xdd, 0xdd, 0x00, 0x00, 0x00, 0xdd, 0xdd, 0xdd,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x77, 0x77, 0xf7,
+   0x03, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xea,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/orange.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define orange_width 96
+#define orange_height 64
+static unsigned char orange_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaf, 0xfa, 0xaf, 0xea, 0xaf, 0xba, 0xfa, 0xaa, 0xbf, 0xfa, 0xef,
+   0xe3, 0x3f, 0xf0, 0x3f, 0xc0, 0x07, 0x78, 0x70, 0xc0, 0x7f, 0xf8, 0xcf,
+   0xfb, 0xff, 0xfa, 0xff, 0xea, 0xaf, 0xfa, 0xfa, 0xea, 0xff, 0xfa, 0xef,
+   0x7b, 0xf0, 0x70, 0xf0, 0xe0, 0x0e, 0xf8, 0x70, 0xf0, 0x20, 0x38, 0xc0,
+   0xbb, 0xea, 0xfb, 0xea, 0xea, 0xae, 0xfa, 0xfb, 0xfa, 0xaa, 0xba, 0xea,
+   0x1f, 0xc0, 0x71, 0xe0, 0xf0, 0x1e, 0xf8, 0x73, 0x38, 0x00, 0x38, 0xc0,
+   0xbf, 0xea, 0xfb, 0xfa, 0xfa, 0xbe, 0xba, 0xfb, 0xba, 0xaa, 0xfa, 0xef,
+   0x1f, 0xc0, 0xf1, 0x7f, 0x70, 0x1c, 0x38, 0x77, 0x38, 0x70, 0xf8, 0xcf,
+   0xbf, 0xea, 0xfb, 0xbf, 0xfa, 0xbe, 0xba, 0xff, 0xba, 0xfa, 0xfa, 0xef,
+   0x1f, 0xc0, 0xf1, 0x0f, 0xf8, 0x3f, 0x38, 0x7e, 0x38, 0x70, 0x38, 0xc0,
+   0xbf, 0xea, 0xfb, 0xbe, 0xfe, 0xbf, 0xba, 0xfe, 0xfa, 0xfa, 0xba, 0xea,
+   0x7b, 0xf0, 0x70, 0x38, 0xfc, 0x7f, 0x38, 0x7c, 0xf0, 0x70, 0x38, 0xc0,
+   0xfb, 0xff, 0xfa, 0xfa, 0xbe, 0xfa, 0xba, 0xfa, 0xfa, 0xff, 0xfa, 0xff,
+   0xe3, 0x3f, 0x70, 0xf0, 0x1e, 0xf0, 0x38, 0x70, 0xe0, 0x7f, 0xf8, 0xdf,
+   0xab, 0xbf, 0xfa, 0xea, 0xaf, 0xea, 0xba, 0xfa, 0xaa, 0xbf, 0xfa, 0xff,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/papa.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define papa_width 96
+#define papa_height 64
+static unsigned char papa_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xef, 0xee, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xee, 0xee,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xbb, 0xbb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xbb, 0xfb,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xef, 0xee, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xee, 0xee,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xbb, 0xbb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xbb, 0xfb,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xef, 0xee, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xee, 0xee,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xbb, 0xbb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xbb, 0xfb,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xef, 0xee, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xee, 0xee,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xbb, 0xbb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xbb, 0xfb,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xef, 0xee, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xee, 0xee,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xbb, 0xbb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xbb, 0xfb,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xef, 0xee, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xee, 0xee,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xbb, 0xbb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xbb, 0xfb,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xef, 0xee, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xee, 0xee,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xbb, 0xbb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xbb, 0xfb,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xef, 0xee, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xee, 0xee,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xbb, 0xbb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xbb, 0xfb,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xef, 0xee, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xee, 0xee,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xbb, 0xbb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xbb, 0xfb,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xef, 0xee, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xee, 0xee,
+   0x57, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xbb, 0xbb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/repeat_one.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define repeat_one_width 96
+#define repeat_one_height 64
+static unsigned char repeat_one_bits[] PROGMEM = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xfb, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xef, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0xd5, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xbb, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x55, 0xd5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xef, 0xee, 0xee, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x55, 0x55, 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xbb, 0xbb, 0xbb, 0xbb, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x43, 0x55, 0x55, 0x55, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x0b, 0xef, 0xee, 0xee, 0xae, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x03, 0x70, 0x55, 0x55, 0x55, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x23, 0xc2, 0xbb, 0xbb, 0xbb, 0x7b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x54, 0x55, 0x55, 0xd5, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x8b, 0x88, 0xe0, 0xee, 0xee, 0xee, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x55, 0x55, 0x55, 0xd5, 0x03, 0x00, 0x00, 0x00, 0x00,
+   0x23, 0x22, 0x22, 0xb8, 0xbb, 0xbb, 0xbb, 0x1f, 0x00, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0xf5, 0x00, 0x00, 0x00, 0x00,
+   0x8b, 0x88, 0x88, 0x08, 0xee, 0xee, 0xee, 0xee, 0x07, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x50, 0x55, 0x55, 0x55, 0x3d, 0x00, 0x00, 0x00,
+   0x23, 0x22, 0x22, 0x22, 0x82, 0xbb, 0xbb, 0xbb, 0xfb, 0x01, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x55, 0x55, 0x0f, 0x00, 0x00,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0xe0, 0xee, 0xee, 0xee, 0x7e, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0xd5, 0x03, 0x00,
+   0x23, 0x22, 0x22, 0x22, 0x22, 0x22, 0xb0, 0xbb, 0xbb, 0xbb, 0x1f, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0xf5, 0x00,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xee, 0xee, 0xee, 0xee, 0x07,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x55, 0x55, 0x55, 0x1d,
+   0x23, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xa2, 0xbb, 0xbb, 0xbb, 0x7b,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x55, 0x55, 0x55, 0x1d,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xee, 0xee, 0xee, 0xee, 0x07,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x55, 0xf5, 0x00,
+   0x23, 0x22, 0x22, 0x22, 0x22, 0x22, 0xb0, 0xbb, 0xbb, 0xbb, 0x1f, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x55, 0xd5, 0x03, 0x00,
+   0x8b, 0x88, 0x88, 0x88, 0x88, 0xc0, 0xee, 0xee, 0xee, 0x7e, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x55, 0x55, 0x0f, 0x00, 0x00,
+   0x23, 0x22, 0x22, 0x22, 0x02, 0xbb, 0xbb, 0xbb, 0xfb, 0x03, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0x3d, 0x00, 0x00, 0x00,
+   0x8b, 0x88, 0x88, 0x08, 0xee, 0xee, 0xee, 0xee, 0x07, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0xf5, 0x00, 0x00, 0x00, 0x00,
+   0x23, 0x22, 0x22, 0xb0, 0xbb, 0xbb, 0xbb, 0x1f, 0x00, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x55, 0x55, 0x55, 0xd5, 0x01, 0x00, 0x00, 0x00, 0x00,
+   0x8b, 0x88, 0xe0, 0xee, 0xee, 0xee, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x54, 0x55, 0x55, 0xd5, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x23, 0xc2, 0xbb, 0xbb, 0xbb, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x03, 0x58, 0x55, 0x55, 0x55, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x0b, 0xef, 0xee, 0xee, 0xee, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x43, 0x55, 0x55, 0x55, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xbb, 0xbb, 0xbb, 0xbb, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x55, 0x55, 0xf5, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xef, 0xee, 0xee, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x55, 0xd5, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xbb, 0xbb, 0x7b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x55, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xef, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x57, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xfb, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   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/images/sierra.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define sierra_width 96
+#define sierra_height 64
+static unsigned char sierra_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xe8, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0x0e, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xb8, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xe8, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0x0e, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xb8, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xe8, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0x0e, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xb8, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xe8, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0x0e, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xb8, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xe8, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0x0e, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xb8, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xe8, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0x0e, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xb8, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xe8, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0x0e, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xb8, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xe8, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0x0e, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xb8, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xe8, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0x0e, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xb8, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xe8, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0x0e, 0x00, 0xc0,
+   0x03, 0x00, 0x50, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x15, 0x00, 0xc0,
+   0x03, 0x00, 0xb8, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0x1b, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/start.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define start_width 96
+#define start_height 64
+static unsigned char start_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xfe, 0xfe, 0xff, 0xfa, 0xaa, 0xff, 0xfa, 0xff, 0xab, 0xea,
+   0x03, 0x00, 0xff, 0xfd, 0x7f, 0xf8, 0x00, 0xff, 0xf3, 0xff, 0x01, 0xc0,
+   0xab, 0xaa, 0xff, 0xfe, 0xff, 0xfa, 0xaa, 0xff, 0xff, 0xff, 0xab, 0xea,
+   0x03, 0x80, 0x83, 0x80, 0x03, 0xdc, 0x01, 0x07, 0x0f, 0x0e, 0x00, 0xc0,
+   0xab, 0xaa, 0xab, 0xaa, 0xab, 0xfe, 0xab, 0xaf, 0xae, 0xae, 0xaa, 0xea,
+   0x03, 0x80, 0x07, 0x80, 0x03, 0xde, 0x03, 0x07, 0x0e, 0x0e, 0x00, 0xc0,
+   0xab, 0xaa, 0xbf, 0xaa, 0xab, 0xae, 0xab, 0xaf, 0xaf, 0xae, 0xaa, 0xea,
+   0x03, 0x00, 0xfe, 0x80, 0x03, 0x8e, 0x03, 0xff, 0x07, 0x0e, 0x00, 0xc0,
+   0xab, 0xaa, 0xfa, 0xab, 0xab, 0xaf, 0xaf, 0xff, 0xab, 0xae, 0xaa, 0xea,
+   0x03, 0x00, 0xc0, 0x83, 0x03, 0xff, 0x07, 0xff, 0x00, 0x0e, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xab, 0xab, 0xff, 0xaf, 0xef, 0xab, 0xae, 0xaa, 0xea,
+   0x03, 0x00, 0x81, 0x83, 0x83, 0xff, 0x0f, 0x87, 0x03, 0x0e, 0x00, 0xc0,
+   0xab, 0xaa, 0xff, 0xab, 0xab, 0xab, 0xae, 0xaf, 0xaf, 0xae, 0xaa, 0xea,
+   0x03, 0x80, 0xff, 0x81, 0xc3, 0x03, 0x1e, 0x07, 0x0f, 0x0e, 0x00, 0xc0,
+   0xab, 0xaa, 0xfe, 0xaa, 0xeb, 0xab, 0xbe, 0xaf, 0xbe, 0xae, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/uniform.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define uniform_width 96
+#define uniform_height 64
+static unsigned char uniform_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/xray.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define xray_width 96
+#define xray_height 64
+static unsigned char xray_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xef, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xbb, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0x03, 0x00, 0x00, 0x00, 0x00, 0xee, 0xee, 0x00, 0x00, 0x00, 0x00, 0xc0,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/yankee.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define yankee_width 96
+#define yankee_height 64
+static unsigned char yankee_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x03, 0x60, 0x55, 0xd5, 0x00, 0x00, 0x55, 0x55, 0x05, 0x00, 0x58, 0xd5,
+   0xab, 0xba, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xab, 0xaa, 0xae, 0xea,
+   0x03, 0x54, 0x55, 0x15, 0x00, 0x60, 0x55, 0xd5, 0x00, 0x00, 0x55, 0xd5,
+   0xab, 0xaa, 0xaa, 0xae, 0xaa, 0xba, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x83, 0x55, 0x55, 0x03, 0x00, 0x54, 0x55, 0x15, 0x00, 0x60, 0x55, 0xd5,
+   0xeb, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xae, 0xaa, 0xba, 0xaa, 0xea,
+   0x53, 0x55, 0x55, 0x00, 0x80, 0x55, 0x55, 0x03, 0x00, 0x54, 0x55, 0xd5,
+   0xab, 0xaa, 0xba, 0xaa, 0xea, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xee,
+   0x57, 0x55, 0x0d, 0x00, 0x50, 0x55, 0x55, 0x00, 0x80, 0x55, 0x55, 0xc3,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xba, 0xaa, 0xea, 0xaa, 0xaa, 0xea,
+   0x57, 0x55, 0x01, 0x00, 0x56, 0x55, 0x0d, 0x00, 0x50, 0x55, 0x55, 0xc0,
+   0xab, 0xea, 0xaa, 0xaa, 0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xba, 0xea,
+   0x57, 0x35, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x56, 0x55, 0x0d, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xea, 0xaa, 0xaa, 0xab, 0xaa, 0xaa, 0xea,
+   0x57, 0x05, 0x00, 0x58, 0x55, 0x35, 0x00, 0x40, 0x55, 0x55, 0x01, 0xc0,
+   0xab, 0xab, 0xaa, 0xae, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea, 0xaa, 0xea,
+   0xd7, 0x00, 0x00, 0x55, 0x55, 0x05, 0x00, 0x58, 0x55, 0x35, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xab, 0xaa, 0xae, 0xaa, 0xaa, 0xaa, 0xea,
+   0x17, 0x00, 0x60, 0x55, 0xd5, 0x00, 0x00, 0x55, 0x55, 0x05, 0x00, 0xd8,
+   0xaf, 0xaa, 0xba, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xab, 0xaa, 0xee,
+   0x03, 0x00, 0x54, 0x55, 0x15, 0x00, 0x60, 0x55, 0xd5, 0x00, 0x00, 0xd5,
+   0xab, 0xaa, 0xaa, 0xaa, 0xae, 0xaa, 0xba, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x80, 0x55, 0x55, 0x03, 0x00, 0x54, 0x55, 0x15, 0x00, 0x60, 0xd5,
+   0xab, 0xea, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xae, 0xaa, 0xba, 0xea,
+   0x03, 0x50, 0x55, 0x55, 0x00, 0x80, 0x55, 0x55, 0x03, 0x00, 0x54, 0xd5,
+   0xab, 0xaa, 0xaa, 0xba, 0xaa, 0xea, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x56, 0x55, 0x0d, 0x00, 0x50, 0x55, 0x55, 0x00, 0x80, 0x55, 0xd5,
+   0xab, 0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xba, 0xaa, 0xea, 0xaa, 0xea,
+   0x43, 0x55, 0x55, 0x01, 0x00, 0x56, 0x55, 0x0d, 0x00, 0x50, 0x55, 0xd5,
+   0xab, 0xaa, 0xea, 0xaa, 0xaa, 0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfa,
+   0x5b, 0x55, 0x35, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x56, 0x55, 0xcd,
+   0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea, 0xaa, 0xaa, 0xab, 0xaa, 0xea,
+   0x57, 0x55, 0x05, 0x00, 0x58, 0x55, 0x35, 0x00, 0x40, 0x55, 0x55, 0xc1,
+   0xab, 0xaa, 0xab, 0xaa, 0xae, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea, 0xea,
+   0x57, 0xd5, 0x00, 0x00, 0x55, 0x55, 0x05, 0x00, 0x58, 0x55, 0x35, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xab, 0xaa, 0xae, 0xaa, 0xaa, 0xea,
+   0x57, 0x15, 0x00, 0x60, 0x55, 0xd5, 0x00, 0x00, 0x55, 0x55, 0x05, 0xc0,
+   0xab, 0xae, 0xaa, 0xba, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xab, 0xea,
+   0x57, 0x03, 0x00, 0x54, 0x55, 0x15, 0x00, 0x60, 0x55, 0xd5, 0x00, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xae, 0xaa, 0xba, 0xaa, 0xaa, 0xaa, 0xea,
+   0x57, 0x00, 0x80, 0x55, 0x55, 0x03, 0x00, 0x54, 0x55, 0x15, 0x00, 0xe0,
+   0xbb, 0xaa, 0xea, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xae, 0xaa, 0xfa,
+   0x0f, 0x00, 0x50, 0x55, 0x55, 0x00, 0x80, 0x55, 0x55, 0x03, 0x00, 0xd4,
+   0xab, 0xaa, 0xaa, 0xaa, 0xba, 0xaa, 0xea, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x00, 0x56, 0x55, 0x0d, 0x00, 0x50, 0x55, 0x55, 0x00, 0x80, 0xd5,
+   0xab, 0xaa, 0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xba, 0xaa, 0xea, 0xea,
+   0x03, 0x40, 0x55, 0x55, 0x01, 0x00, 0x56, 0x55, 0x0d, 0x00, 0x50, 0xd5,
+   0xab, 0xaa, 0xaa, 0xea, 0xaa, 0xaa, 0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x03, 0x58, 0x55, 0x35, 0x00, 0x40, 0x55, 0x55, 0x01, 0x00, 0x56, 0xd5,
+   0xab, 0xae, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea, 0xaa, 0xaa, 0xab, 0xea,
+   0x03, 0x55, 0x55, 0x05, 0x00, 0x58, 0x55, 0x35, 0x00, 0x40, 0x55, 0xd5,
+   0xab, 0xaa, 0xaa, 0xab, 0xaa, 0xae, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0x63, 0x55, 0xd5, 0x00, 0x00, 0x55, 0x55, 0x05, 0x00, 0x58, 0x55, 0xf5,
+   0xbb, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xab, 0xaa, 0xae, 0xaa, 0xea,
+   0x57, 0x55, 0x15, 0x00, 0x60, 0x55, 0xd5, 0x00, 0x00, 0x55, 0x55, 0xc5,
+   0xab, 0xaa, 0xae, 0xaa, 0xba, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xeb,
+   0x57, 0x55, 0x03, 0x00, 0x54, 0x55, 0x15, 0x00, 0x60, 0x55, 0xd5, 0xc0,
+   0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xae, 0xaa, 0xba, 0xaa, 0xaa, 0xea,
+   0x57, 0x55, 0x00, 0x80, 0x55, 0x55, 0x03, 0x00, 0x54, 0x55, 0x15, 0xc0,
+   0xab, 0xba, 0xaa, 0xea, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xae, 0xea,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/images/zulu.xbm

@@ -0,0 +1,68 @@
+#pragma once
+#define zulu_width 96
+#define zulu_height 64
+static unsigned char zulu_bits[] PROGMEM = {
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0,
+   0x3f, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xfa,
+   0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4,
+   0xff, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xee,
+   0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xd5,
+   0xff, 0x2f, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xa2, 0xfb,
+   0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0xd5,
+   0xff, 0x3f, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xec, 0xee,
+   0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xd5,
+   0xff, 0xff, 0x23, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xa2, 0xbb, 0xfb,
+   0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x55, 0xd5,
+   0xff, 0xff, 0x8f, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0xf0, 0xee, 0xee,
+   0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0xba, 0xbb, 0xfb,
+   0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0x83, 0x88, 0x88, 0x88, 0x88, 0xc8, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x50, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0x3f, 0x22, 0x22, 0x22, 0x22, 0xb8, 0xbb, 0xbb, 0xfb,
+   0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xff, 0x88, 0x88, 0x88, 0x88, 0xee, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x40, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xff, 0x2f, 0x22, 0x22, 0xa2, 0xbb, 0xbb, 0xbb, 0xfb,
+   0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x50, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xff, 0xbf, 0x88, 0x88, 0xec, 0xee, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0x23, 0xa2, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x40, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0xf0, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x54, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xbe, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x57, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xea, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xab, 0xea, 0xbb, 0xbb, 0xbb, 0xbb, 0xfb,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0x55, 0xd5, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xaa, 0xaa, 0xee, 0xee, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0xff, 0x7f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xff, 0xaf, 0xaa, 0xaa, 0xba, 0xbb, 0xbb, 0xbb, 0xfb,
+   0xff, 0xff, 0xff, 0xff, 0x57, 0x55, 0x55, 0x75, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xff, 0xab, 0xaa, 0xaa, 0xaa, 0xee, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0xff, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xbf, 0xaa, 0xaa, 0xaa, 0xaa, 0xba, 0xbb, 0xbb, 0xfb,
+   0xff, 0xff, 0xff, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x5d, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xea, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0xff, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xff, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xbb, 0xbb, 0xfb,
+   0xff, 0xff, 0x7f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xbf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xee, 0xee, 0xee,
+   0xff, 0xff, 0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xff, 0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea, 0xbb, 0xfb,
+   0xff, 0xff, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5, 0x55, 0xd5,
+   0xff, 0xff, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xee, 0xee,
+   0xff, 0x7f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xff, 0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xba, 0xfb,
+   0xff, 0x57, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x75, 0xd5,
+   0xff, 0xab, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xee,
+   0xff, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5,
+   0xbf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xfe,
+   0x5f, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xdd,
+   0xaf, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xea,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

lib/obp60task/obp40.conf

@@ -1,807 +0,0 @@
-[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

@@ -1,857 +0,0 @@
-[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,8 +1,6 @@
-// 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
@@ -13,13 +11,9 @@
 #include <NMEA0183Messages.h>
 #include <GxEPD2_BW.h>                  // GxEPD2 lib for b/w E-Ink displays
 #include "OBP60Extensions.h"            // Functions lib for extension board
-#include "OBPKeyboardTask.h"            // Functions lib for keyboard handling
+#include "OBP60Keypad.h"                // Functions for keypad
 #include "BoatDataCalibration.h"        // Functions lib for data instance calibration
 #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
@@ -27,8 +21,13 @@
 #endif
 
 // Pictures
-#include "images/OBP_400x300.xbm"       // OBP Logo
+//#include GxEPD_BitmapExamples         // Example picture
+#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
+#include "OBPTrackerTask.h"             // Functions lib for tracker data
 
 // Global vars
 bool initComplete = false;      // Initialization complete
@@ -66,15 +65,15 @@ void OBP60Init(GwApi *api){
 #endif
 
     // Settings for e-paper display
-    String fastrefresh = config->getConfigItem(config->fastRefresh,true)->asString();
+    String fastrefresh = api->getConfig()->getConfigItem(api->getConfig()->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);
@@ -82,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 = config->getConfigItem(config->backlight,true)->asString();
+    String backlightMode = api->getConfig()->getConfigItem(api->getConfig()->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(config->getConfigItem(config->blBrightness,true)->asInt());
+    uint brightness = uint(api->getConfig()->getConfigItem(api->getConfig()->blBrightness,true)->asInt());
-    String backlightColor = config->getConfigItem(config->blColor,true)->asString();
+    String backlightColor = api->getConfig()->getConfigItem(api->getConfig()->blColor,true)->asString();
-    if (backlightMode == "On") {
+    if(String(backlightMode) == "On"){
-        setBacklightLED(brightness, colorMapping(backlightColor));
+           setBacklightLED(brightness, colorMapping(backlightColor));
     }
-    else if (backlightMode == "Off") {
+    else if(String(backlightMode) == "Off"){
-        setBacklightLED(0, COLOR_BLACK); // Backlight LEDs off (blue without britghness)
+           setBacklightLED(0, COLOR_BLACK); // Backlight LEDs off (blue without britghness)
     }
-    else if (backlightMode == "Control by Key") {
+    else if(String(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 = config->getConfigItem(config->flashLED,true)->asString();
+    String ledMode = api->getConfig()->getConfigItem(api->getConfig()->flashLED,true)->asString();
     logger->logDebug(GwLog::DEBUG,"LED Mode is: %s", ledMode.c_str());
-    if (ledMode == "Off") {
+    if(String(ledMode) == "Off"){
         setBlinkingLED(false);
     }
 
@@ -115,32 +114,42 @@ void OBP60Init(GwApi *api){
     initComplete = true;
 
     // Buzzer tone for initialization finish
-    setBuzzerPower(uint(config->getConfigItem(config->buzzerPower,true)->asInt()));
+    setBuzzerPower(uint(api->getConfig()->getConfigItem(api->getConfig()->buzzerPower,true)->asInt()));
     buzzer(TONE4, 500);
 
 }
 
-/* ux-functions not working WTF?
+typedef struct {
-bool listTasks(GwLog *logger) {
+        int page0=0;
-    UBaseType_t taskCount = uxTaskGetNumberOfTasks();
+        QueueHandle_t queue;
-    TaskStatus_t *taskStatusArray;
+        GwLog* logger = nullptr;
+//        GwApi* api = nullptr;
+        uint sensitivity = 100;
+        bool use_syspage = true;
+    } MyData;
 
-    taskStatusArray = (TaskStatus_t *)pvPortMalloc(taskCount * sizeof(TaskStatus_t));
+// Keyboard Task
-    if (taskStatusArray != NULL) {
+void keyboardTask(void *param){
-        taskCount = uxTaskGetSystemState(taskStatusArray, taskCount, NULL);
+    MyData *data=(MyData *)param;
-        for (UBaseType_t i = 0; i < taskCount; i++) {
+
-            logger->logDebug(GwLog::LOG, "Task Name: %s (Stack=%d)", taskStatusArray[i].pcTaskName,
+    int keycode = 0;
-                taskStatusArray[i].usStackHighWaterMark);
+    data->logger->logDebug(GwLog::LOG,"Start keyboard task");
-            // more fields in task status
+
-            // xHandle, uxCurrentPriority, uxBasePriority, usStackHighWaterMark
+    // Loop for keyboard task
+    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);
         }
-        vPortFree(taskStatusArray);
+        delay(20);      // 50Hz update rate (20ms)
-        return true;
     }
-    logger->logDebug(GwLog::ERROR, "Failed to allocate memory for task list");
+    vTaskDelete(NULL);
-    return false;
+}
-} */
 
+// Scorgan: moved class declaration to header file <obp60task.h> to make class available to other functions
+// --- Class BoatValueList --------------
 bool BoatValueList::addValueToList(GwApi::BoatValue *v){
     for (int i=0;i<numValues;i++){
         if (allBoatValues[i] == v){
@@ -153,7 +162,6 @@ 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++){
@@ -165,6 +173,7 @@ GwApi::BoatValue *BoatValueList::findValueOrCreate(String name){
     addValueToList(rt);
     return rt;
 }
+// --- Class BoatValueList --------------
 
 //we want to have a list that has all our page definitions
 //this way each page can easily be added here
@@ -191,13 +200,12 @@ class PageList{
  * each page should have defined a registerXXXPage variable of type
  * PageData that describes what it needs
  */
-void registerAllPages(GwLog *logger, PageList &list){
+void registerAllPages(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);
@@ -253,15 +261,8 @@ void registerAllPages(GwLog *logger, PageList &list){
     list.add(&registerPageFluid);
     extern PageDescription registerPageSkyView;
     list.add(&registerPageSkyView);
-    extern PageDescription registerPageAnchor;
-    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
@@ -272,18 +273,18 @@ void underVoltageError(CommonData &common) {
     setFlashLED(false);                     // Flash LED Off
     buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
     // Shutdown EInk display
-    epd->setFullWindow();           // Set full Refresh
+    getdisplay().setFullWindow();           // Set full Refresh
-    //epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+    //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-    epd->fillScreen(common.bgcolor);// Clear screen
+    getdisplay().fillScreen(common.bgcolor);// Clear screen
-    epd->setTextColor(common.fgcolor);
+    getdisplay().setTextColor(common.fgcolor);
-    epd->setFont(&Ubuntu_Bold20pt8b);
+    getdisplay().setFont(&Ubuntu_Bold20pt8b);
-    epd->setCursor(65, 150);
+    getdisplay().setCursor(65, 150);
-    epd->print("Undervoltage");
+    getdisplay().print("Undervoltage");
-    epd->setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-    epd->setCursor(65, 175);
+    getdisplay().setCursor(65, 175);
-    epd->print("Charge battery and restart system");
+    getdisplay().print("Charge battery and restart system");
-    epd->nextPage();                // Partial update
+    getdisplay().nextPage();                // Partial update
-    epd->powerOff();                // Display power off
+    getdisplay().powerOff();                // Display power off
     setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
     setPortPin(OBP_POWER_SD, false);        // Power off SD card
 #else
@@ -293,17 +294,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
-    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-    epd->fillScreen(common.bgcolor);// Clear screen
+    getdisplay().fillScreen(common.bgcolor);// Clear screen
-    epd->setTextColor(common.fgcolor);
+    getdisplay().setTextColor(common.fgcolor);
-    epd->setFont(&Ubuntu_Bold20pt8b);
+    getdisplay().setFont(&Ubuntu_Bold20pt8b);
-    epd->setCursor(65, 150);
+    getdisplay().setCursor(65, 150);
-    epd->print("Undervoltage");
+    getdisplay().print("Undervoltage");
-    epd->setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-    epd->setCursor(65, 175);
+    getdisplay().setCursor(65, 175);
-    epd->print("To wake up repower system");
+    getdisplay().print("To wake up repower system");
-    epd->nextPage();                // Partial update
+    getdisplay().nextPage();                // Partial update
-    epd->powerOff();                // Display power off
+    getdisplay().powerOff();                // Display power off
 #endif
     while (true) {
         esp_deep_sleep_start(); // Deep Sleep without wakeup. Wakeup only after power cycle (restart).
@@ -313,10 +314,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
@@ -328,17 +329,16 @@ 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(logger, allPages);
+    registerAllPages(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
@@ -353,8 +353,8 @@ void OBP60Task(GwApi *api){
     }
 
     // Init E-Ink display
-    String displaymode = config->getConfigItem(config->display,true)->asString();
+    String displaymode = api->getConfig()->getConfigItem(api->getConfig()->display,true)->asString();
-    String displaycolor = config->getConfigItem(config->displaycolor,true)->asString();
+    String displaycolor = api->getConfig()->getConfigItem(api->getConfig()->displaycolor,true)->asString();
     if (displaycolor == "Normal") {
         commonData.fgcolor = GxEPD_BLACK;
         commonData.bgcolor = GxEPD_WHITE;
@@ -363,48 +363,48 @@ void OBP60Task(GwApi *api){
         commonData.fgcolor = GxEPD_WHITE;
         commonData.bgcolor = GxEPD_BLACK;
     }
-    String systemname = config->getConfigItem(config->systemName, true)->asString();
+    String systemname = api->getConfig()->getConfigItem(api->getConfig()->systemName,true)->asString();
-    String wifipass = config->getConfigItem(config->apPassword, true)->asString();
+    String wifipass = api->getConfig()->getConfigItem(api->getConfig()->apPassword,true)->asString();
-    bool refreshmode = config->getConfigItem(config->refresh, true)->asBoolean();
+    bool refreshmode = api->getConfig()->getConfigItem(api->getConfig()->refresh,true)->asBoolean();
-    bool symbolmode = (config->getString(config->headerFormat) == "ICON");
+    String fastrefresh = api->getConfig()->getConfigItem(api->getConfig()->fastRefresh,true)->asString();
-    String fastrefresh = config->getConfigItem(config->fastRefresh, true)->asString();
+    uint fullrefreshtime = uint(api->getConfig()->getConfigItem(api->getConfig()->fullRefreshTime,true)->asInt());
-    uint fullrefreshtime = uint(config->getConfigItem(config->fullRefreshTime, true)->asInt());
+    bool tracker_enabled = api->getConfig()->getConfigItem(api->getConfig()->trackerType,true)->asString() != "NONE";
-#ifdef BOARD_OBP40S3
+    #ifdef BOARD_OBP40S3
     bool syspage_enabled = config->getBool(config->systemPage);
-#endif
+    #endif
 
-#ifdef DISPLAY_GDEY042T81
+    #ifdef DISPLAY_GDEY042T81
-        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->setRotation(0);                 // Set display orientation (horizontal)
+    getdisplay().setRotation(0);                 // Set display orientation (horizontal)
-    epd->setFullWindow();                // Set full Refresh
+    getdisplay().setFullWindow();                // Set full Refresh
-    epd->firstPage();                    // set first page
+    getdisplay().firstPage();                    // set first page
-    epd->fillScreen(commonData.bgcolor);
+    getdisplay().fillScreen(commonData.bgcolor);
-    epd->setTextColor(commonData.fgcolor);
+    getdisplay().setTextColor(commonData.fgcolor);
-    epd->nextPage();                     // Full Refresh
+    getdisplay().nextPage();                     // Full Refresh
-    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);
+    getdisplay().fillScreen(commonData.bgcolor);
-    epd->nextPage();                     // Fast Refresh
+    getdisplay().nextPage();                     // Fast Refresh
-    epd->nextPage();                     // Fast Refresh
+    getdisplay().nextPage();                     // Fast Refresh
     if(String(displaymode) == "Logo + QR Code" || String(displaymode) == "Logo"){
-        epd->fillScreen(commonData.bgcolor);
+        getdisplay().fillScreen(commonData.bgcolor);
-        epd->drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData.fgcolor);
+        getdisplay().drawBitmap(0, 0, gImage_Logo_OBP_400x300_sw, getdisplay().width(), getdisplay().height(), commonData.fgcolor); // Draw start logo
-        epd->nextPage();                 // Fast Refresh
+        getdisplay().nextPage();                 // Fast Refresh
-        epd->nextPage();                 // Fast Refresh
+        getdisplay().nextPage();                 // Fast Refresh
         delay(SHOW_TIME);                        // Logo show time
         if(String(displaymode) == "Logo + QR Code"){
-            epd->fillScreen(commonData.bgcolor);
+            getdisplay().fillScreen(commonData.bgcolor);
             qrWiFi(systemname, wifipass, commonData.fgcolor, commonData.bgcolor);  // Show QR code for WiFi connection
-            epd->nextPage();             // Fast Refresh
+            getdisplay().nextPage();             // Fast Refresh
-            epd->nextPage();             // Fast Refresh
+            getdisplay().nextPage();             // Fast Refresh
             delay(SHOW_TIME);                    // QR code show time
         }
-        epd->fillScreen(commonData.bgcolor);
+        getdisplay().fillScreen(commonData.bgcolor);
-        epd->nextPage();                 // Fast Refresh
+        getdisplay().nextPage();                 // Fast Refresh
-        epd->nextPage();                 // Fast Refresh
+        getdisplay().nextPage();                 // Fast Refresh
     }
     
     // Init pages
@@ -501,46 +501,56 @@ 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...
-    KbTaskData kbparams;
+    MyData allParameters;
-    kbparams.logger = api->getLogger();
+    allParameters.logger=api->getLogger();
-    kbparams.queue = xQueueCreate(10, sizeof(int));
+    allParameters.page0=3;
-    kbparams.sensitivity = api->getConfig()->getInt(GwConfigDefinitions::tSensitivity);
+    allParameters.queue=xQueueCreate(10,sizeof(int));
-#ifdef BOARD_OBP40S3
+    allParameters.sensitivity= api->getConfig()->getInt(GwConfigDefinitions::tSensitivity);
-    kbparams.use_syspage = syspage_enabled;
+    #ifdef BOARD_OBP40S3
-#endif
+    allParameters.use_syspage = syspage_enabled;
-    createKeyboardTask(&kbparams);
+    #endif
-    // we start a separate task to collect sensor data
+    xTaskCreate(keyboardTask,"keyboard",2000,&allParameters,configMAX_PRIORITIES-1,NULL);
-    SharedData *shared = new SharedData(api);
+    SharedData *shared=new SharedData(api);
     createSensorTask(shared);
 
+    // Tracker task
+    if (tracker_enabled) {
+        TrackerData trackerData;
+        trackerData.api = api;
+        trackerData.logger = logger;
+        createTrackerTask(&trackerData);
+    } else {
+        LOG_DEBUG(GwLog::LOG, "Tracker not enabled. No task created.");
+    }
+
     // Task Loop
     //####################################################################################
 
     // Configuration values for main loop
-    String gpsFix = config->getConfigItem(config->flashLED,true)->asString();
+    String gpsFix = api->getConfig()->getConfigItem(api->getConfig()->flashLED,true)->asString();
-    String gpsOn = config->getConfigItem(config->useGPS,true)->asString();
+    String gpsOn=api->getConfig()->getConfigItem(api->getConfig()->useGPS,true)->asString();
-    float tz = config->getConfigItem(config->timeZone,true)->asFloat();
+    float tz = api->getConfig()->getConfigItem(api->getConfig()->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 = 2.55 * 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 = config->getConfigItem(config->cpuSpeed, true)->asString();
+    String cpuspeed = api->getConfig()->getConfigItem(api->getConfig()->cpuSpeed,true)->asString();
-    uint hdopAccuracy = uint(config->getConfigItem(config->hdopAccuracy, true)->asInt());
+    uint hdopAccuracy = uint(api->getConfig()->getConfigItem(api->getConfig()->hdopAccuracy,true)->asInt());
 
-    double homelat = config->getString(config->homeLAT).toDouble();
+    double homelat = commonData.config->getString(commonData.config->homeLAT).toDouble();
-    double homelon = config->getString(config->homeLON).toDouble();
+    double homelon = commonData.config->getString(commonData.config->homeLON).toDouble();
     bool homevalid = homelat >= -180.0 and homelat <= 180 and homelon >= -90.0 and homelon <= 90.0;
     if (homevalid) {
-        logger->logDebug(GwLog::LOG, "Home location set to lat=%f, lon=%f", homelat, homelon);
+        LOG_DEBUG(GwLog::LOG, "Home location set to lat=%f, lon=%f", homelat, homelon);
     } else {
-        logger->logDebug(GwLog::LOG, "No valid home location found");
+        LOG_DEBUG(GwLog::LOG, "No valid home location found");
     }
 
     // refreshmode defined in init section
@@ -568,8 +578,6 @@ void OBP60Task(GwApi *api){
 
     pages[pageNumber].page->setupKeys(); // Initialize keys for first page
 
-    // listTasks(logger);
-
     // Main loop runs with 100ms
     //####################################################################################
 
@@ -621,7 +629,7 @@ void OBP60Task(GwApi *api){
          
             // Check the keyboard message
             int keyboardMessage=0;
-            while (xQueueReceive(kbparams.queue,&keyboardMessage, 0)) {
+            while (xQueueReceive(allParameters.queue,&keyboardMessage,0)){
                 LOG_DEBUG(GwLog::LOG,"new key from keyboard %d",keyboardMessage);
                 keypressed = true;
 
@@ -657,12 +665,12 @@ void OBP60Task(GwApi *api){
                             toggleBacklightLED(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))
                     {
@@ -720,23 +728,24 @@ void OBP60Task(GwApi *api){
             if(millis() > starttime4 + 4000 && delayedDisplayUpdate == true){
                 starttime1 = millis();
                 starttime2 = millis();
-                epd->setFullWindow();    // Set full update
+                getdisplay().setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    epd->nextPage();                     // Full update
+                    getdisplay().nextPage();                     // Full update
                 }
                 else{
-                    epd->fillScreen(commonData.fgcolor); // Clear display
+                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
-#ifdef DISPLAY_GDEY042T81
+                    #ifdef DISPLAY_GDEY042T81
-                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+                        getdisplay().hibernate();                  // Set display in hybenate mode
-#else
+                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
-                        epd->init(115200);               // Init for normal displays
+                    #else
-#endif
+                        getdisplay().init(115200);               // Init for normal displays
-                    epd->firstPage();                    // Full update
+                    #endif
-                    epd->nextPage();                     // Full update
+                    getdisplay().firstPage();                    // Full update
-//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+                    getdisplay().nextPage();                     // Full update
-//                    epd->fillScreen(commonData.bgcolor); // Clear display
+//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
                 }
                 delayedDisplayUpdate = false;
             }
@@ -747,23 +756,24 @@ void OBP60Task(GwApi *api){
                 starttime1 = millis();
                 starttime2 = millis();
                 LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh first 5 min");
-                epd->setFullWindow();    // Set full update
+                getdisplay().setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    epd->nextPage();                     // Full update
+                    getdisplay().nextPage();                     // Full update
                 }
                 else{
-                    epd->fillScreen(commonData.fgcolor); // Clear display
+                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
-#ifdef DISPLAY_GDEY042T81
+                    #ifdef DISPLAY_GDEY042T81
-                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+                        getdisplay().hibernate();                  // Set display in hybenate mode
-#else
+                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
-                        epd->init(115200);               // Init for normal displays
+                    #else
-#endif
+                        getdisplay().init(115200);               // Init for normal displays
-                    epd->firstPage();                    // Full update
+                    #endif
-                    epd->nextPage();                     // Full update
+                    getdisplay().firstPage();                    // Full update
-//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+                    getdisplay().nextPage();                     // Full update
-//                    epd->fillScreen(commonData.bgcolor); // Clear display
+//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
                 }
             }
 
@@ -771,23 +781,24 @@ void OBP60Task(GwApi *api){
             if(millis() > starttime2 + fullrefreshtime * 60 * 1000){
                 starttime2 = millis();
                 LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh");
-                epd->setFullWindow();    // Set full update
+                getdisplay().setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    epd->nextPage();                     // Full update
+                    getdisplay().nextPage();                     // Full update
                 }
                 else{
-                    epd->fillScreen(commonData.fgcolor); // Clear display
+                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
-#ifdef DISPLAY_GDEY042T81
+                    #ifdef DISPLAY_GDEY042T81
-                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+                        getdisplay().hibernate();                  // Set display in hybenate mode
-#else
+                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
-                        epd->init(115200);               // Init for normal displays
+                    #else
-#endif
+                        getdisplay().init(115200);               // Init for normal displays
-                    epd->firstPage();                    // Full update
+                    #endif
-                    epd->nextPage();                     // Full update
+                    getdisplay().firstPage();                    // Full update
-//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+                    getdisplay().nextPage();                     // Full update
-//                    epd->fillScreen(commonData.bgcolor); // Clear display
+//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
                 }
             }        
                 
@@ -813,13 +824,13 @@ void OBP60Task(GwApi *api){
                  hstryBufList.handleHstryBuf(useSimuData);
 
                 // Clear display
-                // epd->fillRect(0, 0, epd->width(), epd->height(), commonData.bgcolor);
+                // getdisplay().fillRect(0, 0, getdisplay().width(), getdisplay().height(), commonData.bgcolor);
-                epd->fillScreen(commonData.bgcolor);  // Clear display
+                getdisplay().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, symbolmode, date, time, hdop);  // Show page header
+                    displayHeader(commonData, date, time, hdop);  // Show page header
                 }
 
                 // Call the particular page
@@ -837,15 +848,15 @@ void OBP60Task(GwApi *api){
                     if (currentPage == NULL){
                         LOG_DEBUG(GwLog::ERROR,"page number %d not found", pageNumber);
                         // Error handling for missing page
-                        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->drawXBitmap(200 - unknown_width / 2, 150 - unknown_height / 2, unknown_bits, unknown_width, unknown_height, commonData.fgcolor);
+                        getdisplay().drawXBitmap(200 - unknown_width / 2, 150 - unknown_height / 2, unknown_bits, unknown_width, unknown_height, commonData.fgcolor);
-                        epd->setCursor(140, 250);
+                        getdisplay().setCursor(140, 250);
-                        epd->setFont(&Atari16px);
+                        getdisplay().setFont(&Atari16px);
-                        epd->print("Here be dragons!");
+                        getdisplay().print("Here be dragons!");
-                        epd->nextPage(); // Partial update (fast)
+                        getdisplay().nextPage(); // Partial update (fast)
                     }
-                    else {
+                    else{
                         if (lastPage != pageNumber){
                             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
@@ -864,10 +875,10 @@ void OBP60Task(GwApi *api){
                             displayAlarm(commonData);
                         }
                         if (ret & PAGE_UPDATE) {
-                            epd->nextPage(); // Partial update (fast)
+                            getdisplay().nextPage(); // Partial update (fast)
                         }
                         if (ret & PAGE_HIBERNATE) {
-                            epd->hibernate();
+                            getdisplay().hibernate();
                         }
                     }
 

lib/obp60task/obp60task.h

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

lib/obp60task/platformio.ini

@@ -8,6 +8,7 @@ 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
@@ -15,18 +16,20 @@ 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
-board_name = OBP60
 framework = arduino
 lib_deps = 
     ${basedeps.lib_deps}
     Wire
     SPI
     ESP32time
+    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
@@ -51,8 +54,6 @@ build_flags=
 #    -D DISPLAY_GYE042A87            #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm - medium 
 #    -D DISPLAY_SE0420NQ04           #alternativ E-Ink display from SID Technology, R10 2.2 ohm - bad (burn in effects)
 #    -D DISPLAY_ZJY400300-042CAAMFGN #alternativ E-Ink display from ZZE Technology, R10 2.2 ohm - very good
-#    -D ENABLE_TRUEWIND               # calculate true wind data (default off)
-#    -D ENABLE_CALIBRATION            # boat data calibration (default off)
     ${env.build_flags}
 #CONFIG_ESP_TASK_WDT_TIMEOUT_S = 10 #Task Watchdog timeout period (seconds) [1...60] 5 default
 upload_port = /dev/ttyACM0          #OBP60 download via USB-C direct
@@ -61,22 +62,27 @@ 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
-board_name = OBP40
 custom_config = config_obp40.json
 framework = arduino
 lib_deps =
     ${basedeps.lib_deps}
     Wire
     SPI
+    SD
     ESP32time
+    PubSubClient
+    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
@@ -94,10 +100,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
-#   -D ENABLE_TRUEWIND              # calculate true wind data (default off)
-#   -D ENABLE_CALIBRATION           # boat data calibration (default off)
     ${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