Skip to content

Commit

Permalink
Added support for multiple truebner rs485 interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Schmaltz committed Aug 6, 2024
1 parent eb6f0d0 commit 23f2c0a
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 25 deletions.
45 changes: 26 additions & 19 deletions sensors.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static ProgSensorAdjust_t *progSensorAdjusts = NULL;

// modbus transaction id
static uint16_t modbusTcpId = 0;
static uint i2c_rs485_allocated;
static uint i2c_rs485_allocated[4];

const char *sensor_unitNames[]{
"", "%", "°C", "°F", "V", "%", "in",
Expand Down Expand Up @@ -117,7 +117,10 @@ void detect_asb_board() {
if (detect_i2c(ASB_BOARD_ADDR2a) && detect_i2c(ASB_BOARD_ADDR2b))
asb_detected_boards |= ASB_BOARD2;

if (detect_i2c(RS485_TRUEBNER_ADDR)) asb_detected_boards |= RS485_TRUEBNER;
if (detect_i2c(RS485_TRUEBNER1_ADDR)) asb_detected_boards |= RS485_TRUEBNER1;
if (detect_i2c(RS485_TRUEBNER2_ADDR)) asb_detected_boards |= RS485_TRUEBNER2;
if (detect_i2c(RS485_TRUEBNER3_ADDR)) asb_detected_boards |= RS485_TRUEBNER3;
if (detect_i2c(RS485_TRUEBNER4_ADDR)) asb_detected_boards |= RS485_TRUEBNER4;
#endif

// Old, pre OSPi 1.43 analog inputs:
Expand Down Expand Up @@ -1113,15 +1116,17 @@ int read_sensor_http(Sensor_t *sensor, ulong time) {
*/
int read_sensor_i2c(Sensor_t *sensor) {
DEBUG_PRINTLN(F("read_sensor_i2c"));
if ((asb_detected_boards & RS485_TRUEBNER) == 0) return HTTP_RQT_NOT_RECEIVED;
int device = sensor->port % 4;
if ((asb_detected_boards & (RS485_TRUEBNER1 << device)) == 0)
return HTTP_RQT_NOT_RECEIVED;

if (i2c_rs485_allocated > 0 && i2c_rs485_allocated != sensor->nr) {
if (i2c_rs485_allocated[device] > 0 && i2c_rs485_allocated[device] != sensor->nr) {
sensor->repeat_read = 1000;
DEBUG_PRINT(F("cant' read, allocated by sensor "));
DEBUG_PRINTLN(i2c_rs485_allocated);
Sensor_t *t = sensor_by_nr(i2c_rs485_allocated);
DEBUG_PRINTLN(i2c_rs485_allocated[device]);
Sensor_t *t = sensor_by_nr(i2c_rs485_allocated[device]);
if (!t || !t->flags.enable)
i2c_rs485_allocated = 0; //breakout
i2c_rs485_allocated[device] = 0; //breakout
return HTTP_RQT_NOT_RECEIVED;
}

Expand All @@ -1132,20 +1137,20 @@ int read_sensor_i2c(Sensor_t *sensor) {
: 0x02;

if (sensor->repeat_read == 0 || sensor->repeat_read == 1000) {
Wire.beginTransmission(RS485_TRUEBNER_ADDR);
Wire.beginTransmission(RS485_TRUEBNER1_ADDR + device);
Wire.write((uint8_t)sensor->id);
Wire.write(type);
if (Wire.endTransmission() == 0) {
DEBUG_PRINTF("read_sensor_i2c: request send: %d - %d\n", sensor->id,
type);
sensor->repeat_read = 1;
i2c_rs485_allocated = sensor->nr;
i2c_rs485_allocated[device] = sensor->nr;
}
return HTTP_RQT_NOT_RECEIVED;
// delay(500);
}

if (Wire.requestFrom((uint8_t)RS485_TRUEBNER_ADDR, (size_t)4, true)) {
if (Wire.requestFrom((uint8_t)(RS485_TRUEBNER1_ADDR + device), (size_t)4, true)) {
// read the incoming bytes:
uint8_t addr = Wire.read();
uint8_t reg = Wire.read();
Expand All @@ -1166,7 +1171,7 @@ int read_sensor_i2c(Sensor_t *sensor) {
sensor->flags.data_ok = true;

sensor->repeat_read = 0;
i2c_rs485_allocated = 0;
i2c_rs485_allocated[device] = 0;
return HTTP_RQT_SUCCESS;
}
}
Expand All @@ -1175,7 +1180,7 @@ int read_sensor_i2c(Sensor_t *sensor) {
if (sensor->repeat_read > 4) { // timeout
sensor->repeat_read = 0;
sensor->flags.data_ok = false;
i2c_rs485_allocated = 0;
i2c_rs485_allocated[device] = 0;
DEBUG_PRINTLN(F("read_sensor_i2c: timeout"));
}
DEBUG_PRINTLN(F("read_sensor_i2c: exit"));
Expand Down Expand Up @@ -1663,23 +1668,25 @@ int set_sensor_address_ip(Sensor_t *sensor, uint8_t new_address) {
*/
int set_sensor_address_i2c(Sensor_t *sensor, uint8_t new_address) {
DEBUG_PRINTLN(F("set_sensor_address_i2c"));
if ((asb_detected_boards & RS485_TRUEBNER) == 0) return HTTP_RQT_NOT_RECEIVED;
int device = sensor->port % 4;
if ((asb_detected_boards & (RS485_TRUEBNER1 << device)) == 0)
return HTTP_RQT_NOT_RECEIVED;

if (i2c_rs485_allocated > 0) {
if (i2c_rs485_allocated[device] > 0) {
DEBUG_PRINT(F("sensor currently allocated by "));
DEBUG_PRINTLN(i2c_rs485_allocated);
Sensor_t *t = sensor_by_nr(i2c_rs485_allocated);
DEBUG_PRINTLN(i2c_rs485_allocated[device]);
Sensor_t *t = sensor_by_nr(i2c_rs485_allocated[device]);
if (!t || !t->flags.enable)
i2c_rs485_allocated = 0; //breakout
i2c_rs485_allocated[device] = 0; //breakout
return HTTP_RQT_NOT_RECEIVED;
}

Wire.beginTransmission(RS485_TRUEBNER_ADDR);
Wire.beginTransmission(RS485_TRUEBNER1_ADDR + device);
Wire.write(254);
Wire.write(new_address);
Wire.endTransmission();
delay(3000);
Wire.requestFrom((uint8_t)RS485_TRUEBNER_ADDR, (size_t)1, true);
Wire.requestFrom((uint8_t)(RS485_TRUEBNER1_ADDR + device), (size_t)1, true);
if (Wire.available()) {
delay(10);
uint8_t modbus_address = Wire.read();
Expand Down
18 changes: 12 additions & 6 deletions sensors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,14 @@ extern "C" {
#define MAX_SENSOR_READ_TIME 1 // second for reading sensors

// detected Analog Sensor Boards:
#define ASB_BOARD1 0x01
#define ASB_BOARD2 0x02
#define OSPI_PCF8591 0x04
#define OSPI_ADS1115 0x08
#define RS485_TRUEBNER 0x20
#define ASB_BOARD1 0x0001
#define ASB_BOARD2 0x0002
#define OSPI_PCF8591 0x0004
#define OSPI_ADS1115 0x0008
#define RS485_TRUEBNER1 0x0020
#define RS485_TRUEBNER2 0x0040
#define RS485_TRUEBNER3 0x0080
#define RS485_TRUEBNER4 0x0100

typedef struct SensorFlags {
uint enable : 1; // enabled
Expand Down Expand Up @@ -254,7 +257,10 @@ typedef struct SensorUrl {
#define ASB_BOARD_ADDR1b 0x49
#define ASB_BOARD_ADDR2a 0x4A
#define ASB_BOARD_ADDR2b 0x4B
#define RS485_TRUEBNER_ADDR 0x38
#define RS485_TRUEBNER1_ADDR 0x38
#define RS485_TRUEBNER2_ADDR 0x39
#define RS485_TRUEBNER3_ADDR 0x3A
#define RS485_TRUEBNER4_ADDR 0x3B

void sensor_api_init();
byte get_asb_detected_boards();
Expand Down

0 comments on commit 23f2c0a

Please sign in to comment.