Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix wrong states on PE output pins (and SD-card failure on restart) #278

Closed
wants to merge 1 commit into from
Closed

fix wrong states on PE output pins (and SD-card failure on restart) #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/Port.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
extern TwoWire i2cBusTwo;

uint8_t Port_ExpanderPortsInputChannelStatus[2];
static uint8_t Port_ExpanderPortsOutputChannelStatus[2] = {255, 255}; // Stores current configuration of output-channels locally
static uint8_t Port_ExpanderPortsOutputChannelStatus[2]; // Stores current configuration of output-channels locally
void Port_ExpanderHandler(void);
uint8_t Port_ChannelToBit(const uint8_t _channel);
void Port_WriteInitMaskForOutputChannels(void);
Expand Down Expand Up @@ -192,7 +192,17 @@ void Port_WriteInitMaskForOutputChannels(void) {
const uint8_t portBaseValueBitMask = 255;
const uint8_t portsToWrite = 2;
uint8_t OutputBitMaskInOutAsPerPort[portsToWrite] = {portBaseValueBitMask, portBaseValueBitMask}; // 255 => all channels set to input; [0]: port0, [1]: port1
uint8_t OutputBitMaskLowHighAsPerPort[portsToWrite] = {0x00, 0x00}; // Bit configured as 0 for an output-channels means: logic LOW

// init status cache with values from HW
i2cBusTwo.beginTransmission(expanderI2cAddress);
i2cBusTwo.write(0x02); // Pointer to first output-register
i2cBusTwo.endTransmission(false);
i2cBusTwo.requestFrom(expanderI2cAddress, static_cast<size_t>(portsToWrite), true); // ...and read the contents
if (i2cBusTwo.available()) {
for (unsigned int i = 0; i < portsToWrite; i++) {
Port_ExpanderPortsOutputChannelStatus[i] = i2cBusTwo.read();
}
}

#ifdef GPIO_PA_EN // Set as output to enable/disable amp for loudspeaker
if (GPIO_PA_EN >= 100 && GPIO_PA_EN <= 107) {
Expand Down Expand Up @@ -230,9 +240,13 @@ void Port_WriteInitMaskForOutputChannels(void) {

// Only change port-config if necessary (at least bitmask changed from base-default for one port)
if ((OutputBitMaskInOutAsPerPort[0] != portBaseValueBitMask) || (OutputBitMaskInOutAsPerPort[1] != portBaseValueBitMask)) {
// all outputs to LOW
Port_ExpanderPortsOutputChannelStatus[0] &= OutputBitMaskInOutAsPerPort[0];
Port_ExpanderPortsOutputChannelStatus[1] &= OutputBitMaskInOutAsPerPort[1];

i2cBusTwo.beginTransmission(expanderI2cAddress);
i2cBusTwo.write(0x06); // Pointer to configuration of input/output
for (uint8_t i = 0; i < portsToWrite; i++) {
for (unsigned int i = 0; i < portsToWrite; i++) {
i2cBusTwo.write(OutputBitMaskInOutAsPerPort[i]);
// Serial.printf("Register %u - Mask: %u\n", 0x06+i, OutputBitMaskInOutAsPerPort[i]);
}
Expand All @@ -241,8 +255,7 @@ void Port_WriteInitMaskForOutputChannels(void) {
// Write low/high-config to all output-channels. Channels that are configured as input are silently/automatically ignored by PCA9555
i2cBusTwo.beginTransmission(expanderI2cAddress);
i2cBusTwo.write(0x02); // Pointer to configuration of output-channels (high/low)
i2cBusTwo.write(OutputBitMaskLowHighAsPerPort[0]); // port0
i2cBusTwo.write(OutputBitMaskLowHighAsPerPort[1]); // port1
i2cBusTwo.write(Port_ExpanderPortsOutputChannelStatus, static_cast<size_t>(portsToWrite));
i2cBusTwo.endTransmission();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/SdCard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void SdCard_Init(void) {
#ifdef NO_SDCARD
// Initialize without any SD card, e.g. for webplayer only
Log_Println("Init without SD card ", LOGLEVEL_NOTICE);
return
return;
#endif

#ifndef SINGLE_SPI_ENABLE
Expand Down