3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-06-26 00:41:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request from thinkyhead/rc_various_fixes

Browse source 
General code cleanup, improved naming, etc.
This commit is contained in:
Scott Lahteine 2016-04-19 20:53:38 -07:00
commit 3db5a75f30
5 changed files with 111 additions and 84 deletions

8
Marlin/temperature.cpp
View file

@ -1279,13 +1279,11 @@ void disable_all_heaters() {
#define MAX6675_HEAT_INTERVAL 250u
#if ENABLED(MAX6675_IS_MAX31855)
unsigned long max6675_temp = 2000;
#define MAX6675_READ_BYTES 4
uint32_t max6675_temp = 2000;
#define MAX6675_ERROR_MASK 7
#define MAX6675_DISCARD_BITS 18
#else
unsigned int max6675_temp = 2000;
#define MAX6675_READ_BYTES 2
uint16_t max6675_temp = 2000;
#define MAX6675_ERROR_MASK 4
#define MAX6675_DISCARD_BITS 3
#endif
@ -1317,7 +1315,7 @@ void disable_all_heaters() {
// Read a big-endian temperature value
max6675_temp = 0;
for (uint8_t i = MAX6675_READ_BYTES; i--;) {
for (uint8_t i = sizeof(max6675_temp); i--;) {
SPDR = 0;
for (;!TEST(SPSR, SPIF););
max6675_temp |= SPDR;