di0ib
/
keybrd
Watch 1
Star 0
Fork 0
Code Releases 7 Activity
Browse Source

rename setHigh() setLow() to writeHigh() writeLow()

tags/v0.6.4
wolfv6 7 years ago
parent
b149a831de
commit
a3f2261625
12 changed files with 34 additions and 34 deletions
Unified View Show Diff Stats
  1. 2
    2
      src/LED_Port.cpp
  2. 2
    2
      src/PortInterface.h
  3. 2
    2
      src/PortWriteInterface.h
  4. 4
    4
      src/Port_MCP23018.cpp
  5. 2
    2
      src/Port_MCP23018.h
  6. 4
    4
      src/Port_MCP23S17.cpp
  7. 2
    2
      src/Port_MCP23S17.h
  8. 4
    4
      src/Port_PCA9655E.cpp
  9. 2
    2
      src/Port_PCA9655E.h
  10. 4
    4
      src/Port_ShiftRegs.cpp
  11. 2
    2
      src/Port_ShiftRegs.h
  12. 4
    4
      src/Scanner_IOE.cpp

+ 2
- 2
src/LED_Port.cpp View File



void LED_Port::on() void LED_Port::on()
{ {
refPort.setHigh(pin);
refPort.writeHigh(pin);
} }


void LED_Port::off() void LED_Port::off()
{ {
refPort.setLow(pin);
refPort.writeLow(pin);
} }

+ 2
- 2
src/PortInterface.h View File

public: public:
virtual void beginProtocol()=0; //SPI bus or I2C bus virtual void beginProtocol()=0; //SPI bus or I2C bus
virtual void begin(const uint8_t activeState)=0; //configure GPIO pins virtual void begin(const uint8_t activeState)=0; //configure GPIO pins
virtual void setLow(const uint8_t pin)=0;
virtual void setHigh(const uint8_t pin)=0;
virtual void writeLow(const uint8_t pin)=0;
virtual void writeHigh(const uint8_t pin)=0;
virtual uint8_t read()=0; virtual uint8_t read()=0;
}; };
#endif #endif

+ 2
- 2
src/PortWriteInterface.h View File

class PortWriteInterface class PortWriteInterface
{ {
public: public:
virtual void setLow(const uint8_t pin)=0;
virtual void setHigh(const uint8_t pin)=0;
virtual void writeLow(const uint8_t pin)=0;
virtual void writeHigh(const uint8_t pin)=0;
}; };
#endif #endif

+ 4
- 4
src/Port_MCP23018.cpp View File

Wire.endTransmission(); Wire.endTransmission();
} }
/* setLow() sets pin output LOW.
/* writeLow() sets pin output LOW.
pin is bit pattern, where pin being set is 1. pin is bit pattern, where pin being set is 1.
*/ */
void Port_MCP23018::setLow(const uint8_t pin)
void Port_MCP23018::writeLow(const uint8_t pin)
{ {
outputVal &= ~pin; //set pin output to low outputVal &= ~pin; //set pin output to low
Wire.endTransmission(); Wire.endTransmission();
} }
/* setHigh() sets pin output HIGH.
/* writeHigh() sets pin output HIGH.
pin is bit pattern, where pin being set is 1. pin is bit pattern, where pin being set is 1.
*/ */
void Port_MCP23018::setHigh(const uint8_t pin)
void Port_MCP23018::writeHigh(const uint8_t pin)
{ {
outputVal |= pin; //set pin output to high outputVal |= pin; //set pin output to high

+ 2
- 2
src/Port_MCP23018.h View File

: deviceAddr(deviceAddr), portNum(portNum), outputVal(0), readPins(readPins) {} : deviceAddr(deviceAddr), portNum(portNum), outputVal(0), readPins(readPins) {}
void beginProtocol(); void beginProtocol();
void begin(const uint8_t activeState); void begin(const uint8_t activeState);
virtual void setLow(const uint8_t pin);
virtual void setHigh(const uint8_t pin);
virtual void writeLow(const uint8_t pin);
virtual void writeHigh(const uint8_t pin);
virtual uint8_t read(); virtual uint8_t read();
}; };
#endif #endif

+ 4
- 4
src/Port_MCP23S17.cpp View File

transfer(deviceAddr << 1, portNum + 0x0C, pullUp); //configure GPPU transfer(deviceAddr << 1, portNum + 0x0C, pullUp); //configure GPPU
} }


/* setLow() sets pin output LOW.
/* writeLow() sets pin output LOW.
pin is bit pattern, where pin being set is 1. pin is bit pattern, where pin being set is 1.
*/ */
void Port_MCP23S17::setLow(const uint8_t pin)
void Port_MCP23S17::writeLow(const uint8_t pin)
{ {
outputVal &= ~pin; //set pin output to low outputVal &= ~pin; //set pin output to low
transfer(deviceAddr << 1, portNum + 0x12, outputVal); //set GPIO port to outputVal transfer(deviceAddr << 1, portNum + 0x12, outputVal); //set GPIO port to outputVal
} }


/* setHigh() sets pin output HIGH.
/* writeHigh() sets pin output HIGH.
pin is bit pattern, where pin being set is 1. pin is bit pattern, where pin being set is 1.
*/ */
void Port_MCP23S17::setHigh(const uint8_t pin)
void Port_MCP23S17::writeHigh(const uint8_t pin)
{ {
outputVal |= pin; //set pin output to high outputVal |= pin; //set pin output to high
transfer(deviceAddr << 1, portNum + 0x12, outputVal); //set GPIO port to outputVal transfer(deviceAddr << 1, portNum + 0x12, outputVal); //set GPIO port to outputVal

+ 2
- 2
src/Port_MCP23S17.h View File

: deviceAddr(deviceAddr), portNum(portNum), outputVal(0), readPins(readPins) {} : deviceAddr(deviceAddr), portNum(portNum), outputVal(0), readPins(readPins) {}
void beginProtocol(); void beginProtocol();
void begin(const uint8_t activeState); void begin(const uint8_t activeState);
virtual void setLow(const uint8_t pin);
virtual void setHigh(const uint8_t pin);
virtual void writeLow(const uint8_t pin);
virtual void writeHigh(const uint8_t pin);
virtual uint8_t read(); virtual uint8_t read();
}; };
#endif #endif

+ 4
- 4
src/Port_PCA9655E.cpp View File

Wire.endTransmission(); Wire.endTransmission();
} }
/* setLow() sets pin output LOW.
/* writeLow() sets pin output LOW.
pin is bit pattern, where pin being set is 1. pin is bit pattern, where pin being set is 1.
*/ */
void Port_PCA9655E::setLow(const uint8_t pin)
void Port_PCA9655E::writeLow(const uint8_t pin)
{ {
outputVal &= ~pin; //set pin output to low outputVal &= ~pin; //set pin output to low
Wire.endTransmission(); Wire.endTransmission();
} }
/* setHigh() sets pin output HIGH.
/* writeHigh() sets pin output HIGH.
pin is bit pattern, where pin being set is 1. pin is bit pattern, where pin being set is 1.
*/ */
void Port_PCA9655E::setHigh(const uint8_t pin)
void Port_PCA9655E::writeHigh(const uint8_t pin)
{ {
outputVal |= pin; //set pin output to high outputVal |= pin; //set pin output to high

+ 2
- 2
src/Port_PCA9655E.h View File

: deviceAddr(deviceAddr), portNum(portNum), outputVal(0), readPins(readPins) {} : deviceAddr(deviceAddr), portNum(portNum), outputVal(0), readPins(readPins) {}
void beginProtocol(); void beginProtocol();
void begin(const uint8_t activeState); void begin(const uint8_t activeState);
virtual void setLow(const uint8_t pin);
virtual void setHigh(const uint8_t pin);
virtual void writeLow(const uint8_t pin);
virtual void writeHigh(const uint8_t pin);
virtual uint8_t read(); virtual uint8_t read();
}; };
#endif #endif

+ 4
- 4
src/Port_ShiftRegs.cpp View File

SPI.begin(); SPI.begin();
} }


/* setLow() sets pin output LOW.
/* writeLow() sets pin output LOW.
pin is bit pattern, where pin being set is 1. pin is bit pattern, where pin being set is 1.
*/ */
void Port_ShiftRegs::setLow(const uint8_t pin)
void Port_ShiftRegs::writeLow(const uint8_t pin)
{ {
outputVal &= ~pin; //set pin output to low outputVal &= ~pin; //set pin output to low


digitalWrite (slaveSelect, HIGH); digitalWrite (slaveSelect, HIGH);
} }


/* setHigh() sets pin output HIGH.
/* writeHigh() sets pin output HIGH.
pin is bit pattern, where pin being set is 1. pin is bit pattern, where pin being set is 1.
*/ */
void Port_ShiftRegs::setHigh(const uint8_t pin)
void Port_ShiftRegs::writeHigh(const uint8_t pin)
{ {
outputVal |= pin; //set pin output to high outputVal |= pin; //set pin output to high



+ 2
- 2
src/Port_ShiftRegs.h View File

public: public:
Port_ShiftRegs(const uint8_t slaveSelect); Port_ShiftRegs(const uint8_t slaveSelect);
void begin(); void begin();
void setLow(const uint8_t pin);
void setHigh(const uint8_t pin);
void writeLow(const uint8_t pin);
void writeHigh(const uint8_t pin);
}; };
#endif #endif

+ 4
- 4
src/Scanner_IOE.cpp View File

//strobe on //strobe on
if (activeState == LOW) //if active low if (activeState == LOW) //if active low
{ {
refPortWrite.setLow(strobePin);
refPortWrite.writeLow(strobePin);
} }
else //if active high else //if active high
{ {
refPortWrite.setHigh(strobePin);
refPortWrite.writeHigh(strobePin);
} }
delayMicroseconds(3); //time to stabilize voltage delayMicroseconds(3); //time to stabilize voltage


//strobe off //strobe off
if (activeState == LOW) //if active low if (activeState == LOW) //if active low
{ {
refPortWrite.setHigh(strobePin);
refPortWrite.writeHigh(strobePin);
readState = ~readState; readState = ~readState;
} }
else //if active high else //if active high
{ {
refPortWrite.setLow(strobePin);
refPortWrite.writeLow(strobePin);
} }


return readState; return readState;