update libraries J..M

Author: RobTillaart

libraries/LineFormatter/LineFormatter.cpp

@@ -1,13 +1,14 @@
 //
 //    FILE: LineFormatter.cpp
 //  AUTHOR: Rob Tillaart
-// VERSION: 0.1.0
+// VERSION: 0.1.1
 // PURPOSE: Simpe positioning wrapper class for Serial
 //    DATE: 2020-05-14
 //     URL: https://github.com/RobTillaart/LineFormatter
 //
 // HISTORY:
 // 0.1.0    2020-05-14 initial version
+// 0.1.1    2020-06-19 fix library.json
 //
 
 

libraries/LineFormatter/LineFormatter.h

@@ -2,14 +2,11 @@
 //
 //    FILE: LineFormatter.h
 //  AUTHOR: Rob Tillaart
-// VERSION: 0.1.0
+// VERSION: 0.1.1
 // PURPOSE: Simpe positioning wrapper class for Serial
 //    DATE: 2020-05-14
 //     URL: https://github.com/RobTillaart/LineFormatter
 //
-// HISTORY:
-// 0.1.0    2020-05-14 initial version
-//
 
 #include "Arduino.h"
 #include "Print.h"

libraries/LineFormatter/library.json

@@ -15,10 +15,7 @@
     "type": "git",
     "url": "https://github.com/RobTillaart/LineFormatter.git"
   },
-  "version":"0.1.0",
+  "version":"0.1.1",
   "frameworks": "arduino",
-  "platforms": "*",
-  "export": {
-    "include": "LineFormatter"
-  }
+  "platforms": "*"
 }

libraries/LineFormatter/library.properties

@@ -1,5 +1,5 @@
 name=LineFormatter
-version=0.1.0
+version=0.1.1
 author=Rob Tillaart <[email protected]>
 maintainer=Rob Tillaart <[email protected]>
 sentence=Wrapper class for Serial to enhance layout of tabular data.

libraries/MAX31855/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2014-2020 Rob Tillaart
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

libraries/MAX31855/MAX31855.cpp

@@ -1,107 +1,184 @@
 //
 //    FILE: MAX31855.cpp
 //  AUTHOR: Rob Tillaart
-// VERSION: 0.1.10
-// PURPOSE: MAX31855 - Thermocouple
+// VERSION: 0.2.3
+// PURPOSE: Arduino library for MAX31855 chip for K type thermocouple
 //    DATE: 2014-01-01
-//     URL: http://forum.arduino.cc/index.php?topic=208061
+//     URL: https://github.com/RobTillaart/MAX31855_RT
 //
 // HISTORY:
+//
+// 0.2.3  2020-08-30 fix #8 support hardware SPI + example
+// 0.2.2  2020-08-30 fix#9 + fix failing examples + minor refactor
+// 0.2.1  2020-08-26 read rawData and STATUS_NO_COMMUNICATION recognition (thanks to FabioBrondo)
+// 0.2.0  2020-06-20 #pragma once; major refactor; removed pre 1.0 support; fix offset
 // 0.1.10 2019-07-31 add 3 inline functions to test errors + demo sketch
 // 0.1.9  2017-07-27 reverted double -> float (issue33)
 // 0.1.08 2015-12-06 replaced all temperature calls with one TCfactor + update demos.
 // 0.1.07 2015-12-06 updated TC factors from the MAX31855 datasheet
 // 0.1.06 2015-12-05 added support for other types of TC's (experimental)
 // 0.1.05 2015-07-12 refactor robust constructor
 // 0.1.04 2015-03-09 replaced float -> double (ARM support)
-// 0.1.03 fixed negative temperature
-// 0.1.02 added offset
-// 0.1.01 refactored speed/performance
-// 0.1.00 initial version.
-//
-// Released to the public domain
+// 0.1.03 2014-01-24 fixed negative temperature
+// 0.1.02 2014-01-03 added offset
+// 0.1.01 2014-01-02 refactored speed/performance
+// 0.1.00 2014-01-02 initial version.
 //
 
+
 #include "MAX31855.h"
 
+
+MAX31855::MAX31855(const uint8_t cs)
+{
+  _cs = cs;
+  _hwSPI = true;
+
+  _offset = 0;
+  _SC = K_TC;
+  _status = STATUS_NOREAD;
+  _temperature = -999;
+  _internal = -999;
+}
+
 MAX31855::MAX31855(const uint8_t sclk, const uint8_t cs, const uint8_t miso)
 {
-    _sclk = sclk;
-    _cs = cs;
-    _miso = miso;
-    _offset = 0;
-    _TCfactor = K_TC;
-    _status = STATUS_NOREAD;
-    _temperature = -999;
-    _internal = -999;
+  _sclk = sclk;
+  _cs = cs;
+  _miso = miso;
+  _hwSPI = false;
+
+  _offset = 0;
+  _SC = K_TC;
+  _status = STATUS_NOREAD;
+  _temperature = -999;
+  _internal = -999;
 }
 
 void MAX31855::begin()
 {
-    pinMode(_cs, OUTPUT);
-    digitalWrite(_cs, HIGH);
-
+  pinMode(_cs, OUTPUT);
+  digitalWrite(_cs, HIGH);
+  if (_hwSPI)
+  {
+    SPI.begin();
+    delay(1);
+  }
+  else
+  {
     pinMode(_sclk, OUTPUT);
     pinMode(_miso, INPUT);
+  }
 }
 
+
 uint8_t MAX31855::read()
 {
-    uint32_t value = _read();
-
-    // process status bit 0-2
-    _status = value & 0x0007;
-    value >>= 3;
-
-    // reserved bit 3
-    value >>= 1;
-
-    // process internal bit 4-15
-    _internal = (value & 0x07FF) * 0.0625;
-    if (value & 0x0800)
-    {
-        _internal = -128 + _internal;  // fix neg temp
-    }
-    value >>= 12;
-
-    // Fault bit ignored as we have the 3 status bits
-    // _fault = value & 0x01;
-    value >>= 1;
+  // return value of _read()
+  // BITS     DESCRIPTION
+  // ----------------------
+  // 00 - 02  STATUS
+  //      03  RESERVED
+  // 04 - 15  INTERNAL
+  //      16  FAULT-BIT
+  //      17  RESERVED
+  // 18 - 30  TEMPERATURE (RAW)
+  //      31  SIGN
+  uint32_t value = _read();
+
+  if (value == 0xFFFFFFFF)  // needs a pull up on miso pin to work properly!
+  {
+    // bit 3 and bit 17 should always be 0 - P10 datasheet
+    _status = STATUS_NO_COMMUNICATION;
+    return _status;
+  }
 
-    // reserved bit 17
-    value >>= 1;
-
-    // process temperature bit 18-30 + sign bit = 31
-    _temperature = (value & 0x1FFF) * 0.25;
-    if (value & 0x2000) // negative flag
-    {
-        _temperature = -2048 + _temperature;  // fix neg temp
-    }
-    if (_offset != 0) _temperature += _offset;
+  _lastRead = millis();
 
+  // process status bit 0-2
+  _status = value & 0x0007;
+  if (_status != STATUS_OK)
+  {
     return _status;
+  }
+
+  value >>= 3;
+
+  // reserved bit 3, always 0
+  value >>= 1;
+
+  // process internal bit 4-15
+  _internal = (value & 0x07FF) * 0.0625;
+  // negative flag set ?
+  if (value & 0x0800) 
+  {
+    _internal = -128 + _internal;
+  }
+  value >>= 12;
+
+  // Fault bit ignored as we have the 3 status bits
+  // _fault = value & 0x01;
+  value >>= 1;
+
+  // reserved bit 17, always 0
+  value >>= 1;
+
+  // process temperature bit 18-30 + sign bit = 31
+  _temperature = (value & 0x1FFF) * 0.25;
+  // negative flag set ?
+  if (value & 0x2000)
+  {
+    _temperature = -2048 + _temperature;
+  }
+  return _status;
 }
 
-// TODO:  optimize performance by direct port manipulation?
+
 uint32_t MAX31855::_read(void)
 {
-    uint32_t value = 0;
-
-    digitalWrite(_cs, LOW);
-
+  _rawData = 0;
+  digitalWrite(_cs, LOW);
+  if (_hwSPI)
+  {
+    SPI.beginTransaction(SPISettings(16000000, MSBFIRST, SPI_MODE0));
+    for (uint8_t i = 0; i < 4; i++)
+    {
+      _rawData <<= 8;
+      _rawData += SPI.transfer(0);
+    }
+    SPI.endTransaction();
+  }
+  else
+  {
     for (int8_t i = 31; i >= 0; i--)
     {
-        value <<= 1;
-        digitalWrite(_sclk, LOW);
-        // delayMicroseconds(1);  // DUE
-        if ( digitalRead(_miso) ) value += 1;
-        digitalWrite(_sclk, HIGH);
-        // delayMicroseconds(1);  // DUE
+      _rawData <<= 1;
+      digitalWrite(_sclk, LOW);
+      // delayMicroseconds(1);  // DUE
+      if ( digitalRead(_miso) ) _rawData++;
+      digitalWrite(_sclk, HIGH);
+      // delayMicroseconds(1);  // DUE
     }
+  }
+  digitalWrite(_cs, HIGH);
+  return _rawData;
+}
 
-    digitalWrite(_cs, HIGH);
-
-    return value;
+float MAX31855::getTemperature()
+{
+  // offset needs to be added after multiplication TCfactor
+  // not before otherwise offset will be larger / smaller
+  // default behavior
+  if (_SC == K_TC) return _temperature + _offset;
+
+  // EXPERIMENTAL OTHER THERMOCOUPLES
+  // in practice this works also for K_TC but is way slower..
+  // 1: reverse calculate the Voltage measured
+  float Vout = K_TC * (_temperature - _internal);  // PAGE 8 datasheet
+
+  // 2: from Voltage to corrected temperature using the Seebeck Coefficient
+  float _temp = Vout / _SC + _internal;
+  return _temp;
 }
 
-// END OF FILE
+// -- END OF FILE --