1.1.0 Release

README.md

@@ -1,5 +1,5 @@
 # Frequency Detector Library for Arduino and ATtinys
-
+### Version 1.1.0
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Build Status](https://travis-ci.org/ArminJo/Arduino-FrequencyDetector.svg?branch=master)](https://travis-ci.org/ArminJo/Arduino-FrequencyDetector)
 [![Hit Counter](https://hitcounter.pythonanywhere.com/count/tag.svg?url=https%3A%2F%2Fgit.luolix.top%2FArminJo%2FArduino-FrequencyDetector)](https://github.com/brentvollebregt/hit-counter)

library.properties

@@ -1,5 +1,5 @@
 name=FrequencyDetector
-version=1.0.0
+version=1.1.0
 author=Armin Joachimsmeyer
 maintainer=Armin Joachimsmeyer <armin.joachimsmeyer@gmail.com>
 sentence=Measure frequency of analog captured signal connected to an Arduino and check for noise and mute.<br/>

src/ATtinySerialOut.h

@@ -111,10 +111,13 @@ inline void writeValue(uint8_t aValue) {
 }
 
 // The same class as for plain arduino
+#if defined(ARDUINO_AVR_DIGISPARK)
 // The digispark library defines (2/2019) F but not __FlashStringHelper
-#if not defined(F) || defined(ARDUINO_AVR_DIGISPARK)
+//# define F(string_literal) ((fstr_t*)PSTR(string_literal))
+#define __FlashStringHelper fstr_t
+#endif
+#if not defined(F)
 class __FlashStringHelper;
-#undef F
 #define F(string_literal) (reinterpret_cast<const __FlashStringHelper *>(PSTR(string_literal)))
 #endif
 

src/FrequencyDetector.cpp

@@ -41,14 +41,14 @@
 
 #include <Arduino.h>
 
-#if defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
-#include "ATtinySerialOut.h"
-#endif
-
 //#define INFO
 //#define DEBUG
 //#define TRACE
 
+#if (defined(INFO) || defined(DEBUG) || defined(TRACE)) && (defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__))
+#include "ATtinySerialOut.h"
+#endif
+
 #include "FrequencyDetector.h"
 
 #define maximumAllowableCountOf(aPeriodCountTotal) (aPeriodCountTotal / 8)
@@ -146,7 +146,8 @@ bool setFrequencyDetectorDropoutTimes(uint16_t aMinMatchNODropoutMillis, uint16_
                 / FrequencyDetectorControl.PeriodOfOneReadingMillis;
         FrequencyDetectorControl.MaxMatchDropoutCount = aMaxMatchDropoutMillis / FrequencyDetectorControl.PeriodOfOneReadingMillis;
         // set initial to maximum dropouts
-        FrequencyDetectorControl.MatchDropoutCount = FrequencyDetectorControl.MinMatchNODropoutCount + FrequencyDetectorControl.MaxMatchDropoutCount;
+        FrequencyDetectorControl.MatchDropoutCount = FrequencyDetectorControl.MinMatchNODropoutCount
+                + FrequencyDetectorControl.MaxMatchDropoutCount;
 
         tRetval = true;
     } else {
@@ -203,7 +204,7 @@ uint16_t readSignal() {
      */
 #if defined(ARDUINO_AVR_DIGISPARK)
     // Digispark uses timer1 for millis()
-        cbi(TIMSK, TOIE1);
+    cbi(TIMSK, TOIE1);
 #else
 #  if defined(TIMSK) && defined(TOIE0)
     cbi(TIMSK, TOIE0);