比較文本

尋找兩個文字檔案之間的差異

即時編輯器

隱藏空白變更

摺疊未變更行

關閉換行

檢視

比對精度

文字樣式

語法突出顯示

Diffchecker Desktop 執行Diffchecker最安全的方式。取得Diffchecker桌面應用程式：您的差異永遠不會離開您的電腦！取得桌面版

Untitled diff

建立於 2 年前差異永不過期

29 刪除

行
總計
刪除

字符
總計
刪除

要繼續使用此功能，請升級到 Diffchecker Pro 查看價格

127 行

23 新增

行
總計
新增

字符
總計
新增

要繼續使用此功能，請升級到 Diffchecker Pro 查看價格

121 行

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;

已保存差異

原始文本

開啟檔案

/*
  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;

更改後文本

開啟檔案

#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;