Compare text

Find the difference between two text files

Real-time editor

Hide whitespace changes

Hide unchanged lines

Disable line wrap

Layout

Diff precision

Text styles

Syntax highlighting

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 2 years agoDiff never expires

29 removals

Lines
Total
Removed

Characters
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

127 lines

23 additions

Lines
Total
Added

Characters
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

121 lines

This file is part of the Arduino_MKRTHERM library.

This library is free software; you can redistribute it and/or

modify it under the terms of the GNU Lesser General Public

License as published by the Free Software Foundation; either

version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public

License along with this library; if not, write to the Free Software

Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

#include "MKRTHERM.h"

THERMClass::THERMClass(int cs, SPIClass& spi) :

_cs(cs),

_spi(&spi),

_spiSettings(4000000, MSBFIRST, SPI_MODE0)

{

}

int THERMClass::begin()

{

uint32_t rawword;

int32_t rawword; // Change uint32_t to int32_t

pinMode(_cs, OUTPUT);

digitalWrite(_cs, HIGH);

_spi->begin();

rawword = readSensor();

if (rawword == 0xFFFFFF) {

end();

return 0;

}

return 1;

}

void THERMClass::end()

{

pinMode(_cs, INPUT);

digitalWrite(_cs, LOW);

_spi->end();

}

uint32_t THERMClass::readSensor()

{

uint32_t read = 0x00;

digitalWrite(_cs, LOW);

delayMicroseconds(1);

_spi->beginTransaction(_spiSettings);

for (int i = 0; i < 4; i++) {

read <<= 8;

read |= _spi->transfer(0);

}

_spi->endTransaction();

digitalWrite(_cs, HIGH);

return read;

}

float THERMClass::readTemperature()

{

uint32_t rawword;

int32_t rawword; // Change uint32_t to int32_t

float celsius;

rawword = readSensor();

// Check for reading error

if (rawword & 0x7) {

return NAN;

}

// The temperature is stored in the last 14 word's bits

// sendend by the Thermocouple-to-Digital Converter

// The temperature is stored in the last 14 bits

if (rawword & 0x80000000) {

// sent by the Thermocouple-to-Digital Converter

// Negative value, drop the lower 18 bits and explicitly extend sign bits.

rawword >>= 18; // Drop the lower 18 bits

rawword = 0xFFFFC000 | ((rawword >> 18) & 0x00003FFFF);

} else {

// No need for manual sign extension, int32_t handles it

// Positive value, just drop the lower 18 bits.

rawword >>= 18;

}

// multiply for the LSB value

celsius = rawword * 0.25f;

return celsius;

}

float THERMClass::readReferenceTemperature()

{

uint32_t rawword;

float ref;

rawword = readSensor();

// ignore first 4 FAULT bits

// Ignore the first 4 FAULT bits

rawword >>= 4;

// The cold junction reference temperature is stored in the first 11 word's bits

// The cold junction reference temperature is stored in the first 11 bits

// sendend by the Thermocouple-to-Digital Converter

// sent by the Thermocouple-to-Digital Converter

rawword = rawword & 0x7FF;

// check sign bit and convert to negative value.

// Check the sign bit and convert to negative value if needed.

if (rawword & 0x800) {

ref = (0xF800 | (rawword & 0x7FF))*0.0625;

ref = (0xF800 | (rawword & 0x7FF)) * 0.0625;

} else {

// multiply for the LSB value

// Multiply by the LSB value

ref = rawword * 0.0625f;

}

return ref;

}

THERMClass THERM;

Saved diffs

Original text

Open file

/*
  This file is part of the Arduino_MKRTHERM library.
  Copyright (c) 2019 Arduino SA. All rights reserved.

This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
  version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
*/

#include "MKRTHERM.h"

THERMClass::THERMClass(int cs, SPIClass& spi) :
  _cs(cs),
  _spi(&spi),
  _spiSettings(4000000, MSBFIRST, SPI_MODE0)
{
}

int THERMClass::begin()
{
  uint32_t rawword;

pinMode(_cs, OUTPUT);
  digitalWrite(_cs, HIGH);
  _spi->begin();

rawword = readSensor();
  if (rawword == 0xFFFFFF) {
    end();

return 0;
  }

return 1;
}

void THERMClass::end()
{
  pinMode(_cs, INPUT);
  digitalWrite(_cs, LOW);
  _spi->end();
}

uint32_t THERMClass::readSensor()
{
  uint32_t read = 0x00;

digitalWrite(_cs, LOW);
  delayMicroseconds(1);

_spi->beginTransaction(_spiSettings);

for (int i = 0; i < 4; i++) {
    read <<= 8;
    read |= _spi->transfer(0);
  }

_spi->endTransaction();

digitalWrite(_cs, HIGH);

return read;
}

float THERMClass::readTemperature()
{
  uint32_t rawword;
  float celsius;

rawword = readSensor();

// Check for reading error
  if (rawword & 0x7) {
    return NAN; 
  }
  // The temperature is stored in the last 14 word's bits 
  // sendend by the Thermocouple-to-Digital Converter
  if (rawword & 0x80000000) {
    // Negative value, drop the lower 18 bits and explicitly extend sign bits.
    rawword = 0xFFFFC000 | ((rawword >> 18) & 0x00003FFFF);
  } else {
    // Positive value, just drop the lower 18 bits.
    rawword >>= 18;
  }
  // multiply for the LSB value
  celsius = rawword * 0.25f;

return celsius;
}

float THERMClass::readReferenceTemperature()
{
  uint32_t rawword;
  float ref;

rawword = readSensor();

// ignore first 4 FAULT bits
  rawword >>= 4;

// The cold junction reference temperature is stored in the first 11 word's bits
  // sendend by the Thermocouple-to-Digital Converter
  rawword = rawword & 0x7FF;
  // check sign bit  and convert to negative value.
  if (rawword & 0x800) {
    ref = (0xF800 | (rawword & 0x7FF))*0.0625;
  } else {
      // multiply for the LSB value
      ref = rawword * 0.0625f;
  }

return ref;
}

THERMClass THERM;

Changed text

Open file

#include "MKRTHERM.h"

THERMClass::THERMClass(int cs, SPIClass& spi) :
  _cs(cs),
  _spi(&spi),
  _spiSettings(4000000, MSBFIRST, SPI_MODE0)
{
}

int THERMClass::begin()
{
  int32_t rawword;  // Change uint32_t to int32_t

pinMode(_cs, OUTPUT);
  digitalWrite(_cs, HIGH);
  _spi->begin();

rawword = readSensor();
  if (rawword == 0xFFFFFF) {
    end();
    return 0;
  }

return 1;
}

void THERMClass::end()
{
  pinMode(_cs, INPUT);
  digitalWrite(_cs, LOW);
  _spi->end();
}

uint32_t THERMClass::readSensor()
{
  uint32_t read = 0x00;

digitalWrite(_cs, LOW);
  delayMicroseconds(1);

_spi->beginTransaction(_spiSettings);

for (int i = 0; i < 4; i++) {
    read <<= 8;
    read |= _spi->transfer(0);
  }

_spi->endTransaction();
  digitalWrite(_cs, HIGH);

return read;
}

float THERMClass::readTemperature()
{
  int32_t rawword;  // Change uint32_t to int32_t
  float celsius;

rawword = readSensor();

// Check for reading error
  if (rawword & 0x7) {
    return NAN; 
  }

// The temperature is stored in the last 14 bits 
  // sent by the Thermocouple-to-Digital Converter
  rawword >>= 18; // Drop the lower 18 bits

// No need for manual sign extension, int32_t handles it
  celsius = rawword * 0.25f;

return celsius;
}

float THERMClass::readReferenceTemperature()
{
  uint32_t rawword;
  float ref;

rawword = readSensor();

// Ignore the first 4 FAULT bits
  rawword >>= 4;

// The cold junction reference temperature is stored in the first 11 bits
  // sent by the Thermocouple-to-Digital Converter
  rawword = rawword & 0x7FF;

// Check the sign bit and convert to negative value if needed.
  if (rawword & 0x800) {
    ref = (0xF800 | (rawword & 0x7FF)) * 0.0625;
  } else {
    // Multiply by the LSB value
    ref = rawword * 0.0625f;
  }

return ref;
}

THERMClass THERM;