0.3.2 MTP40C

Author: RobTillaart

libraries/MTP40C/CHANGELOG.md

@@ -6,10 +6,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [0.3.2] - 2025-06-13
+- fix #11, sync MTP40F (PR 6)
+- add constructor
+- add setStream(Stream stream)
+- set default airPressureReference = 1013 hPa.
+- set default setSelfCalibrationHours = 168 hours.
+- update/sync readme.md
+- minor edits
+
 ## [0.3.1] - 2023-11-14
 - update readme.md
 
-
 ## [0.3.0] - 2023-07-30
 - replace CRC with other algorithm for AVR
   - less RAM, less code, faster (AVR only)

libraries/MTP40C/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Rob Tillaart
+Copyright (c) 2021-2025 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

libraries/MTP40C/MTP40C.cpp

@@ -2,7 +2,7 @@
 //    FILE: MTP40C.cpp
 //  AUTHOR: Rob Tillaart
 //    DATE: 2021-08-20
-// VERSION: 0.3.1
+// VERSION: 0.3.2
 // PURPOSE: Arduino library for MTP40C MTP40D CO2 sensor
 //     URL: https://github.com/RobTillaart/MTP40C
 
@@ -14,15 +14,33 @@
 //  #define MTP40_DEBUG    1
 
 
-
 MTP40::MTP40(Stream * stream)
 {
+  init();
   _ser = stream;
+}
+
+
+MTP40::MTP40()
+{
+  init();
+}
+
+
+void MTP40::init()
+{
   _buffer[0] = '\0';
   _type = 0xFF;
 }
 
 
+void MTP40::setStream(Stream * stream)
+{
+  init();
+  _ser = stream;
+}
+
+
 bool MTP40::begin(uint8_t address)
 {
   if (address > 247) return false;
@@ -273,8 +291,12 @@ int MTP40::lastError()
 //
 //  PROTECTED
 //
-bool MTP40::request(uint8_t *data, uint8_t commandLength, uint8_t answerLength)
+bool MTP40::request(uint8_t *data, uint8_t commandLength, uint8_t responseLength)
 {
+  if (_ser == NULL) {
+    _lastError = MTP40_NO_STREAM;
+    return false;
+  }
   //  generic or specific address
   if (_useAddress)
   {
@@ -302,17 +324,18 @@ bool MTP40::request(uint8_t *data, uint8_t commandLength, uint8_t answerLength)
 
   uint32_t start = millis();
   uint8_t i = 0;
-  while (answerLength)
+  while (responseLength)
   {
     if (millis() - start > _timeout) return false;
     if (_ser->available())
     {
       _buffer[i] = _ser->read();
       i++;
-      answerLength--;
+      responseLength--;
     }
     yield();  //  because baud rate is low!
   }
+  //  Add MTP40_INVALID_CRC response check here?
   return true;
 }
 
@@ -452,14 +475,28 @@ const uint8_t auchCRCLo[] = {
 
 /////////////////////////////////////////////////////////////
 //
-//  DERIVED CLASSES
+//  MTP40C DERIVED CLASS
 //
+MTP40C::MTP40C() : MTP40()
+{
+  _type = 2;
+};
+
 MTP40C::MTP40C(Stream * str) : MTP40(str)
 {
   _type = 2;
 };
 
 
+/////////////////////////////////////////////////////////////
+//
+//  MTP40D DERIVED CLASS
+//
+MTP40D::MTP40D() : MTP40()
+{
+  _type = 3;
+};
+
 MTP40D::MTP40D(Stream * str) : MTP40(str)
 {
   _type = 3;

libraries/MTP40C/MTP40C.h

@@ -3,7 +3,7 @@
 //    FILE: MTP40C.h
 //  AUTHOR: Rob Tillaart
 //    DATE: 2021-08-20
-// VERSION: 0.3.1
+// VERSION: 0.3.2
 // PURPOSE: Arduino library for MTP40C + MTP40D CO2 sensor
 //     URL: https://github.com/RobTillaart/MTP40C
 //
@@ -13,36 +13,41 @@
 #include "Arduino.h"
 
 
-#define MTP40_LIB_VERSION                     (F("0.3.1"))
+#define MTP40_LIB_VERSION                     (F("0.3.2"))
 
 
 #define MTP40_DEFAULT_ADDRESS                 0x64
 
 #define MTP40_OK                              0x00
 #define MTP40_INVALID_AIR_PRESSURE            0x01
 #define MTP40_INVALID_GAS_LEVEL               0x02
+#define MTP40_INVALID_CRC                     0x10
+#define MTP40_NO_STREAM                       0x20
 #define MTP40_INVALID_ADDRESS                 0xFF
 #define MTP40_REQUEST_FAILED                  0xFFFF
 
 
 class MTP40
 {
 public:
+  MTP40();
   MTP40(Stream * stream);
 
+  void     setStream(Stream * stream);
+
   bool     begin(uint8_t address = MTP40_DEFAULT_ADDRESS);
   bool     isConnected();
 
   uint8_t  getAddress();
   bool     setAddress(uint8_t address = MTP40_DEFAULT_ADDRESS);
 
   float    getAirPressureReference();
-  bool     setAirPressureReference(float apr);
+  bool     setAirPressureReference(float apr = 1013);  //  1 Atm default
 
   uint16_t getGasConcentration();  // returns PPM
 
-  void     suppressError(bool se) { _suppressError = se; };
-  bool     getSuppressError()     { return _suppressError; };
+  void     suppressError(bool suppress) { _suppressError = suppress; };
+  bool     getSuppressError()           { return _suppressError; };
 
   //  CALIBRATION FUNCTIONS
   //  READ DATASHEET !!
@@ -52,7 +57,7 @@ class MTP40
   bool     openSelfCalibration();
   bool     closeSelfCalibration();
   uint16_t getSelfCalibrationStatus();
-  bool     setSelfCalibrationHours(uint16_t hours);
+  bool     setSelfCalibrationHours(uint16_t hours = 168);
   uint16_t getSelfCalibrationHours();
 
   void     setGenericAddress()  { _useAddress = false; };
@@ -77,7 +82,7 @@ class MTP40
 //  PROTECTED
 //
 protected:
-  Stream * _ser;
+  Stream * _ser           = NULL;
   uint8_t  _buffer[24];   //  should be big enough.
   uint8_t  _address       = MTP40_DEFAULT_ADDRESS;
 
@@ -92,7 +97,8 @@ class MTP40
   bool     _suppressError = false;
   int      _lastError     = MTP40_OK;
 
-  bool     request(uint8_t *data, uint8_t cmdlen, uint8_t anslen);
+  void     init();
+  bool     request(uint8_t *data, uint8_t commandLength, uint8_t responseLength);
 
   uint16_t CRC(uint8_t *data, uint16_t len);
 
@@ -111,18 +117,20 @@ class MTP40
 class MTP40C : public MTP40
 {
 public:
+  MTP40C();
   MTP40C(Stream * str);
 };
 
 
 class MTP40D : public MTP40
 {
 public:
+  MTP40D();
   MTP40D(Stream * str);
 
   //  TODO
   //  I2C interface
-  // PWM interface
+  //  PWM interface
 };