jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 10:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10789 from curzon01/max31865-dev

Browse Source 
Add MAX31865 specific setting per sensor
This commit is contained in:
Theo Arends 2021-02-01 11:51:53 +01:00 committed by GitHub
commit 53de572666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 284 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasmota/my_user_config.h
View File

@ -710,10 +710,10 @@
//#define USE_MAX31855 // Add support for MAX31855/MAX6675 K-Type thermocouple sensor using softSPI //#define USE_MAX31855 // Add support for MAX31855/MAX6675 K-Type thermocouple sensor using softSPI
//#define USE_MAX31865 // Add support for MAX31865 RTD sensors using softSPI //#define USE_MAX31865 // Add support for MAX31865 RTD sensors using softSPI
#define MAX31865_PTD_WIRES 2 // PTDs come in several flavors. Pick yours #define MAX31865_PTD_WIRES 2 // PTDs come in several flavors, pick yours. Specific settings per sensor possible with MAX31865_PTD_WIRES1..MAX31865_PTD_WIRES6
#define MAX31865_PTD_RES 100 // Nominal PTD resistance at 0°C (100Ω for a PT100, 1000Ω for a PT1000, YMMV!) #define MAX31865_PTD_RES 100 // Nominal PTD resistance at 0°C (100Ω for a PT100, 1000Ω for a PT1000, YMMV!). Specific settings per sensor possible with MAX31865_PTD_RES1..MAX31865_PTD_RES6
#define MAX31865_REF_RES 430 // Reference resistor (Usually 430Ω for a PT100, 4300Ω for a PT1000) #define MAX31865_REF_RES 430 // Reference resistor (Usually 430Ω for a PT100, 4300Ω for a PT1000). Specific settings per sensor possible with MAX31865_REF_RES1..MAX31865_REF_RES6
#define MAX31865_PTD_BIAS 0 // To calibrate your not-so-good PTD #define MAX31865_PTD_BIAS 0 // To calibrate your not-so-good PTD. Specific settings per sensor possible with MAX31865_PTD_BIAS1..MAX31865_PTD_BIAS6
//#define USE_LMT01 // Add support for TI LMT01 temperature sensor, count pulses on single GPIO (+0k5 code) //#define USE_LMT01 // Add support for TI LMT01 temperature sensor, count pulses on single GPIO (+0k5 code)
//#define USE_WIEGAND // Add support for 24/26/32/34 bit RFID Wiegand interface (D0/D1) (+1k7 code) //#define USE_WIEGAND // Add support for 24/26/32/34 bit RFID Wiegand interface (D0/D1) (+1k7 code)

291
tasmota/xsns_47_max31865.ino
View File

@ -1,7 +1,7 @@
/* /*
xsns_39_MAX31865.ino - MAX31865 thermocouple sensor support for Tasmota xsns_39_MAX31865.ino - MAX31865 thermocouple sensor support for Tasmota
Copyright (C) 2021 Alberto Lopez Siemens Copyright (C) 2020 Alberto Lopez Siemens
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -24,15 +24,122 @@
#define XSNS_47 47 #define XSNS_47 47
#if MAX31865_PTD_WIRES == 4 #include "Adafruit_MAX31865.h"
#define PTD_WIRES MAX31865_4WIRE
#elif MAX31865_PTD_WIRES == 3 // set defaults if not defined
#define PTD_WIRES MAX31865_3WIRE #ifndef MAX31865_PTD_WIRES
#else #define MAX31865_PTD_WIRES 2
#define PTD_WIRES MAX31865_2WIRE #endif
#ifndef MAX31865_PTD_RES
#define MAX31865_PTD_RES 100
#endif
#ifndef MAX31865_REF_RES
#define MAX31865_REF_RES 430
#endif
#ifndef MAX31865_PTD_BIAS
#define MAX31865_PTD_BIAS 0
#endif
#ifndef MAX31865_PTD_LOW_RES
#define MAX31865_PTD_LOW_RES 0
#endif
#ifndef MAX31865_PTD_HIGH_RES
#define MAX31865_PTD_HIGH_RES 0xffff
#endif #endif
#include "Adafruit_MAX31865.h" #if MAX31865_PTD_WIRES == 4
#define MAX31865_PTD_WIRESCFG MAX31865_4WIRE
#elif MAX31865_PTD_WIRES == 3
#define MAX31865_PTD_WIRESCFG MAX31865_3WIRE
#else
#define MAX31865_PTD_WIRESCFG MAX31865_2WIRE
#endif // MAX31865_PTD_WIRES
#ifdef MAX31865_PTD_WIRES1
#if MAX31865_PTD_WIRES1 == 4
#define MAX31865_PTD_WIRES1CFG MAX31865_4WIRE
#elif MAX31865_PTD_WIRES == 3
#define MAX31865_PTD_WIRES1CFG MAX31865_3WIRE
#else
#define MAX31865_PTD_WIRES1CFG MAX31865_2WIRE
#endif
#endif // MAX31865_PTD_WIRES1
#ifdef MAX31865_PTD_WIRES2
#if MAX31865_PTD_WIRES2 == 4
#define MAX31865_PTD_WIRES2CFG MAX31865_4WIRE
#elif MAX31865_PTD_WIRES == 3
#define MAX31865_PTD_WIRES2CFG MAX31865_3WIRE
#else
#define MAX31865_PTD_WIRES2CFG MAX31865_2WIRE
#endif
#endif // MAX31865_PTD_WIRES2
#ifdef MAX31865_PTD_WIRES3
#if MAX31865_PTD_WIRES3 == 4
#define MAX31865_PTD_WIRES3CFG MAX31865_4WIRE
#elif MAX31865_PTD_WIRES == 3
#define MAX31865_PTD_WIRES3CFG MAX31865_3WIRE
#else
#define MAX31865_PTD_WIRES3CFG MAX31865_2WIRE
#endif
#endif // MAX31865_PTD_WIRE3
#ifdef MAX31865_PTD_WIRES4
#if MAX31865_PTD_WIRES4 == 4
#define MAX31865_PTD_WIRES4CFG MAX31865_4WIRE
#elif MAX31865_PTD_WIRES == 3
#define MAX31865_PTD_WIRES4CFG MAX31865_3WIRE
#else
#define MAX31865_PTD_WIRES4CFG MAX31865_2WIRE
#endif
#endif // MAX31865_PTD_WIRES4
#ifdef MAX31865_PTD_WIRES5
#if MAX31865_PTD_WIRES5 == 4
#define MAX31865_PTD_WIRES5CFG MAX31865_4WIRE
#elif MAX31865_PTD_WIRES == 3
#define MAX31865_PTD_WIRES5CFG MAX31865_3WIRE
#else
#define MAX31865_PTD_WIRES5CFG MAX31865_2WIRE
#endif
#endif // MAX31865_PTD_WIRES5
#ifdef MAX31865_PTD_WIRES6
#if MAX31865_PTD_WIRES6 == 4
#define MAX31865_PTD_WIRES6CFG MAX31865_4WIRE
#elif MAX31865_PTD_WIRES == 3
#define MAX31865_PTD_WIRES6CFG MAX31865_3WIRE
#else
#define MAX31865_PTD_WIRES6CFG MAX31865_2WIRE
#endif
#endif // MAX31865_PTD_WIRES6
float RefRes [] = {
#ifdef MAX31865_REF_RES1
MAX31865_REF_RES1,
#else
MAX31865_REF_RES,
#endif
#ifdef MAX31865_REF_RES2
MAX31865_REF_RES2,
#else
MAX31865_REF_RES,
#endif
#ifdef MAX31865_REF_RES3
MAX31865_REF_RES3,
#else
MAX31865_REF_RES,
#endif
#ifdef MAX31865_REF_RES4
MAX31865_REF_RES4,
#else
MAX31865_REF_RES,
#endif
#ifdef MAX31865_REF_RES5
MAX31865_REF_RES5,
#else
MAX31865_REF_RES,
#endif
#ifdef MAX31865_REF_RES6
MAX31865_REF_RES6
#else
MAX31865_REF_RES
#endif
};
int8_t max31865_init_status = 0; int8_t max31865_init_status = 0;
uint8_t max31865_pins_used = 0; //used as a bit array uint8_t max31865_pins_used = 0; //used as a bit array
@ -49,6 +156,103 @@ struct MAX31865_Result_Struct {
void MAX31865_Init(void) { void MAX31865_Init(void) {
if (max31865_init_status) { return; } if (max31865_init_status) { return; }
max31865_numwires_t PtdWires [] = {
#ifdef MAX31865_PTD_WIRES1
MAX31865_PTD_WIRES1CFG,
#else
MAX31865_PTD_WIRESCFG,
#endif
#ifdef MAX31865_PTD_WIRES2
MAX31865_PTD_WIRES2CFG,
#else
MAX31865_PTD_WIRESCFG,
#endif
#ifdef MAX31865_PTD_WIRES3
MAX31865_PTD_WIRES3CFG,
#else
MAX31865_PTD_WIRESCFG,
#endif
#ifdef MAX31865_PTD_WIRES4
MAX31865_PTD_WIRES4CFG,
#else
MAX31865_PTD_WIRESCFG,
#endif
#ifdef MAX31865_PTD_WIRES5
MAX31865_PTD_WIRES5CFG,
#else
MAX31865_PTD_WIRESCFG,
#endif
#ifdef MAX31865_PTD_WIRES6
MAX31865_PTD_WIRES6CFG
#else
MAX31865_PTD_WIRESCFG
#endif
};
float PtdLowRes [] = {
#ifdef MAX31865_PTD_LOW_RES1
MAX31865_PTD_LOW_RES1,
#else
MAX31865_PTD_LOW_RES,
#endif
#ifdef MAX31865_PTD_LOW_RES2
MAX31865_PTD_LOW_RES2,
#else
MAX31865_PTD_LOW_RES,
#endif
#ifdef MAX31865_PTD_LOW_RES3
MAX31865_PTD_LOW_RES3,
#else
MAX31865_PTD_LOW_RES,
#endif
#ifdef MAX31865_PTD_LOW_RES4
MAX31865_PTD_LOW_RES4,
#else
MAX31865_PTD_LOW_RES,
#endif
#ifdef MAX31865_PTD_LOW_RES5
MAX31865_PTD_LOW_RES5,
#else
MAX31865_PTD_LOW_RES,
#endif
#ifdef MAX31865_PTD_LOW_RES6
MAX31865_PTD_LOW_RES6
#else
MAX31865_PTD_LOW_RES
#endif
};
float PtdHighRes [] = {
#ifdef MAX31865_PTD_HIGH_RES1
MAX31865_PTD_HIGH_RES1,
#else
MAX31865_PTD_HIGH_RES,
#endif
#ifdef MAX31865_PTD_HIGH_RES2
MAX31865_PTD_HIGH_RES2,
#else
MAX31865_PTD_HIGH_RES,
#endif
#ifdef MAX31865_PTD_HIGH_RES3
MAX31865_PTD_HIGH_RES3,
#else
MAX31865_PTD_HIGH_RES,
#endif
#ifdef MAX31865_PTD_HIGH_RES4
MAX31865_PTD_HIGH_RES4,
#else
MAX31865_PTD_HIGH_RES,
#endif
#ifdef MAX31865_PTD_HIGH_RES5
MAX31865_PTD_HIGH_RES5,
#else
MAX31865_PTD_HIGH_RES,
#endif
#ifdef MAX31865_PTD_HIGH_RES6
MAX31865_PTD_HIGH_RES6
#else
MAX31865_PTD_HIGH_RES
#endif
};
max31865_init_status = 1; max31865_init_status = 1;
for (uint32_t i = 0; i < MAX_MAX31865S; i++) { for (uint32_t i = 0; i < MAX_MAX31865S; i++) {
if (PinUsed(GPIO_SSPI_MAX31865_CS1, i)) { if (PinUsed(GPIO_SSPI_MAX31865_CS1, i)) {
@ -60,26 +264,91 @@ void MAX31865_Init(void) {
Pin(GPIO_SSPI_SCLK) Pin(GPIO_SSPI_SCLK)
); );
if (!max31865[i].begin(PTD_WIRES)) { if (!max31865[i].begin(PtdWires[i])) {
max31865_init_status = -1; max31865_init_status = -1;
} }
} }
} }
} }
/* /*
* MAX31865_GetResult(void) * MAX31865_GetResult(void)
* Acquires the raw data via SPI, checks for MAX31865 errors and fills result structure * Acquires the raw data via SPI, checks for MAX31865 errors and fills result structure
*/ */
void MAX31865_GetResult(void) { void MAX31865_GetResult(void) {
float PtdBias [] = {
#ifdef MAX31865_PTD_BIAS1
MAX31865_PTD_BIAS1,
#else
MAX31865_PTD_BIAS,
#endif
#ifdef MAX31865_PTD_BIAS2
MAX31865_PTD_BIAS2,
#else
MAX31865_PTD_BIAS,
#endif
#ifdef MAX31865_PTD_BIAS3
MAX31865_PTD_BIAS3,
#else
MAX31865_PTD_BIAS,
#endif
#ifdef MAX31865_PTD_BIAS4
MAX31865_PTD_BIAS4,
#else
MAX31865_PTD_BIAS,
#endif
#ifdef MAX31865_PTD_BIAS5
MAX31865_PTD_BIAS5,
#else
MAX31865_PTD_BIAS,
#endif
#ifdef MAX31865_PTD_BIAS6
MAX31865_PTD_BIAS6
#else
MAX31865_PTD_BIAS
#endif
};
float PtdRes [] = {
#ifdef MAX31865_PTD_RES1
MAX31865_PTD_RES1,
#else
MAX31865_PTD_RES,
#endif
#ifdef MAX31865_PTD_RES2
MAX31865_PTD_RES2,
#else
MAX31865_PTD_RES,
#endif
#ifdef MAX31865_PTD_RES3
MAX31865_PTD_RES3,
#else
MAX31865_PTD_RES,
#endif
#ifdef MAX31865_PTD_RES4
MAX31865_PTD_RES4,
#else
MAX31865_PTD_RES,
#endif
#ifdef MAX31865_PTD_RES5
MAX31865_PTD_RES5,
#else
MAX31865_PTD_RES,
#endif
#ifdef MAX31865_PTD_RES6
MAX31865_PTD_RES6
#else
MAX31865_PTD_RES
#endif
};
for (uint32_t i = 0; i < MAX_MAX31865S; i++) { for (uint32_t i = 0; i < MAX_MAX31865S; i++) {
if (max31865_pins_used & (1 << i)) { if (max31865_pins_used & (1 << i)) {
uint16_t rtd; uint16_t rtd;
rtd = max31865[i].readRTD(); rtd = max31865[i].readRTD();
MAX31865_Result[i].Rtd = rtd; MAX31865_Result[i].Rtd = rtd;
MAX31865_Result[i].PtdResistance = max31865[i].rtd_to_resistance(rtd, MAX31865_REF_RES); MAX31865_Result[i].PtdResistance = max31865[i].rtd_to_resistance(rtd, RefRes[i]);
MAX31865_Result[i].PtdTemp = ConvertTemp(max31865[i].rtd_to_temperature(rtd, MAX31865_PTD_RES, MAX31865_REF_RES) + MAX31865_PTD_BIAS); MAX31865_Result[i].PtdTemp = ConvertTemp(max31865[i].rtd_to_temperature(rtd, PtdRes[i], RefRes[i]) + PtdBias[i]);
} }
} }
} }