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

Fix dynamic RAM allocation

Browse Source
This commit is contained in:
peteGSX 2023-02-09 09:31:09 +10:00
parent 5cb216dd79
commit deb49f2943
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
IO_EXIOExpander.h
View File

@ -72,6 +72,7 @@ private:
_i2cAddress = i2cAddress; _i2cAddress = i2cAddress;
// To save RAM, space for servo configuration is not allocated unless a pin is used. // To save RAM, space for servo configuration is not allocated unless a pin is used.
// Initialise the pointers to NULL. // Initialise the pointers to NULL.
_servoData = (ServoData**) calloc(_nPins, sizeof(ServoData*));
for (int i=0; i<_nPins; i++) { for (int i=0; i<_nPins; i++) {
_servoData[i] = NULL; _servoData[i] = NULL;
} }
@ -139,28 +140,6 @@ private:
DIAG(F("Vpin %d cannot be used as a digital input pin"), (int)vpin); DIAG(F("Vpin %d cannot be used as a digital input pin"), (int)vpin);
return false; return false;
} }
} else if (configType == CONFIGURE_SERVO) {
if (paramCount != 5) return false;
#ifdef DIAG_IO
DIAG(F("Servo: Configure VPIN:%d Apos:%d Ipos:%d Profile:%d Duration:%d state:%d"),
vpin, params[0], params[1], params[2], params[3], params[4]);
#endif
struct ServoData *s = _servoData[pin];
if (s == NULL) {
_servoData[pin] = (struct ServoData *)calloc(1, sizeof(struct ServoData));
s = _servoData[pin];
if (!s) return false; // Check for failed memory allocation
}
s->activePosition = params[0];
s->inactivePosition = params[1];
s->profile = params[2];
s->duration = params[3];
int state = params[4];
if (state != -1) {
// Position servo to initial state
IODevice::writeAnalogue(pin, state ? s->activePosition : s->inactivePosition, 0, 0);
}
return true;
} else { } else {
return false; return false;
} }
@ -368,7 +347,8 @@ private:
uint16_t duration; // time (tenths of a second) for animation to complete. uint16_t duration; // time (tenths of a second) for animation to complete.
}; // 14 bytes per element, i.e. per pin in use }; // 14 bytes per element, i.e. per pin in use
struct ServoData *_servoData[256]; // struct ServoData *_servoData[256];
ServoData** _servoData;
static const uint8_t _catchupSteps = 5; // number of steps to wait before switching servo off static const uint8_t _catchupSteps = 5; // number of steps to wait before switching servo off