zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix MAX6675 readout with Hardware SPI (#13530)

Browse source
This commit is contained in:
Kajetan Rzepecki 2019-03-31 05:31:50 +02:00 committed by Scott Lahteine
parent 04086fc455
commit c9079165ee
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/module/temperature.cpp
View file

@ -1816,19 +1816,23 @@ void Temperature::disable_all_heaters() {
// //
// TODO: spiBegin, spiRec and spiInit doesn't work when soft spi is used. // TODO: spiBegin, spiRec and spiInit doesn't work when soft spi is used.
// //
#if MAX6675_SEPARATE_SPI #if !MAX6675_SEPARATE_SPI
spiBegin(); spiBegin();
spiInit(MAX6675_SPEED_BITS); spiInit(MAX6675_SPEED_BITS);
#endif #endif
#if COUNT_6675 > 1 #if COUNT_6675 > 1
#define WRITE_MAX6675(V) do{ switch (hindex) { case 1: WRITE(MAX6675_SS2_PIN, V); break; default: WRITE(MAX6675_SS_PIN, V); } }while(0) #define WRITE_MAX6675(V) do{ switch (hindex) { case 1: WRITE(MAX6675_SS2_PIN, V); break; default: WRITE(MAX6675_SS_PIN, V); } }while(0)
#define SET_OUTPUT_MAX6675() do{ switch (hindex) { case 1: SET_OUTPUT(MAX6675_SS2_PIN); break; default: SET_OUTPUT(MAX6675_SS_PIN); } }while(0)
#elif ENABLED(HEATER_1_USES_MAX6675) #elif ENABLED(HEATER_1_USES_MAX6675)
#define WRITE_MAX6675(V) WRITE(MAX6675_SS2_PIN, V) #define WRITE_MAX6675(V) WRITE(MAX6675_SS2_PIN, V)
#define SET_OUTPUT_MAX6675() SET_OUTPUT(MAX6675_SS2_PIN)
#else #else
#define WRITE_MAX6675(V) WRITE(MAX6675_SS_PIN, V) #define WRITE_MAX6675(V) WRITE(MAX6675_SS_PIN, V)
#define SET_OUTPUT_MAX6675() SET_OUTPUT(MAX6675_SS_PIN)
#endif #endif
SET_OUTPUT_MAX6675();
WRITE_MAX6675(LOW); // enable TT_MAX6675 WRITE_MAX6675(LOW); // enable TT_MAX6675
DELAY_NS(100); // Ensure 100ns delay DELAY_NS(100); // Ensure 100ns delay