Browse Source

Abstract code for transmittion for later refactoring

Robert Marshall 5 years ago
parent
commit
ad3c34dfeb
2 changed files with 23 additions and 5 deletions
  1. 19 0
      Transmitter/src/Transmitter.cpp
  2. 4 5
      Transmitter/src/main.cpp

+ 19 - 0
Transmitter/src/Transmitter.cpp

@@ -0,0 +1,19 @@
+#include <Arduino.h>
+#include <RH_ASK.h>
+
+class Transmitter{
+	RH_ASK _driver;
+public:
+	// Transmitter(unsigned int pin){
+	// 	pinMode(pin, INPUT);
+	// }
+
+	bool setup(){
+		return _driver.init();
+	}
+
+	void send(char* message){
+		_driver.send((uint8_t *)message, strlen(message));
+		_driver.waitPacketSent();
+	}
+};

+ 4 - 5
Transmitter/src/main.cpp

@@ -1,20 +1,19 @@
 #include <Arduino.h>
-#include <RH_ASK.h>
 #include <Button.cpp>
+#include <Transmitter.cpp>
 
-RH_ASK _driver;
 void sendOnSignal();
 void sendOffSignal();
 Button _button(13, &sendOnSignal, &sendOffSignal);
 unsigned int _counter;
+Transmitter _transmitter;
 
 void sendSignal(int value){
 	Serial.print("Transmitting: ");
 	char msg[9];
 	sprintf(msg, "LED On: %d", value);
 	Serial.println(msg);
-	_driver.send((uint8_t *)msg, strlen(msg));
-	_driver.waitPacketSent();
+	_transmitter.send(msg);
 	Serial.println("Transmitted");
 }
 
@@ -29,7 +28,7 @@ void sendOffSignal(){
 void setup() {
 	Serial.begin(9600);
 	Serial.println("Starting...");
-    if (!_driver.init())
+    if (!_transmitter.setup())
 		Serial.println("init failed");
 	Serial.println("Started");
 }