3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-08-08 06:24:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

thermocouple: Add support for MAX6675 chip

Browse source 
The MAX6675 chip has a different read sequence than the MAX31855 chip.

Signed-off-by: Ricardo Amézquita <ramezquitao@cihologramas.com>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Ricardo Amezquita 2018-06-17 19:59:29 -05:00 • committed by Kevin O'Connor
parent eba252d3fd
commit 756514adef
2 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/thermocouple.c
View file

@ -16,7 +16,8 @@
enum {
TS_CHIP_MAX31855 = 1 << 0,
TS_CHIP_MAX31856 = 1 << 1,
TS_CHIP_MAX31865 = 1 << 2
TS_CHIP_MAX31865 = 1 << 2,
TS_CHIP_MAX6675 = 1 << 3
};
struct thermocouple_spi {
@ -48,7 +49,7 @@ void
command_config_thermocouple(uint32_t *args)
{
uint8_t chip_type = args[2];
if (chip_type > TS_CHIP_MAX31865 || !chip_type)
if (chip_type > TS_CHIP_MAX6675 || !chip_type)
shutdown("Invalid thermocouple chip type");
struct thermocouple_spi *spi = oid_alloc(
args[0], command_config_thermocouple, sizeof(*spi));
@ -90,7 +91,6 @@ thermocouple_respond(struct thermocouple_spi *spi, uint32_t next_begin_time
oid, next_begin_time, value, fault);
}
/* Logic of thermocouple K readers MAX6675 and MAX31855 are same */
static void
thermocouple_handle_max31855(struct thermocouple_spi *spi
, uint32_t next_begin_time, uint8_t oid)
@ -147,6 +147,21 @@ thermocouple_handle_max31865(struct thermocouple_spi *spi
try_shutdown("Thermocouple reader fault");
}
static void
thermocouple_handle_max6675(struct thermocouple_spi *spi
, uint32_t next_begin_time, uint8_t oid)
{
uint8_t msg[2] = { 0x00, 0x00};
spidev_transfer(spi->spi, 1, sizeof(msg), msg);
uint16_t value;
memcpy(&value, msg, sizeof(msg));
value = be16_to_cpu(value);
thermocouple_respond(spi, next_begin_time, value, 0, oid);
// Kill after data send, host decode an error
if (value & 0x04)
try_shutdown("Thermocouple reader fault");
}
// task to read thermocouple and send response
void
thermocouple_task(void)
@ -172,6 +187,9 @@ thermocouple_task(void)
case TS_CHIP_MAX31865:
thermocouple_handle_max31865(spi, next_begin_time, oid);
break;
case TS_CHIP_MAX6675:
thermocouple_handle_max6675(spi, next_begin_time, oid);
break;
}
}
}