Merge branch 'master' into ImproveDocumentation

Author: talbotmcinnis

README.md

@@ -8,9 +8,9 @@ For more information and documentation, see the [DCS-BIOS FlightPanels Project](
 
 DCS-BIOS was originally developed here, [DCS-BIOS project.](https://github.com/dcs-bios/dcs-bios)  DCS-BIOS Flightpanels forked all of DCS-BIOS in order to initially provide support for Saitek Flight Panels.  As of Nov, 2020, the original project has received limited support (despite a major update for HUB), and FlightPanels is gaining in popularity due to it's support.  Late in 2020, this fork of the arduino-only portion was created to become the "official" branch associated with the FlightPanels DCS-BIOS side.
 
-## Support
+## Support & Documentation
 
-This is a community maintained plugin.  Support is best found at the DCS-Flightpanels discord channel.
+This is a community maintained plugin.  Support is best found at the DCS-Flightpanels discord channel.  The wiki is very much a work in progress, and can be found here: https://github.com/talbotmcinnis/dcs-bios-arduino-library/wiki
 
 ## Releasing
 

examples/OneOfEverything/OneOfEverything.ino

@@ -50,9 +50,16 @@ DcsBios::InvertedPotentiometer invertedPotentiometerExample("MSG_0", 1);
 // Outputs
 ///////////
 // A single LED
+DcsBios::Dimmer defaultDimmerExample(0x1012, 5);
 DcsBios::LED masterCaution(0x1012, 0x0800, 13);
 // An analog output with a value that comes from a DCS address
 DcsBios::Dimmer(0x1012, 13);
+DcsBios::Dimmer invertedDimmerExample(0x1012, 5, 200,0);
+unsigned int myValueMapper(unsigned int dcsValue)
+{
+  return dcsValue % 10;
+}
+DcsBios::Dimmer mappedDimmerExample(0x1012, 5, myValueMapper);
 // A servo motor controlleed from DCS, i.e. a guage.
 DcsBios::ServoOutput(0x1012, 13, 544, 2400);
 

src/internal/Buttons.h

@@ -114,6 +114,10 @@ namespace DcsBios {
 				}
 			}
 
+      void resetState() {
+        lastState_ = (lastState_==0)?-1:0;
+      }
+
 		public:
       //init now expects a message (the identifier you are trying to control), an argument ("TOGGLE") and an address to a storage variable
 			MatActionButtonT(const char* msg, const char* arg, volatile unsigned char* argAddress) :
@@ -148,6 +152,10 @@ namespace DcsBios {
 				}
 			}
 
+      void resetState() {
+        lastState_ = (lastState_==0)?-1:0;
+      }
+
 		public:
       //init now expects a message (the identifier you are trying to control), an argument ("TOGGLE") and an address to a storage variable
 			MatActionButtonToggleT(const char* msg, const char* arg, volatile unsigned char* argAddress) :
@@ -186,6 +194,10 @@ namespace DcsBios {
 				}
 			}
 
+      void resetState() {
+        lastState_ = (lastState_==0)?-1:0;
+      }
+
 		public:
       //init now expects row and column, as well as an array pointer, instead of a pin
 			MatActionButtonSetT(const char* msg, volatile unsigned char* argAddress, char onLvlArg) :
@@ -197,7 +209,7 @@ namespace DcsBios {
 				lastState_ = *address;
 			}  
 	};
-	typedef MatActionButtonToggleT<> MatActionButtonToggle;
+	typedef MatActionButtonSetT<> MatActionButtonSet;
 }
 
 #endif

src/internal/Dimmer.h

@@ -11,16 +11,33 @@ namespace DcsBios {
 			void onDcsBiosFrameSync();
 			char pin_;
 			const char* msg_;
+			int minOutput_;
+			int maxOutput_;
+			unsigned int (*map_function_)(unsigned int newValue);
+
 		public:
-			Dimmer(unsigned int address, char pin) : Int16Buffer(address){
+			Dimmer(unsigned int address, char pin, int minOutput=0, int maxOutput=255) : Int16Buffer(address){
+				pin_ = pin;
+				minOutput_ = minOutput;
+				maxOutput_ = maxOutput;
+				map_function_ = NULL;
+			}
+			Dimmer(unsigned int address, char pin, unsigned int (*map_function)(unsigned int newValue)) : Int16Buffer(address){
 				pin_ = pin;
+				map_function_ = map_function;
 			}
 			virtual void loop() {
 				if (hasUpdatedData()) {
-				analogWrite(pin_, getData()/255);
-				} 
+					analogWrite(pin_, mapValue(getData()));
+				}
+			}
+			unsigned int mapValue(unsigned int value) {
+				if (map_function_) {
+					return map_function_(value);
+				} else {
+					return map(value, 0, 65535, minOutput_, maxOutput_);
+				}
 			}
-			
 			void SetControl( const char* msg )
 			{
 				msg_ = msg;