Skip to content

fix(moderate): add bounds checking to prevent buffer overflow in example #35

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

Open
lahirunirmalx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(moderate): add bounds checking to prevent buffer overflow in example #35

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
80 changes: 54 additions & 26 deletions examples/ADS1256-Example/ADS1256-Example.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,16 +316,24 @@ void loop() {
{
while (!Serial.available());
inputChannel = Serial.parseInt();
A.setMUX(singleEndedChannels[inputChannel]);
//Example: "Ms1" selects the SING_1 as input channel
if (inputChannel >= 0 && inputChannel < 8) {
A.setMUX(singleEndedChannels[inputChannel]);
//Example: "Ms1" selects the SING_1 as input channel
} else {
Serial.println("Error: single-ended channel must be 0-7");
}
}

if (inputMode == 'd') //differential
{
while (!Serial.available());
inputChannel = Serial.parseInt();
A.setMUX(differentialChannels[inputChannel]);
//Example: "Md0" selects the DIFF_0_1 as input channel
if (inputChannel >= 0 && inputChannel < 4) {
A.setMUX(differentialChannels[inputChannel]);
//Example: "Md0" selects the DIFF_0_1 as input channel
} else {
Serial.println("Error: differential channel must be 0-3");
}
}
}
break;
Expand All @@ -334,39 +342,51 @@ void loop() {
{
while (!Serial.available());
pgaSelection = Serial.parseInt();
A.setPGA(pgaValues[pgaSelection]);
//Example: P4 will select the PGA = 16
Serial.print("PGA value: ");
Serial.println(A.getPGA()); //Read the PGA from the register and print it
if (pgaSelection >= 0 && pgaSelection < 7) {
A.setPGA(pgaValues[pgaSelection]);
//Example: P4 will select the PGA = 16
Serial.print("PGA value: ");
Serial.println(A.getPGA()); //Read the PGA from the register and print it
} else {
Serial.println("Error: PGA selection must be 0-6");
}
}
break;
//--------------------------------------------------------------------------------------------------------
case 'F': //Set sampling frequency
{
while (!Serial.available());
drateSelection = Serial.parseInt(); //Parse the number (item number in the array)
delay(100);
Serial.print("DRATE is selected as: ");
Serial.println(drateValues[drateSelection]); //Print the value from the array
delay(100);
A.setDRATE(drateValues[drateSelection]); //Pass the value to the register on the ADS1256
delay(100);
Serial.print("DRATE is set to ");
Serial.println(A.readRegister(DRATE_REG)); //Read the register to see if the value was updated correctly
//Example: F3 will make the DRATE = 3750 SPS
if (drateSelection >= 0 && drateSelection < 16) {
delay(100);
Serial.print("DRATE is selected as: ");
Serial.println(drateValues[drateSelection]); //Print the value from the array
delay(100);
A.setDRATE(drateValues[drateSelection]); //Pass the value to the register on the ADS1256
delay(100);
Serial.print("DRATE is set to ");
Serial.println(A.readRegister(DRATE_REG)); //Read the register to see if the value was updated correctly
//Example: F3 will make the DRATE = 3750 SPS
} else {
Serial.println("Error: DRATE selection must be 0-15");
}
}
break;
//--------------------------------------------------------------------------------------------------------
case 'R': //read register
{
while (!Serial.available());
registerToRead = Serial.parseInt(); //This part reads the number of the register from the serial port
Serial.print("Value of ");
Serial.print(registers[registerToRead]);
Serial.print(" register is: ");
Serial.println(A.readRegister(registerToRead));
//Example: "R2" will read the register at address 2 which is the ADCON register
//Note: The value is printed as a decimal number
if (registerToRead >= 0 && registerToRead < 11) {
Serial.print("Value of ");
Serial.print(registers[registerToRead]);
Serial.print(" register is: ");
Serial.println(A.readRegister(registerToRead));
//Example: "R2" will read the register at address 2 which is the ADCON register
//Note: The value is printed as a decimal number
} else {
Serial.println("Error: register must be 0-10");
}
}
break;
//--------------------------------------------------------------------------------------------------------
Expand All @@ -377,9 +397,17 @@ void loop() {
while (!Serial.available());
registerValueToWrite = Serial.parseInt(); //This part reads the value of the register from the serial port

A.writeRegister(registerToWrite, registerValueToWrite);
//Example: "W1 35" will write 35 ("00100011") on register 1 which is the MUX register.
//This will make the input as DIFF_2_3 (A2(+) & A1(-))
if (registerToWrite >= 0 && registerToWrite < 11) {
A.writeRegister(registerToWrite, registerValueToWrite);
//Example: "W1 35" will write 35 ("00100011") on register 1 which is the MUX register.
//This will make the input as DIFF_2_3 (A2(+) & A1(-))
Serial.print("Wrote ");
Serial.print(registerValueToWrite);
Serial.print(" to ");
Serial.println(registers[registerToWrite]);
} else {
Serial.println("Error: register must be 0-10");
}
}
break;
//--------------------------------------------------------------------------------------------------------
Expand Down