dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-25 05:31:24 +01:00
Code Releases Activity

Fix bugs, learn I2CManager

Browse Source
This commit is contained in:
peteGSX 2022-12-12 19:54:20 +10:00
parent 785b515f9e
commit 3862f7250d
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
IO_EXIOExpander.h
View File

@ -35,7 +35,9 @@
#ifndef IO_EX_IOEXPANDER_H #ifndef IO_EX_IOEXPANDER_H
#define IO_EX_IOEXPANDER_H #define IO_EX_IOEXPANDER_H
#include "IO_GPIOBase.h" #include "IODevice.h"
#include "I2CManager.h"
#include "DIAG.h"
#include "FSH.h" #include "FSH.h"
#include "EX-IOExpanderPins.h" #include "EX-IOExpanderPins.h"
@ -82,27 +84,29 @@ private:
// Send digital and analogue pin counts // Send digital and analogue pin counts
I2CManager.write(_i2cAddress, 3, REG_EXIOINIT, _numDigitalPins, _numAnaloguePins); I2CManager.write(_i2cAddress, 3, REG_EXIOINIT, _numDigitalPins, _numAnaloguePins);
// Enable digital ports // Enable digital ports
_digitalPinBytes = (_numDigitalPins + 7) / 8; _digitalPinBytes = (_numDigitalPins + 7) / 8 + 1;
uint8_t enableDigitalPins[_digitalPinBytes]; uint8_t _enableDigitalPins[_digitalPinBytes];
for (uint8_t byte = 0; byte < _digitalPinBytes; byte++) { _enableDigitalPins[0] = REG_EXIODPIN;
enableDigitalPins[byte] = 0; for (uint8_t byte = 1; byte < _digitalPinBytes; byte++) {
_enableDigitalPins[byte] = 0;
} }
for (uint8_t pin = 0; pin < _numDigitalPins; pin++) { for (uint8_t pin = 0; pin < _numDigitalPins; pin++) {
int pinByte = pin / 8; int pinByte = pin / 8;
bitSet(enableDigitalPins[pinByte], pin - pinByte * 8); bitSet(_enableDigitalPins[pinByte + 1], pin - pinByte * 8);
} }
I2CManager.write(_i2cAddress, _digitalPinBytes + 1, REG_EXIODPIN, *enableDigitalPins); I2CManager.write(_i2cAddress, _enableDigitalPins, _digitalPinBytes, &_i2crb);
// Enable analogue ports // Enable analogue ports
_analoguePinBytes = (_numAnaloguePins + 7) / 8; _analoguePinBytes = (_numAnaloguePins + 7) / 8 + 1;
uint8_t enableAnaloguePins[_analoguePinBytes]; uint8_t _enableAnaloguePins[_analoguePinBytes];
for (uint8_t byte = 0; byte < _analoguePinBytes; byte++) { _enableAnaloguePins[0] = REG_EXIOAPIN;
enableAnaloguePins[byte] = 0; for (uint8_t byte = 1; byte < _analoguePinBytes; byte++) {
_enableAnaloguePins[byte] = 0;
} }
for (uint8_t pin = 0; pin < _numAnaloguePins; pin++) { for (uint8_t pin = 0; pin < _numAnaloguePins; pin++) {
int pinByte = pin / 8; int pinByte = pin / 8;
bitSet(enableAnaloguePins[pinByte], pin - pinByte * 8); bitSet(_enableAnaloguePins[pinByte + 1], pin - pinByte * 8);
} }
I2CManager.write(_i2cAddress, _analoguePinBytes + 1, REG_EXIOAPIN, *enableAnaloguePins); I2CManager.write(_i2cAddress, _enableAnaloguePins, _analoguePinBytes, &_i2crb);
} }
void _display() override { void _display() override {
@ -115,6 +119,7 @@ private:
uint8_t _numAnaloguePins; uint8_t _numAnaloguePins;
int _digitalPinBytes; int _digitalPinBytes;
int _analoguePinBytes; int _analoguePinBytes;
I2CRB _i2crb;
enum { enum {
REG_EXIOINIT = 0xE0, // Flag to initialise setup procedure REG_EXIOINIT = 0xE0, // Flag to initialise setup procedure