Merge pull request #2 from Pixelbo/test-class

Merge test-class for main release

Author: Pixelbo

Protocol and errors.md

@@ -55,7 +55,7 @@ The acknoledge data that you received isn't right, the address byte isn't the on
 
 The acknoledge data that you received isn't right, the null byte (the third one) isn't detected by the program
 
-    "Cam %i: ERROR Could not verify camera ACK: bad checksum (is camera well plugged in?)\n",
+    "Cam 1: ERROR Could not verify camera ACK: bad checksum (is camera well plugged in?)\n",
 
 The acknoledge data that you received isn't right, the checksum byte isn't good
 

examples/get_position/get_position.ino

@@ -1,39 +1,36 @@
 #include "Arduino.h"
 #include <Pelco_And_Arduino.h>
 
-PelcoBus MyPelcoBus(6,  // TX pin (Arduino to Cam)
-                    7,  // RX pin (Cam to Arduino)
-                    8); // RE pin for manual switching modules set to -1 if it is a auto module (like a groove one)
+PelcoBus MyPelcoBus(6,  // RX pin (Cam to Arduino)
+                    7,  // TX pin (Arduino to Cam)
+                    8); // RE pin for manual switching modules set to -1 or nothing if it is a auto module (like a groove one)
 
-PelcoBus::PelcoCam Camera1; //Declare a camera
+    
+PelcoCam Camera1(&MyPelcoBus, //The pointer to the bus
+                 1,           //Address of the camera
+                 false);      //We are getting a response
 
 void setup() {
     Serial.begin(9600);
 
-    // Begin the serial communication
-    MyPelcoBus.begin(PELCO_D9600, true);
+    // Begin the bus communication at 9600 and disable logging
+    MyPelcoBus.begin(PELCO_D9600, false);
 
-    // Set camera settings
-    Camera1.address = 1; //Address of the camera
-    Camera1.disable_ack = false; //For this exemple, this must set to false!
-
-
-    // Send stop, send_command will return a bool that indicates if the cameras sended its ACK
-    // It's a good way to see if the camera is plugged in
-    while (!MyPelcoBus.send_command(Camera1, STOP)) {
+    //Is the camera online?
+    while (!Camera1.available()) {
         Serial.println("Camera not plugged?");
         delay(1000);
     }
     Serial.println("Init Finished!");
 }
 
 void loop() {
-        MyPelcoBus.send_command(Camera1, PAN_L, 0x3F); // Spin for a random time
-        delay(random(1000, 2000));
+        Camera1.send_command(SET_PAN, random(0, 35999)); // set pan to a random angle
 
-        int angle100 = MyPelcoBus.send_request(Camera1, QUERY_PAN); // Get the current angle of the camera
+        int angle100 = Camera1.send_request(QUERY_PAN); // Get the current angle of the camera
 
         float angle = angle100 / 100.0; // Convert to float
 
         Serial.println("Angle detected: " + String(angle));
+        delay(200);
 }

examples/old_model/old_model.ino

@@ -1,26 +1,24 @@
 #include "Arduino.h"
 #include <Pelco_And_Arduino.h>
 
-PelcoBus MyPelcoBus(6,  // TX pin (Arduino to Cam)
-                    7,  // RX pin (Cam to Arduino)
-                    8); // RE pin for manual switching modules set to -1 if it is a auto module (like a groove one)
+PelcoBus MyPelcoBus(6,  // RX pin (Cam to Arduino)
+                    7,  // TX pin (Arduino to Cam) 
+                    8); // RE pin for manual switching modules set to -1 or nothing if it is a auto module (like a groove one)
 
-PelcoBus::PelcoCam Camera1; //Declare a camera
+////IMPORTANT: Even if it is an old model without returning a response capabilities you need to specify a RX pin and a RE pin
+    
+PelcoCam Camera1(&MyPelcoBus, //The pointer to the bus
+                 1,           //Address of the camera
+                 true);      //We are NOT getting a response
 
 void setup() {
     Serial.begin(9600);
 
-    // Begin the serial communication
+    // Begin the bus communication at 9600 and enable logging
     MyPelcoBus.begin(PELCO_D9600, true);
 
-    // Set camera settings
-    Camera1.address = 1; //Address of the camera
-    Camera1.disable_ack = true; //Old models function one 2 pair of wires and only one is usable, the TX one, so it's impossible that it can send back a reqponse
-
-
-    // Send stop, send_command will return a bool that indicates if the cameras sended its ACK
-    // It's a good way to see if the camera is plugged in
-    while (!MyPelcoBus.send_command(Camera1, STOP)) {
+    //Is the camera online? this will fail because it is an old models
+    while (!Camera1.available()/* <---- will fail! */) { 
         Serial.println("Camera not plugged?");
         delay(1000);
     }
@@ -30,13 +28,13 @@ void setup() {
 void loop() {
 
     //Pan to the left with max speed before turbo
-    MyPelcoBus.send_command(Camera1, PAN_L, 0x3F);
+    Camera1.send_command(PAN_L, 0x3F);
     delay(1000);
-    MyPelcoBus.send_command(Camera1, STOP); //Stop the camera
+    Camera1.send_command(STOP); //Stop the camera
     delay(1000);
     //Pan to the left with less speed than the tilt speed that goes up
-    MyPelcoBus.send_command(Camera1, PAN_R, 0x3F);
+    Camera1.send_command(PAN_R, 0x3F);
     delay(1000);
-    MyPelcoBus.send_command(Camera1, STOP); //Stop the camera
+    Camera1.send_command(STOP); //Stop the camera
     delay(1000);
 }

examples/send_raw/send_raw.ino

@@ -1,16 +1,17 @@
 #include "Arduino.h"
 #include <Pelco_And_Arduino.h>
 
-PelcoBus MyPelcoBus(6,  // TX pin (Arduino to Cam)
-                    7,  // RX pin (Cam to Arduino)
-                    8); // RE pin for manual switching modules set to -1 if it is a auto module (like a groove one)
+PelcoBus MyPelcoBus(6,  // RX pin (Cam to Arduino)
+                    7,  // TX pin (Arduino to Cam)
+                    8); // RE pin for manual switching modules set to -1 or nothing if it is a auto module (like a groove one)
 
-void setup() {
-    //Here we don't need to declare a camera because all we send is raw
 
+//No need to declare a camera here
+
+void setup() {
     Serial.begin(9600);
 
-    // Begin the serial communication
+    // Begin the bus communication at 9600 and enable logging
     MyPelcoBus.begin(PELCO_D9600, true);
 
     Serial.println("Init Finished!");

examples/set_position/set_position.ino

@@ -1,26 +1,23 @@
 #include "Arduino.h"
 #include <Pelco_And_Arduino.h>
 
-PelcoBus MyPelcoBus(6,  // TX pin (Arduino to Cam)
-                    7,  // RX pin (Cam to Arduino)
-                    8); // RE pin for manual switching modules set to -1 if it is a auto module (like a groove one)
+PelcoBus MyPelcoBus(6,  // RX pin (Cam to Arduino)
+                    7,  // TX pin (Arduino to Cam)
+                    8); // RE pin for manual switching modules set to -1 or nothing if it is a auto module (like a groove one)
 
-PelcoBus::PelcoCam Camera1; //Declare a camera
+    
+PelcoCam Camera1(&MyPelcoBus, //The pointer to the bus
+                 1,           //Address of the camera
+                 false);      //We are getting a response
 
 void setup() {
     Serial.begin(9600);
 
-    // Begin the serial communication
+    // Begin the bus communication at 9600 and enable logging
     MyPelcoBus.begin(PELCO_D9600, true);
 
-    // Set camera settings
-    Camera1.address = 1; //Address of the camera
-    Camera1.disable_ack = false; //If you want to disable the ACK, set it to true
-
-
-    // Send stop, send_command will return a bool that indicates if the cameras sended its ACK
-    // It's a good way to see if the camera is plugged in
-    while (!MyPelcoBus.send_command(Camera1, STOP)) {
+    //Is the camera online?
+    while (!Camera1.available()) {
         Serial.println("Camera not plugged?");
         delay(1000);
     }
@@ -30,7 +27,7 @@ void setup() {
 void loop() {
     //loops the camera increment angle of 1°; very fun because it shakes like hell
       for(int i=0; i<35999; i=i+100){
-         MyPelcoBus.send_command(Camera1, SET_PAN, i); //Hundered of degrees, max is 35999 == 359,99°
+         Camera1.send_command(SET_PAN, i); //Hundered of degrees, max is 35999 == 359,99°
          delay(500);
       }
 

examples/simple/simple.ino

@@ -1,26 +1,23 @@
 #include "Arduino.h"
 #include <Pelco_And_Arduino.h>
 
-PelcoBus MyPelcoBus(6,  // TX pin (Arduino to Cam)
-                    7,  // RX pin (Cam to Arduino)
-                    8); // RE pin for manual switching modules set to -1 if it is a auto module (like a groove one)
+PelcoBus MyPelcoBus(6,  // RX pin (Cam to Arduino)
+                    7,  // TX pin (Arduino to Cam)
+                    8); // RE pin for manual switching modules set to -1 or nothing if it is a auto module (like a groove one)
 
-PelcoBus::PelcoCam Camera1; //Declare a camera
+    
+PelcoCam Camera1(&MyPelcoBus, //The pointer to the bus
+                 1,           //Address of the camera
+                 false);      //We are getting a response
 
 void setup() {
     Serial.begin(9600);
 
-    // Begin the serial communication
+    // Begin the bus communication at 9600 and enable logging
     MyPelcoBus.begin(PELCO_D9600, true);
 
-    // Set camera settings
-    Camera1.address = 1; //Address of the camera
-    Camera1.disable_ack = false; //If you want to disable the ACK, set it to true
-
-
-    // Send stop, send_command will return a bool that indicates if the cameras sended its ACK
-    // It's a good way to see if the camera is plugged in
-    while (!MyPelcoBus.send_command(Camera1, STOP)) {
+    //Is the camera online?
+    while (!Camera1.available()) {
         Serial.println("Camera not plugged?");
         delay(1000);
     }
@@ -29,13 +26,13 @@ void setup() {
 
 void loop() {
     //Pan to the left with max speed before turbo
-    MyPelcoBus.send_command(Camera1, PAN_L, 0x3F); 
+    Camera1.send_command(PAN_L, 0x3F); 
     delay(1000);
-    MyPelcoBus.send_command(Camera1, STOP); //Stop the camera
+    Camera1.send_command(STOP); //Stop the camera
     delay(1000);
     //Pan to the left with less speed than the tilt speed that goes up
-    MyPelcoBus.send_command(Camera1, PAN_R, 0x3F);
+    Camera1.send_command(PAN_R, 0x3F);
     delay(1000);
-    MyPelcoBus.send_command(Camera1, STOP); //Stop the camera
+    Camera1.send_command(STOP); //Stop the camera
     delay(1000);
 }

examples/simple_groove/simple_groove.ino

@@ -0,0 +1,37 @@
+#include "Arduino.h"
+#include <Pelco_And_Arduino.h>
+
+PelcoBus MyPelcoBus(6,  // RX pin (Cam to Arduino)
+                    7);  // TX pin (Arduino to Cam)
+
+    
+PelcoCam Camera1(&MyPelcoBus, //The pointer to the bus
+                 1,           //Address of the camera
+                 false);      //We are getting a response
+
+void setup() {
+    Serial.begin(9600);
+
+    // Begin the bus communication at 9600 and enable logging
+    MyPelcoBus.begin(PELCO_D9600, true);
+
+    //Is the camera online?
+    while (!Camera1.available()) {
+        Serial.println("Camera not plugged?");
+        delay(1000);
+    }
+    Serial.println("Init Finished!");
+}
+
+void loop() {
+    //Pan to the left with max speed before turbo
+    Camera1.send_command(PAN_L, 0x3F); 
+    delay(1000);
+    Camera1.send_command(STOP); //Stop the camera
+    delay(1000);
+    //Pan to the left with less speed than the tilt speed that goes up
+    Camera1.send_command(PAN_R, 0x3F);
+    delay(1000);
+    Camera1.send_command(STOP); //Stop the camera
+    delay(1000);
+}

keywords.txt

@@ -1,5 +1,5 @@
 #######################################
-# Syntax Coloring Map Servo
+# Syntax Coloring
 #######################################
 
 #######################################

library.properties

@@ -1,5 +1,5 @@
 name=Pelco_And_Arduino
-version=2.1.0
+version=2.2.0
 author=Boris Hilkens <pixelbo21@gmail.com>
 maintainer=Boris Hilkens <pixelbo21@gmail.com>
 sentence=This library makes Pelco cameras moves!