From 995221e68e15693697fc7f10dfc31273ea188157 Mon Sep 17 00:00:00 2001
From: Stephen Hawes <sphawes@gmail.com>
Date: Thu, 5 May 2022 03:37:47 -0400
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20M3426=20A<addr>=20parameter?=
 =?UTF-8?q?=20(#24130)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
---
 Marlin/src/feature/adc/adc_mcp3426.cpp |  6 +++---
 Marlin/src/feature/adc/adc_mcp3426.h   |  5 +----
 Marlin/src/gcode/feature/adc/M3426.cpp | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Marlin/src/feature/adc/adc_mcp3426.cpp b/Marlin/src/feature/adc/adc_mcp3426.cpp
index aaddf46821..49bb67ef6d 100644
--- a/Marlin/src/feature/adc/adc_mcp3426.cpp
+++ b/Marlin/src/feature/adc/adc_mcp3426.cpp
@@ -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)
@@ -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
@@ -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;
diff --git a/Marlin/src/feature/adc/adc_mcp3426.h b/Marlin/src/feature/adc/adc_mcp3426.h
index 35458716b9..af48593369 100644
--- a/Marlin/src/feature/adc/adc_mcp3426.h
+++ b/Marlin/src/feature/adc/adc_mcp3426.h
@@ -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;
 };
 
diff --git a/Marlin/src/gcode/feature/adc/M3426.cpp b/Marlin/src/gcode/feature/adc/M3426.cpp
index 8205fa01f2..2820c8b880 100644
--- a/Marlin/src/gcode/feature/adc/M3426.cpp
+++ b/Marlin/src/gcode/feature/adc/M3426.cpp
@@ -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
  *
@@ -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 (channel <= 2 && (gain == 1 || gain == 2 || gain == 4 || gain == 8)) {
-    int16_t result = mcp3426.ReadValue(channel, gain);
+  if (address <= 7) address += MCP3426_BASE_ADDR;
+
+  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) {