No need for bit masks on bit fields. (#1139)
This commit is contained in:
parent
0dd42a2303
commit
1c9122ded3
|
@ -87,7 +87,7 @@ Air Conditioning Control
|
|||
*/
|
||||
void initialiseAirCon(void)
|
||||
{
|
||||
if( (configPage15.airConEnable&1) == 1 &&
|
||||
if( (configPage15.airConEnable) == 1 &&
|
||||
pinAirConRequest != 0 &&
|
||||
pinAirConComp != 0 )
|
||||
{
|
||||
|
@ -217,7 +217,7 @@ bool READ_AIRCON_REQUEST(void)
|
|||
return false;
|
||||
}
|
||||
// Read the status of the A/C request pin (A/C button), taking into account the pin's polarity
|
||||
bool acReqPinStatus = ( ((configPage15.airConReqPol&1)==1) ?
|
||||
bool acReqPinStatus = ( ((configPage15.airConReqPol)==1) ?
|
||||
!!(*aircon_req_pin_port & aircon_req_pin_mask) :
|
||||
!(*aircon_req_pin_port & aircon_req_pin_mask));
|
||||
BIT_WRITE(currentStatus.airConStatus, BIT_AIRCON_REQUEST, acReqPinStatus);
|
||||
|
@ -346,7 +346,7 @@ void fanControl(void)
|
|||
|
||||
if ( (fanPermit == true) &&
|
||||
((currentStatus.coolant >= onTemp) ||
|
||||
((configPage15.airConTurnsFanOn&1) == 1 &&
|
||||
((configPage15.airConTurnsFanOn) == 1 &&
|
||||
BIT_CHECK(currentStatus.airConStatus, BIT_AIRCON_TURNING_ON) == true)) )
|
||||
{
|
||||
//Fan needs to be turned on - either by high coolant temp, or from an A/C request (to ensure there is airflow over the A/C radiator).
|
||||
|
@ -387,7 +387,7 @@ void fanControl(void)
|
|||
else
|
||||
{
|
||||
byte tempFanDuty = table2D_getValue(&fanPWMTable, currentStatus.coolant + CALIBRATION_TEMPERATURE_OFFSET); //In normal situation read PWM duty from the table
|
||||
if((configPage15.airConTurnsFanOn&1) == 1 &&
|
||||
if((configPage15.airConTurnsFanOn) == 1 &&
|
||||
BIT_CHECK(currentStatus.airConStatus, BIT_AIRCON_TURNING_ON) == true)
|
||||
{
|
||||
// Clamp the fan duty to airConPwmFanMinDuty or above, to ensure there is airflow over the A/C radiator
|
||||
|
|
|
@ -44,10 +44,10 @@ void wmiControl(void);
|
|||
#define FUEL_PUMP_ON() (digitalWrite(pinFuelPump, HIGH))
|
||||
#define FUEL_PUMP_OFF() (digitalWrite(pinFuelPump, LOW))
|
||||
|
||||
#define AIRCON_ON() { ((((configPage15.airConCompPol&1)==1)) ? AIRCON_PIN_LOW() : AIRCON_PIN_HIGH()); BIT_SET(currentStatus.airConStatus, BIT_AIRCON_COMPRESSOR); }
|
||||
#define AIRCON_OFF() { ((((configPage15.airConCompPol&1)==1)) ? AIRCON_PIN_HIGH() : AIRCON_PIN_LOW()); BIT_CLEAR(currentStatus.airConStatus, BIT_AIRCON_COMPRESSOR); }
|
||||
#define AIRCON_FAN_ON() { ((((configPage15.airConFanPol&1)==1)) ? AIRCON_FAN_PIN_LOW() : AIRCON_FAN_PIN_HIGH()); BIT_SET(currentStatus.airConStatus, BIT_AIRCON_FAN); }
|
||||
#define AIRCON_FAN_OFF() { ((((configPage15.airConFanPol&1)==1)) ? AIRCON_FAN_PIN_HIGH() : AIRCON_FAN_PIN_LOW()); BIT_CLEAR(currentStatus.airConStatus, BIT_AIRCON_FAN); }
|
||||
#define AIRCON_ON() { (((configPage15.airConCompPol==1)) ? AIRCON_PIN_LOW() : AIRCON_PIN_HIGH()); BIT_SET(currentStatus.airConStatus, BIT_AIRCON_COMPRESSOR); }
|
||||
#define AIRCON_OFF() { (((configPage15.airConCompPol==1)) ? AIRCON_PIN_HIGH() : AIRCON_PIN_LOW()); BIT_CLEAR(currentStatus.airConStatus, BIT_AIRCON_COMPRESSOR); }
|
||||
#define AIRCON_FAN_ON() { (((configPage15.airConFanPol==1)) ? AIRCON_FAN_PIN_LOW() : AIRCON_FAN_PIN_HIGH()); BIT_SET(currentStatus.airConStatus, BIT_AIRCON_FAN); }
|
||||
#define AIRCON_FAN_OFF() { (((configPage15.airConFanPol==1)) ? AIRCON_FAN_PIN_HIGH() : AIRCON_FAN_PIN_LOW()); BIT_CLEAR(currentStatus.airConStatus, BIT_AIRCON_FAN); }
|
||||
|
||||
#define FAN_ON() { ((configPage6.fanInv) ? FAN_PIN_LOW() : FAN_PIN_HIGH()); }
|
||||
#define FAN_OFF() { ((configPage6.fanInv) ? FAN_PIN_HIGH() : FAN_PIN_LOW()); }
|
||||
|
@ -73,10 +73,10 @@ void wmiControl(void);
|
|||
#define AIRCON_FAN_PIN_LOW() *aircon_fan_pin_port &= ~(aircon_fan_pin_mask)
|
||||
#define AIRCON_FAN_PIN_HIGH() *aircon_fan_pin_port |= (aircon_fan_pin_mask)
|
||||
|
||||
#define AIRCON_ON() ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ((((configPage15.airConCompPol&1)==1)) ? AIRCON_PIN_LOW() : AIRCON_PIN_HIGH()); BIT_SET(currentStatus.airConStatus, BIT_AIRCON_COMPRESSOR); }
|
||||
#define AIRCON_OFF() ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ((((configPage15.airConCompPol&1)==1)) ? AIRCON_PIN_HIGH() : AIRCON_PIN_LOW()); BIT_CLEAR(currentStatus.airConStatus, BIT_AIRCON_COMPRESSOR); }
|
||||
#define AIRCON_FAN_ON() ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ((((configPage15.airConFanPol&1)==1)) ? AIRCON_FAN_PIN_LOW() : AIRCON_FAN_PIN_HIGH()); BIT_SET(currentStatus.airConStatus, BIT_AIRCON_FAN); }
|
||||
#define AIRCON_FAN_OFF() ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ((((configPage15.airConFanPol&1)==1)) ? AIRCON_FAN_PIN_HIGH() : AIRCON_FAN_PIN_LOW()); BIT_CLEAR(currentStatus.airConStatus, BIT_AIRCON_FAN); }
|
||||
#define AIRCON_ON() ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ((((configPage15.airConCompPol)==1)) ? AIRCON_PIN_LOW() : AIRCON_PIN_HIGH()); BIT_SET(currentStatus.airConStatus, BIT_AIRCON_COMPRESSOR); }
|
||||
#define AIRCON_OFF() ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ((((configPage15.airConCompPol)==1)) ? AIRCON_PIN_HIGH() : AIRCON_PIN_LOW()); BIT_CLEAR(currentStatus.airConStatus, BIT_AIRCON_COMPRESSOR); }
|
||||
#define AIRCON_FAN_ON() ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ((((configPage15.airConFanPol)==1)) ? AIRCON_FAN_PIN_LOW() : AIRCON_FAN_PIN_HIGH()); BIT_SET(currentStatus.airConStatus, BIT_AIRCON_FAN); }
|
||||
#define AIRCON_FAN_OFF() ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ((((configPage15.airConFanPol)==1)) ? AIRCON_FAN_PIN_HIGH() : AIRCON_FAN_PIN_LOW()); BIT_CLEAR(currentStatus.airConStatus, BIT_AIRCON_FAN); }
|
||||
|
||||
#define FAN_ON() ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ((configPage6.fanInv) ? FAN_PIN_LOW() : FAN_PIN_HIGH()); }
|
||||
#define FAN_OFF() ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { ((configPage6.fanInv) ? FAN_PIN_HIGH() : FAN_PIN_LOW()); }
|
||||
|
|
|
@ -2857,9 +2857,9 @@ void setPinMapping(byte boardID)
|
|||
pinCTPS = pinTranslate(configPage2.CTPSPin);
|
||||
|
||||
// Air conditioning control initialisation
|
||||
if (((configPage15.airConCompPin&63) != 0) && ((configPage15.airConCompPin&63) < BOARD_MAX_IO_PINS) ) { pinAirConComp = pinTranslate(configPage15.airConCompPin&63); }
|
||||
if (((configPage15.airConFanPin&63) != 0) && ((configPage15.airConFanPin&63) < BOARD_MAX_IO_PINS) ) { pinAirConFan = pinTranslate(configPage15.airConFanPin&63); }
|
||||
if (((configPage15.airConReqPin&63) != 0) && ((configPage15.airConReqPin&63) < BOARD_MAX_IO_PINS) ) { pinAirConRequest = pinTranslate(configPage15.airConReqPin&63); }
|
||||
if ((configPage15.airConCompPin != 0) && (configPage15.airConCompPin < BOARD_MAX_IO_PINS) ) { pinAirConComp = pinTranslate(configPage15.airConCompPin); }
|
||||
if ((configPage15.airConFanPin != 0) && (configPage15.airConFanPin < BOARD_MAX_IO_PINS) ) { pinAirConFan = pinTranslate(configPage15.airConFanPin); }
|
||||
if ((configPage15.airConReqPin != 0) && (configPage15.airConReqPin < BOARD_MAX_IO_PINS) ) { pinAirConRequest = pinTranslate(configPage15.airConReqPin); }
|
||||
|
||||
/* Reset control is a special case. If reset control is enabled, it needs its initial state set BEFORE its pinMode.
|
||||
If that doesn't happen and reset control is in "Serial Command" mode, the Arduino will end up in a reset loop
|
||||
|
@ -3065,14 +3065,14 @@ void setPinMapping(byte boardID)
|
|||
}
|
||||
}
|
||||
|
||||
if((pinAirConComp>0) && ((configPage15.airConEnable&1) == 1))
|
||||
if((pinAirConComp>0) && ((configPage15.airConEnable) == 1))
|
||||
{
|
||||
pinMode(pinAirConComp, OUTPUT);
|
||||
}
|
||||
|
||||
if((pinAirConRequest > 0) && ((configPage15.airConEnable&1) == 1) && (!pinIsOutput(pinAirConRequest)))
|
||||
if((pinAirConRequest > 0) && ((configPage15.airConEnable) == 1) && (!pinIsOutput(pinAirConRequest)))
|
||||
{
|
||||
if((configPage15.airConReqPol&1) == 1)
|
||||
if((configPage15.airConReqPol) == 1)
|
||||
{
|
||||
// Inverted
|
||||
// +5V is ON, Use external pull-down resistor for OFF
|
||||
|
@ -3086,7 +3086,7 @@ void setPinMapping(byte boardID)
|
|||
}
|
||||
}
|
||||
|
||||
if((pinAirConFan > 0) && ((configPage15.airConEnable&1) == 1) && ((configPage15.airConFanEnabled&1) == 1))
|
||||
if((pinAirConFan > 0) && ((configPage15.airConEnable) == 1) && ((configPage15.airConFanEnabled) == 1))
|
||||
{
|
||||
pinMode(pinAirConFan, OUTPUT);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue