Added DigitalPin.isOn/isOff() and AnalogInputPin.millivolts()

vovagorodok · vovagorodok · commit 0ba69a37380b · 2025-11-28T00:53:44.000+01:00
diff --git a/keywords.txt b/keywords.txt
@@ -1,23 +1,26 @@
 # Datatypes (KEYWORD1)
-DigitalPin	KEYWORD1
+DigitalPin KEYWORD1
 DigitalInputPin	KEYWORD1
-DigitalPulledPin	KEYWORD1
-DigitalOutputPin	KEYWORD1
+DigitalPulledPin KEYWORD1
+DigitalOutputPin KEYWORD1
 AnalogInputPin KEYWORD1
 ScopedOn KEYWORD1
 ScopedOff KEYWORD1
 
 # Methods and Functions (KEYWORD2)
-on	KEYWORD2
-off	KEYWORD2
-value    KEYWORD2
-operator bool()   KEYWORD2
-setValue    KEYWORD2
+on  KEYWORD2
+off KEYWORD2
+isOn  KEYWORD2
+isOff KEYWORD2
+value KEYWORD2
+operator bool() KEYWORD2
+setValue KEYWORD2
 change  KEYWORD2
 setMode KEYWORD2
-detachInterrupt    KEYWORD2
-attachInterrupt    KEYWORD2
-operator=   KEYWORD2
+detachInterrupt KEYWORD2
+attachInterrupt KEYWORD2
+operator= KEYWORD2
+millivolts KEYWORD2
 
 # Instances (KEYWORD2)
 
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
     "name": "ArduinoPin",
-    "version": "1.1.2",
+    "version": "1.2.0",
     "description": "Objective arduino pin",
     "keywords": "objective, digital, analog, pin",
     "repository":
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=vovagorodok_ArduinoPin
-version=1.1.2
+version=1.2.0
 author=vovagorodok
 maintainer=vovagorodok <vovagorodok2@gmail.com>
 sentence=Objective arduino pin
diff --git a/src/AnalogPin.cpp b/src/AnalogPin.cpp
diff --git a/src/AnalogPin.h b/src/AnalogPin.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <Arduino.h>
 
-#if defined(ESP32)
+#if defined(ARDUINO_ARCH_ESP32)
 using AnalogValue = uint16_t;
 #else
 using AnalogValue = int;
@@ -19,6 +19,11 @@ class AnalogInputPin
   inline AnalogValue value() const {
     return analogRead(num);
   }
+#if defined(ARDUINO_ARCH_ESP32)
+  inline uint32_t millivolts() const {
+    return analogReadMilliVolts(num);
+  }
+#endif
 
 private:
   const uint8_t num;
diff --git a/src/DigitalPin.cpp b/src/DigitalPin.cpp
diff --git a/src/DigitalPin.h b/src/DigitalPin.h
@@ -23,12 +23,18 @@ class DigitalPin
     return *this;
   }
 
-  inline operator bool() const {
-    return value();
-  }
   inline bool value() const {
     return digitalRead(num) xor inactiveState;
   }
+  inline bool isOn() const {
+    return value();
+  }
+  inline bool isOff() const {
+    return !value();
+  }
+  inline operator bool() const {
+    return value();
+  }
   inline void setValue(bool value) {
     digitalWrite(num, inactiveState xor value);
   }
@@ -53,7 +59,7 @@ class DigitalPin
   inline void detachInterrupt() {
     ::detachInterrupt(digitalPinToInterrupt(num));
   }
-#if defined(ESP32)
+#if defined(ARDUINO_ARCH_ESP32)
   inline void attachInterrupt(FunctionPtr functionPtr, uint8_t mode) {
     ::attachInterrupt(digitalPinToInterrupt(num), functionPtr, mode);
   }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ArduinoPin",`
`3`		`- "version": "1.1.2",`
	`3`	`+ "version": "1.2.0",`
`4`	`4`	`"description": "Objective arduino pin",`
`5`	`5`	`"keywords": "objective, digital, analog, pin",`
`6`	`6`	`"repository":`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,18 @@ class DigitalPin`
`23`	`23`	`return *this;`
`24`	`24`	`}`
`25`	`25`
`26`		`- inline operator bool() const {`
`27`		`- return value();`
`28`		`- }`
`29`	`26`	`inline bool value() const {`
`30`	`27`	`return digitalRead(num) xor inactiveState;`
`31`	`28`	`}`
	`29`	`+ inline bool isOn() const {`
	`30`	`+ return value();`
	`31`	`+ }`
	`32`	`+ inline bool isOff() const {`
	`33`	`+ return !value();`
	`34`	`+ }`
	`35`	`+ inline operator bool() const {`
	`36`	`+ return value();`
	`37`	`+ }`
`32`	`38`	`inline void setValue(bool value) {`
`33`	`39`	`digitalWrite(num, inactiveState xor value);`
`34`	`40`	`}`
`@@ -53,7 +59,7 @@ class DigitalPin`
`53`	`59`	`inline void detachInterrupt() {`
`54`	`60`	`::detachInterrupt(digitalPinToInterrupt(num));`
`55`	`61`	`}`
`56`		`-#if defined(ESP32)`
	`62`	`+#if defined(ARDUINO_ARCH_ESP32)`
`57`	`63`	`inline void attachInterrupt(FunctionPtr functionPtr, uint8_t mode) {`
`58`	`64`	`::attachInterrupt(digitalPinToInterrupt(num), functionPtr, mode);`
`59`	`65`	`}`