Changeset 152


Ignore:
Timestamp:
2015-05-01 17:21:01 (10 years ago)
Author:
lolodomo
Message:
  • New variable "RFYMode" available for RFY to select between standard mode (value "STANDARD"), venetian US mode (value "VENETIAN_US") or venetian EU mode (value "VENETIAN_EU")
  • UI: "Change angle + (Venetian US)" command available for RFY in the "Managed devices" tab
  • UI: "Change angle - (Venetian US)" command available for RFY in the "Managed devices" tab
  • UI: "Change angle + (Venetian EU)" command available for RFY in the "Managed devices" tab
  • UI: "Change angle - (Venetian EU)" command available for RFY in the "Managed devices" tab
  • UI: "Enable sun/wind detector" command available for RFY in the "Managed devices" tab
  • UI: "Disable sun detector" command available for RFY in the "Managed devices" tab
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/J_RFXtrx.js

    r142 r152  
    624624        [ "RFY0/", "PROGRAM", "Program" ], 
    625625        [ "RFY0/", "LOWER_LIMIT", "Set lower limit" ], 
    626         [ "RFY0/", "UPPER_LIMIT", "Set upper limit" ] 
     626        [ "RFY0/", "UPPER_LIMIT", "Set upper limit" ], 
     627        [ "RFY0/", "VENETIAN_US_ANGLE_PLUS", "Change angle + (Venetian US)" ], 
     628        [ "RFY0/", "VENETIAN_US_ANGLE_MINUS", "Change angle - (Venetian US)" ], 
     629        [ "RFY0/", "VENETIAN_EU_ANGLE_PLUS", "Change angle + (Venetian EU)" ], 
     630        [ "RFY0/", "VENETIAN_EU_ANGLE_MINUS", "Change angle - (Venetian EU)" ], 
     631        [ "RFY0/", "ENABLE_DETECTOR", "Enable sun/wind detector" ], 
     632        [ "RFY0/", "DISABLE_DETECTOR", "Disable sun detector" ] 
    627633    ], 
    628634 

  • TabularUnified trunk/L_RFXtrx.lua

    r150 r152  
    2424     
    2525    RESPONSE_MODE_COMMAND = { 0x01, 0x00, 13, nil, nil, nil }, 
     26    UNKNOWN_RTS_REMOTE = { 0x01, 0x01, 13, nil, nil, nil }, 
    2627    WRONG_COMMAND = { 0x01, 0xFF, 13, nil, nil, nil }, 
    2728     
    … …  
    298299    VAR_REPEAT_EVENT = { "upnp-rfxcom-com:serviceId:rfxtrx1", "RepeatEvent", false, false, true }, 
    299300    VAR_NBR_DEVICES = { "upnp-rfxcom-com:serviceId:rfxtrx1", "NbrDevices", false, false, true }, 
    300     VAR_DEBUG_LOGS = { "upnp-rfxcom-com:serviceId:rfxtrx1", "DebugLogs", false, false, true } 
     301    VAR_DEBUG_LOGS = { "upnp-rfxcom-com:serviceId:rfxtrx1", "DebugLogs", false, false, true }, 
     302    VAR_RFY_MODE = { "upnp-rfxcom-com:serviceId:rfxtrx1", "RFYMode", false, false, true } 
    301303} 
    302304 
    … …  
    308310-- 4) Prefix for the device id 
    309311-- 5) a boolean indicating if variable "Association" must be created for this device type 
    310 -- 6) a boolean indicating if variable "KopplaProgrammed" must be created for this device type 
     312-- 6) a boolean indicating if variable "RFYMode" must be created for this device type 
    311313-- 7) a boolean indicating if variables "AdjustMultiplier" and "AdjustConstant" must be created for this device type 
    312314local tableDeviceTypes = { 
    … …  
    314316    MOTION = { "urn:schemas-micasaverde-com:device:MotionSensor:1", "D_MotionSensor1.xml", "RFX Motion ", "MS/", false, false, false, "MOTION_SENSOR" }, 
    315317    SMOKE = { "urn:schemas-micasaverde-com:device:SmokeSensor:1", "D_SmokeSensor1.xml", "RFX Smoke ", "SS/", false, false, false, nil }, 
    316     LIGHT = { "urn:schemas-upnp-org:device:BinaryLight:1", "D_BinaryLight1.xml", "RFX Light ", "LS/", true, true, false, "SWITCH_LIGHT" }, 
    317     DIMMER = { "urn:schemas-upnp-org:device:DimmableLight:1", "D_DimmableLight1.xml", "RFX dim Light ", "DL/", true, true, false, "DIMMABLE_LIGHT" }, 
    318     COVER = { "urn:schemas-micasaverde-com:device:WindowCovering:1", "D_WindowCovering1.xml", "RFX Window ", "WC/", true, false, false, "WINDOW_COVERING" }, 
     318    LIGHT = { "urn:schemas-upnp-org:device:BinaryLight:1", "D_BinaryLight1.xml", "RFX Light ", "LS/", true, false, false, "SWITCH_LIGHT" }, 
     319    DIMMER = { "urn:schemas-upnp-org:device:DimmableLight:1", "D_DimmableLight1.xml", "RFX dim Light ", "DL/", true, false, false, "DIMMABLE_LIGHT" }, 
     320    COVER = { "urn:schemas-micasaverde-com:device:WindowCovering:1", "D_WindowCovering1.xml", "RFX Window ", "WC/", true, true, false, "WINDOW_COVERING" }, 
    319321    TEMP = { "urn:schemas-micasaverde-com:device:TemperatureSensor:1", "D_TemperatureSensor1.xml", "RFX Temp ", "TS/", false, false, true, nil }, 
    320322    HUM = { "urn:schemas-micasaverde-com:device:HumiditySensor:1", "D_HumiditySensor1.xml", "RFX Hum ", "HS/", false, false, true, nil }, 
    … …  
    11931195                local associations = getVariable(k, tabVars.VAR_ASSOCIATION) 
    11941196                table.insert(tableDevices, { v.id, key, associations, v.description }) 
     1197                if (tableDeviceTypes[key][6] == true) 
     1198                then 
     1199                    setDefaultValue(k, tabVars.VAR_RFY_MODE, "STANDARD") 
     1200                end 
    11951201                if (tableDeviceTypes[key][7] == true) 
    11961202                then 
    … …  
    13631369                    end 
    13641370                    parameters = parameters .. tabVars.VAR_ASSOCIATION[1] .. "," .. tabVars.VAR_ASSOCIATION[2] .. "=" 
     1371                end 
     1372                if (deviceType[6] == true) 
     1373                then 
     1374                    if (parameters ~= "") 
     1375                    then 
     1376                        parameters = parameters .. "\n" 
     1377                    end 
     1378                    parameters = parameters .. tabVars.VAR_RFY_MODE[1] .. "," .. tabVars.VAR_RFY_MODE[2] .. "=STANDARD" 
    13651379                end 
    13661380                if (deviceType[7] == true) 
    … …  
    20132027            error("Response to an unexpected mode command: " .. cmd) 
    20142028        end 
     2029    elseif (subType == tableMsgTypes.UNKNOWN_RTS_REMOTE[2]) 
     2030    then 
     2031        warning("Unknown RTS remote") 
     2032        tableCmds = { { "", "", nil, 0 } } 
    20152033    elseif (subType == tableMsgTypes.WRONG_COMMAND[2]) 
    20162034    then 
    … …  
    33733391 
    33743392    tableMsgTypes.RESPONSE_MODE_COMMAND[4] = decodeResponseMode 
     3393    tableMsgTypes.UNKNOWN_RTS_REMOTE[4] = decodeResponseMode 
    33753394    tableMsgTypes.WRONG_COMMAND[4] = decodeResponseMode 
    33763395    tableMsgTypes.RECEIVER_LOCK_ERROR[4] = decodeResponse 
    … …  
    42224241    elseif (category == 7) 
    42234242    then 
     4243        local mode = getVariable(device, tabVars.VAR_RFY_MODE) or "" 
    42244244        type = tableMsgTypes.RFY0[1] 
    42254245        subType = tonumber(string.sub(id, 7, 7)) 
    42264246        if (cmd == tableCommands.CMD_OPEN[1]) 
    42274247        then 
    4228             cmdCode = 1 
     4248            if (mode == "VENETIAN_US") 
     4249            then 
     4250                cmdCode = 0x0F 
     4251            elseif (mode == "VENETIAN_EU") 
     4252            then 
     4253                cmdCode = 0x11 
     4254            else 
     4255                cmdCode = 0x01 
     4256            end 
    42294257        elseif (cmd == tableCommands.CMD_CLOSE[1]) 
    42304258        then 
    4231             cmdCode = 3 
     4259            if (mode == "VENETIAN_US") 
     4260            then 
     4261                cmdCode = 0x10 
     4262            elseif (mode == "VENETIAN_EU") 
     4263            then 
     4264                cmdCode = 0x12 
     4265            else 
     4266                cmdCode = 0x03 
     4267            end 
    42324268        elseif (cmd == tableCommands.CMD_STOP[1]) 
    42334269        then 
    … …  
    53155351        { "RFY0/", "PROGRAM", tableMsgTypes.RFY0[1], tableMsgTypes.RFY0[2], 0x07 }, 
    53165352        { "RFY0/", "LOWER_LIMIT", tableMsgTypes.RFY0[1], tableMsgTypes.RFY0[2], 0x04 }, 
    5317         { "RFY0/", "UPPER_LIMIT", tableMsgTypes.RFY0[1], tableMsgTypes.RFY0[2], 0x02 } 
     5353        { "RFY0/", "UPPER_LIMIT", tableMsgTypes.RFY0[1], tableMsgTypes.RFY0[2], 0x02 }, 
     5354        { "RFY0/", "VENETIAN_US_ANGLE_PLUS", tableMsgTypes.RFY0[1], tableMsgTypes.RFY0[2], 0x11 }, 
     5355        { "RFY0/", "VENETIAN_US_ANGLE_MINUS", tableMsgTypes.RFY0[1], tableMsgTypes.RFY0[2], 0x12 }, 
     5356        { "RFY0/", "VENETIAN_EU_ANGLE_PLUS", tableMsgTypes.RFY0[1], tableMsgTypes.RFY0[2], 0x0F }, 
     5357        { "RFY0/", "VENETIAN_EU_ANGLE_MINUS", tableMsgTypes.RFY0[1], tableMsgTypes.RFY0[2], 0x10 }, 
     5358        { "RFY0/", "ENABLE_DETECTOR", tableMsgTypes.RFY0[1], tableMsgTypes.RFY0[2], 0x13 }, 
     5359        { "RFY0/", "DISABLE_DETECTOR", tableMsgTypes.RFY0[1], tableMsgTypes.RFY0[2], 0x14 } 
    53185360    } 
    53195361 
    … …  
    53925434                            tonumber(string.sub(remoteId, 5, 6), 16), 
    53935435                            id4 * 16 + unitcode, tableCommands[idxCmd][5], 0) 
    5394     elseif (idxCmd >= 11 and idxCmd <= 13) 
     5436    elseif (idxCmd >= 11 and idxCmd <= 19) 
    53955437    then 
    53965438        remoteId = string.sub(id, 9, 13) 

  • TabularUnified trunk/S_RFXtrx.xml

    r135 r152  
    259259            <allowedValue>LOWER_LIMIT</allowedValue> 
    260260            <allowedValue>UPPER_LIMIT</allowedValue> 
     261            <allowedValue>VENETIAN_US_ANGLE_PLUS</allowedValue> 
     262            <allowedValue>VENETIAN_US_ANGLE_MINUS</allowedValue> 
     263            <allowedValue>VENETIAN_EU_ANGLE_PLUS</allowedValue> 
     264            <allowedValue>VENETIAN_EU_ANGLE_MINUS</allowedValue> 
     265            <allowedValue>ENABLE_DETECTOR</allowedValue> 
     266            <allowedValue>DISABLE_DETECTOR</allowedValue> 
    261267        </allowedValueList> 
    262268    </stateVariable> 
Note: See TracChangeset for help on using the changeset viewer.