Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom/Services/Logic/Display.js @ 1663 – Rev 1181 → 1182

Rev 1181 | Rev 1185 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed

     this.Service(type, name, id);
+}
 /* We inherit from Service with this call, it must always be next
    after the constructor */
-extend(SensorPrint, Service);
+extend(Display, Service);
 /* Declaration of instance variables, for static variables remove prototype */
 /* The currently displayed menuitem */
 Display.prototype.currentMenuItem = null;
 Display.prototype.myLCDService = null;
 Display.prototype.myRotaryService = null;
 Display.prototype.mySoftPwmService = null;
 Display.prototype.myInterval = null;
 Display.prototype.exchangeCalendar = null;
 /* This function must always be declared, this is where all the startup code
    should be placed. Gets called with arguments like what ids to use etc. */
 Display.prototype.initialize = function(initialArguments)
     /* We must always call the parent initialize */
     this.Service.prototype.initialize.call(this, initialArguments);
     /* This is used for function declarations like the callbacks below */
     var self = this;
     if (!this.myInitialArguments["HD44789"])
     {
         log(this.myName + ":" + this.myId + "> Failed to initialize, HD44789-config missing from config.\n");
         return;
+    }
     if (!this.myInitialArguments["Rotary"])
+    {
         log(this.myName + ":" + this.myId + "> Failed to initialize, Rotary-config missing from config.\n");
         return;
+    }
     if (!this.myInitialArguments["softPWM"])
+    {
         log(this.myName + ":" + this.myId + "> Failed to initialize, softPWM-config missing from config.\n");
     this.myRotaryService.registerEventCallback("newBtnStatus", function(args) { self.rotaryBtnUpdate(args); });
     /* Add a callback for when the service goes online */
     this.myRotaryService.registerEventCallback("online", function(args) { self.rotaryOnline(); });
     /* If the service is already online we should call the handler here */
     this.rotaryOnline();
     /* Get the softPWM service that we want from the ServiceManager, it takes type, service name, service id */
     this.mySoftPwmService = ServiceManager.getService("Can", "softPWM", this.myInitialArguments["softPWM"]["Id"]);
     /* Add a callback for when the service goes online */
     this.mySoftPwmService.registerEventCallback("online", function(args) { self.softPwmOnline(); });
     /* If the service is already online we should call the handler here */
     this.softPwmOnline();
     this.exchangeCalendar = new ExchangeCalendar(function(shortname, data) { self.exchangeCalendarLookupCallback(shortname, data); });
 }
 Display.prototype.exchangeCalendarLookupCallback = function(shortname, data)
 {
     if (shortname == this.shortName)
+    {
         //FIXME check if data contains error tag and error message, print to log and keep previous data?
         this.exchangeData = data;
+    }
 }
 Display.prototype.softPwmOnline = function()
 {
 }
 Display.prototype.rotaryOnline = function()
 {
+}
 Display.prototype.rotaryPosUpdate = function(SwitchId)
+{
     for (var i = 0; i < myRotaryService.getSteps(SwitchId); i++)
+    {
         if (myRotaryService.getDirection(SwitchId) == "Clockwise")
         {
             this.currentMenuItem.doRight();
+        }
         else
+        {
             this.currentMenuItem.doLeft();
         }
     }
 }
 Display.prototype.rotaryBtnUpdate = function(SwitchId)
+{
     if (myRotaryService.getButtonStatus(SwitchId) == "Released")
     {
         this.currentMenuItem.doPress();
+    }
+}
+Display.prototype.updateDisplay = function()
+{
+    /* see if the current menuitem wants to update itself */
+    if (this.currentMenuItem.doUpdate)
+    {
+        this.currentMenuItem.doUpdate();
+    }
+    /* send the data for the current menuitem to display */
+    for (var i = 0; i < this.currentMenuItem.displayData.length; i++)
+    {
+        this.myLCDService.printText(0, i, currentMenuItem.displayData[i]);
+    }
+}
 Display.prototype.lcdOffline = function()
+{
     /* If we have no interval timer running do nothing */
     if (this.myInterval != null)
+    {
         /* Stop the interval */
         this.myInterval.stop();
     }
 }
 Display.prototype.lcdOnline = function()
+{
     /* If service is not online do nothing */
     if (this.myLCDService.isOnline())
+    {
             this.myInterval = new Interval(function() { self.timerUpdate() }, 60000);
+        }
         this.myInterval.start();
+    }
 }
 Display.prototype.timerUpdate = function()
 {
     /* If LCD service is not online do nothing */
     if (this.myLCDService.isOnline())
     {
         this.exchangeCalendar.lookup(this.shortName);
-        /* see if the current menuitem wants to update itself */
-        if (this.currentMenuItem.doUpdate)
+        /* update the info on display */
-        {
-            this.currentMenuItem.doUpdate();
+        this.updateDisplay();
-        }
-        /* send the data for the current menuitem to display */
-        for (var i = 0; i < this.currentMenuItem.displayData.length; i++)
-        {
-            this.myLCDService.printText(0, i, currentMenuItem.displayData[i]);
-        }
         //var date = new Date();
         /* Get the current date time on the format YYYY-mm-dd HH.ii.ss */
         //var dateAndTime = date.getDateTimeFormated();
         /* Print the text to the LCD */