Tried debugging with TimerOne lib

Saitek-X52-PPM.ino

@@ -17,6 +17,7 @@
 #include "events.h"
 #include "parser.h"
 #include "x52.h"
+#include "cppm.h"
 
 #define ENABLE_SERIAL_PORT
 #define DEBUG_OUTPUT
@@ -44,11 +45,11 @@ void setup() {
 #endif
     }
 
-    delay(200);
-
     if (!hid.SetReportParser(0, &joy)) {
         ErrorMessage<uint8_t >(PSTR("SetReportParser"), 1);
     }
+
+    cppmInit();
 }
 
 void init_joystick() {

cppm.cpp

@@ -31,6 +31,9 @@
 #include <TimerOne.h>
 #include "cppm.h"
 
+//#define DEBUG_OUTPUT
+//#define DEBUG_OUTPUT_ALL
+
 #define CHANNELS 8
 #define MAX_STATES ((2 * CHANNELS) + 1)
 #define WHOLE_PULSE_WIDTH 20000
@@ -50,16 +53,23 @@ static void triggerIn(uint16_t us);
 static void nextState(void);
 
 void cppmInit(void) {
+#ifdef DEBUG_OUTPUT
+    Serial.println("Initializing Timer...");
+#endif
+
     pinMode(CPPM_OUTPUT_PIN, OUTPUT);
     digitalWrite(CPPM_OUTPUT_PIN, LOW);
-    Timer1.initialize();
+    Timer1.initialize(PULSE_LOW);
     Timer1.attachInterrupt(&nextState);
     state = 0;
     delaySum = MIN_WAIT;
-    triggerIn(PULSE_LOW);
 }
 
 void cppmCopy(uint16_t *data) {
+#ifdef DEBUG_OUTPUT
+    Serial.println("New CPPM data!");
+#endif
+
     cli();
     for (int i = 0; i < CHANNELS; i++) {
         cppmData[i] = data[i];
@@ -69,18 +79,23 @@ void cppmCopy(uint16_t *data) {
 
 static void triggerIn(uint16_t us) {
     Timer1.setPeriod(us);
-    // TODO reset timer?
+    //Timer1.start();
 }
 
 static void nextState(void) {
-    // TODO stop timer?
+    //Timer1.stop();
+
+#ifdef DEBUG_OUTPUT_ALL
+    Serial.print("CPPM state ");
+    Serial.println(state, DEC);
+#endif
     
     state++;
     if (state > MAX_STATES) {
         state = 0;
         delaySum = MIN_WAIT;
     }
-    if ((state % 2) == 0) {
+    if (!(state & 0x01)) {
         // pulse pause
         digitalWrite(CPPM_OUTPUT_PIN, LOW);
         triggerIn(PULSE_LOW);
@@ -88,7 +103,7 @@ static void nextState(void) {
         digitalWrite(CPPM_OUTPUT_PIN, HIGH);
         if (state <= 15) {
             // normal ppm pulse
-            uint8_t index = state / 2;
+            uint8_t index = state >> 1;
             triggerIn(cppmData[index]);
             delaySum += PULSE_WIDTH - cppmData[index];
         } else {

events_cppm.cpp

@@ -14,12 +14,9 @@
 #include "cppm.h"
 #include "events.h"
 
-//#define DEBUG_OUTPUT_RAW
-#define DEBUG_OUTPUT
-
-#define CHANNEL_THROTTLE 0
-#define CHANNEL_PITCH 2
-#define CHANNEL_ROLL 1
+#define CHANNEL_THROTTLE 2
+#define CHANNEL_PITCH 1
+#define CHANNEL_ROLL 0
 #define CHANNEL_YAW 3
 #define CHANNEL_AUX1 4
 #define CHANNEL_AUX2 5
@@ -31,8 +28,7 @@ JoystickEventsCPPM::JoystickEventsCPPM(JoystickEvents* client) : JoystickEvents(
 
     values[CHANNEL_AUX1] = 200;
     values[CHANNEL_AUX2] = 200;
-    
-    cppmInit();
+
     cppmCopy(values);
 }
 
@@ -41,6 +37,8 @@ void JoystickEventsCPPM::OnGamePadChanged(const GamePadEventData& evt) {
     values[CHANNEL_PITCH] = evt.Y;
     values[CHANNEL_ROLL] = evt.X;
     values[CHANNEL_YAW] = evt.Rz;
+    values[CHANNEL_AUX1] = evt.Ry;
+    values[CHANNEL_AUX2] = evt.Slider;
 
     cppmCopy(values);
 }

events_deadzone.cpp

@@ -16,20 +16,23 @@
 #include "events.h"
 
 //#define DEBUG_OUTPUT_RAW
-#define DEBUG_OUTPUT
+//#define DEBUG_OUTPUT
 
+// X, Y, Z, Rx, Ry, Rz, Slider
+// As you can see, my controller Rz axis is broken,
+// yours may be different, so change these values!
 const GamePadEventData JoystickEventsDeadZone::deadZone(
-    0, 0, 0, 0, 0, 50, 0
+    4, 20, 2, 2, 5, 200, 2
 );
-const uint8_t JoystickEventsDeadZone::deadZoneMouseX = 0;
-const uint8_t JoystickEventsDeadZone::deadZoneMouseY = 0;
+const uint8_t JoystickEventsDeadZone::deadZoneMouseX = 1;
+const uint8_t JoystickEventsDeadZone::deadZoneMouseY = 1;
 
+// X, Y, Z, Rx, Ry, Rz, Slider
 const GamePadEventData JoystickEventsDeadZone::centerValue(
-    0x3FF, 0x3FF, 0x7F,
-    0x7F, 0x7F, 0x1FF, 0x7F
+    0x3FF, 0x3FF, 0x7F, 0x7F, 0x7F, 0x1FF, 0x7F
 );
-const uint8_t JoystickEventsDeadZone::centerMouseX = 0x7F;
-const uint8_t JoystickEventsDeadZone::centerMouseY = 0x7F;
+const uint8_t JoystickEventsDeadZone::centerMouseX = 0x07;
+const uint8_t JoystickEventsDeadZone::centerMouseY = 0x07;
 
 void JoystickEventsDeadZone::OnGamePadChanged(const GamePadEventData& evt) {
 #ifdef DEBUG_OUTPUT_RAW

x52.cpp

@@ -12,8 +12,9 @@
 
 #include "x52.h"
 
+//#define DEBUG_OUTPUT
+
 #define TIME_24H_FORMAT
-#define DEBUG_OUTPUT
 
 X52::X52(USB* u, HID* h) : usb(u), hid(h) { }