From 0b4d10a69cd68e4457bf6f19feeaa4004f528a7d Mon Sep 17 00:00:00 2001 From: Brian Jones Date: Mon, 15 Dec 2014 16:44:08 -0800 Subject: [PATCH] More set commands being implemented. Defrost, fanspeed, seat heater, and hazard Change-Id: Ie4be80ee092d7fd4a089acd25923bfabd92b7fb5 --- js/hvacControler.js | 20 +++----------------- packaging/modello-hvac.changes | 6 ++++++ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/js/hvacControler.js b/js/hvacControler.js index 39a58c3..e9435e1 100644 --- a/js/hvacControler.js +++ b/js/hvacControler.js @@ -453,11 +453,6 @@ hvacControler.prototype.initButtons = function() { "use strict"; // Hazard $("#hazard_btn").bind('click', function() { - //This is temporary until AMB supports setting values from JS - bootstrap.carIndicator.status.hazard = !bootstrap.carIndicator.status.hazard; - hvacControler.prototype.onHazardChanged(bootstrap.carIndicator.status.hazard); - //TODO remove once functionality exists for each button - bootstrap.carIndicator.setStatus("hazard", !bootstrap.carIndicator.status.hazard); bootstrap.carIndicator.setStatus("DirectionIndicationINST", !bootstrap.carIndicator.status.hazard ? 3 : 0); bootstrap.carIndicator.setStatus("DirectionIndicationMS", !bootstrap.carIndicator.status.hazard ? 3 : 0); @@ -531,9 +526,6 @@ hvacControler.prototype.initButtons = function() { }); // AirRecirculation $("#fan_control_circ").bind('click', function() { - bootstrap.carIndicator.status.airRecirculation = !bootstrap.carIndicator.status.airRecirculation; - hvacControler.prototype.onAirRecirculationChanged(bootstrap.carIndicator.status.airRecirculation); - bootstrap.carIndicator.setStatus("airRecirculation", !bootstrap.carIndicator.status.airRecirculation); bootstrap.carIndicator.setStatus("RecircReq", !bootstrap.carIndicator.status.airRecirculation ? 1 : 0); }); @@ -578,7 +570,7 @@ hvacControler.prototype.initButtons = function() { $("#fan_dir_down_btn").bind('click', function() { var currentStatus = bootstrap.carIndicator.status.airflowDirection; //TODO removed temp until set is enabled - if ((currentStatus >= 0) && (currentStatus <= 7)){ // && (bootstrap.carIndicator.status.fanSpeed !== 0)) { + if ((currentStatus >= 0) && (currentStatus <= 7) && (bootstrap.carIndicator.status.fanSpeed !== 0)) { var newStatus = changeAirflowDirectionStatus("#fan_dir_down_btn", currentStatus, 1); hvacControler.prototype.onAirflowDirectionChanged(1); setAirFlowDirectionStatus(newStatus); @@ -587,7 +579,7 @@ hvacControler.prototype.initButtons = function() { // AirflowDirection - Defroster - 4 (SCREEN) $("#fan_dir_up_btn").bind('click', function() { var currentStatus = bootstrap.carIndicator.status.airflowDirection; - if ((currentStatus >= 0) && (currentStatus <= 7)){ // && (bootstrap.carIndicator.status.fanSpeed !== 0)) { + if ((currentStatus >= 0) && (currentStatus <= 7) && (bootstrap.carIndicator.status.fanSpeed !== 0)) { var newStatus = changeAirflowDirectionStatus("#fan_dir_up_btn", currentStatus, 4); hvacControler.prototype.onAirflowDirectionChanged(4); setAirFlowDirectionStatus(newStatus); @@ -596,7 +588,7 @@ hvacControler.prototype.initButtons = function() { // AirflowDirection - Front - 2 (FACE) $("#fan_dir_right_btn").bind('click', function() { var currentStatus = bootstrap.carIndicator.status.airflowDirection; - if ((currentStatus >= 0) && (currentStatus <= 7)){ // && (bootstrap.carIndicator.status.fanSpeed !== 0)) { + if ((currentStatus >= 0) && (currentStatus <= 7) && (bootstrap.carIndicator.status.fanSpeed !== 0)) { var newStatus = changeAirflowDirectionStatus("#fan_dir_right_btn", currentStatus, 2); hvacControler.prototype.onAirflowDirectionChanged(2); setAirFlowDirectionStatus(newStatus); @@ -628,16 +620,10 @@ hvacControler.prototype.initButtons = function() { }); // Defrost - Rear $("#defrost_rear_btn").bind('click', function() { - bootstrap.carIndicator.status.rearDefrost = !bootstrap.carIndicator.status.rearDefrost; - hvacControler.prototype.onRearDefrostChanged(bootstrap.carIndicator.status.rearDefrost); - bootstrap.carIndicator.setStatus("rearDefrost", !bootstrap.carIndicator.status.rearDefrost); }); // Defrost - Front $("#defrost_front_btn").bind('click', function() { - bootstrap.carIndicator.status.frontDefrost = !bootstrap.carIndicator.status.frontDefrost; - hvacControler.prototype.onFrontDefrostChanged(bootstrap.carIndicator.status.frontDefrost); - bootstrap.carIndicator.setStatus("frontDefrost", !bootstrap.carIndicator.status.frontDefrost); }); }; diff --git a/packaging/modello-hvac.changes b/packaging/modello-hvac.changes index d0f6a1a..9b6ea01 100644 --- a/packaging/modello-hvac.changes +++ b/packaging/modello-hvac.changes @@ -1,3 +1,9 @@ +* Mon Dec 15 2014 Brian Jones submit/tizen_ivi/20141213.000015-1-g4163931 +- More set commands being implemented. Defrost, fanspeed, seat heater, and hazard + +* Fri Dec 12 2014 Brian Jones accepted/tizen/ivi/20141202.054127-1-ge1aa1a7 +- Updates to utilize AMB set calls + * Mon Dec 01 2014 Brian Jones accepted/tizen/3.0.m14.3/ivi/20141018.100009-1-gce7f5a8 - Changed to use the navigator.vehicle namespace - TC-2055 -- 2.7.4