Skip to content

Adds Address Flag to M3426 Command #24130

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

Merged
thinkyhead merged 6 commits into from
May 5, 2022
Merged

Adds Address Flag to M3426 Command #24130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8778d01
Adds address flag to M3426 to allow users to specify the I2C address …
sphawes May 4, 2022
c31d6d2
Removes erroneous comma in the definition of the MCP3426 ReadValue fu…
sphawes May 4, 2022
9f93f24
borrow from datasheet
thinkyhead May 4, 2022
47cea8a
Merge branch 'bugfix-2.0.x' into pr/24130
thinkyhead May 4, 2022
e6ce431
Allow 0-7 sub-address
thinkyhead May 4, 2022
6fcddef
Merge branch 'bugfix-2.0.x' into pr/24130
thinkyhead May 5, 2022
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
6 changes: 3 additions & 3 deletions Marlin/src/feature/adc/adc_mcp3426.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "adc_mcp3426.h"

// Read the ADC value from MCP342X on a specific channel
int16_t MCP3426::ReadValue(uint8_t channel, uint8_t gain) {
int16_t MCP3426::ReadValue(uint8_t channel, uint8_t gain, uint8_t address) {
Error = false;

#if PINS_EXIST(I2C_SCL, I2C_SDA) && DISABLED(SOFT_I2C_EEPROM)
Expand All @@ -44,7 +44,7 @@ int16_t MCP3426::ReadValue(uint8_t channel, uint8_t gain) {

Wire.begin(); // No address joins the BUS as the master

Wire.beginTransmission(I2C_ADDRESS(MCP342X_ADC_I2C_ADDRESS));
Wire.beginTransmission(I2C_ADDRESS(address));

// Continuous Conversion Mode, 16 bit, Channel 1, Gain x4
// 26 = 0b00011000
Expand Down Expand Up @@ -75,7 +75,7 @@ int16_t MCP3426::ReadValue(uint8_t channel, uint8_t gain) {
uint8_t buffer[len] = {};

do {
Wire.requestFrom(I2C_ADDRESS(MCP342X_ADC_I2C_ADDRESS), len);
Wire.requestFrom(I2C_ADDRESS(address), len);
if (Wire.available() != len) {
Error = true;
return 0;
Expand Down
5 changes: 1 addition & 4 deletions Marlin/src/feature/adc/adc_mcp3426.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@
#include <stdint.h>
#include <Wire.h>

// Address of MCP342X chip
#define MCP342X_ADC_I2C_ADDRESS 104

class MCP3426 {
public:
int16_t ReadValue(uint8_t channel, uint8_t gain);
int16_t ReadValue(uint8_t channel, uint8_t gain, uint8_t address);
bool Error;
};

Expand Down
15 changes: 10 additions & 5 deletions Marlin/src/gcode/feature/adc/M3426.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

#include "../../../feature/adc/adc_mcp3426.h"

#define MCP3426_BASE_ADDR (0b1101 << 3)

/**
* M3426: Read 16 bit (signed) value from I2C MCP3426 ADC device
*
Expand All @@ -36,12 +38,15 @@
* M3426 I<byte-2 value in base 10> 0 or 1, invert reply
*/
void GcodeSuite::M3426() {
uint8_t channel = parser.byteval('C', 1), // Select the channel 1 or 2
gain = parser.byteval('G', 1);
const bool inverted = parser.byteval('I') == 1;
uint8_t channel = parser.byteval('C', 1), // Channel 1 or 2
gain = parser.byteval('G', 1), // Gain 1, 2, 4, or 8
address = parser.byteval('A', 3); // Address 0-7 (or 104-111)
const bool inverted = parser.boolval('I');

if (address <= 7) address += MCP3426_BASE_ADDR;

if (channel <= 2 && (gain == 1 || gain == 2 || gain == 4 || gain == 8)) {
int16_t result = mcp3426.ReadValue(channel, gain);
if (WITHIN(channel, 1, 2) && (gain == 1 || gain == 2 || gain == 4 || gain == 8) && WITHIN(address, MCP3426_BASE_ADDR, MCP3426_BASE_ADDR + 7)) {
int16_t result = mcp3426.ReadValue(channel, gain, address);

if (mcp3426.Error == false) {
if (inverted) {
Expand Down