Changeset 7

Show
Ignore:
Timestamp:
06/12/03 19:36:12 (9 years ago)
Author:
daschmid
Message:

tray checking

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/soda/Caffeine.py

    r3 r7  
    1919        ioport.outb(0,0x378) 
    2020        self.__ledstate = 0 
     21 
     22    def getTrays(self): 
     23        value = ioport.inb(0x279) 
     24        trays = [ 0, 0, 0, 0, 0] 
     25        for tray in range(0,4): 
     26            if not (value & (1 << (tray+3))): 
     27                trays[tray] = 1 
     28        return trays 
    2129         
     30 
    2231    def dispense(self, tray): 
    2332        if (tray >= 0) and (tray <= 4): 

  • trunk/soda/main.py

    r3 r7  
    149149    def setLEDAvail(self): 
    150150        trays = self.__db.getTrayStats() 
     151        mtray = self.__machine.getTrays() 
    151152        for tid in range(0,4): 
    152             if trays[tid][0] > 0 and trays[tid][1] == 't': 
     153            if trays[tid][0] > 0 and trays[tid][1] == 't' and (mtray[tid] or trays[tid][52 == 't'): 
    153154                self.__machine.setLED(tid,1) 
    154155            else: