Use TimerOne library for CPPM output. Renamed files.

Saitek-X52-PPM.ino

@@ -14,7 +14,8 @@
 #include <hiduniversal.h>
 #include <usbhub.h>
 
-#include "hid_parser.h"
+#include "events.h"
+#include "parser.h"
 #include "x52.h"
 
 #define ENABLE_SERIAL_PORT
@@ -24,7 +25,8 @@ USB usb;
 USBHub hub(&usb);
 HIDUniversal hid(&usb);
 X52 x52(&usb, &hid);
-JoystickEventsDeadZone joyevents;
+JoystickEventsCPPM joyCPPM;
+JoystickEventsDeadZone joyevents((JoystickEvents*)&joyCPPM);
 JoystickReportParser joy(&joyevents);
 
 void setup() {

cppm.c → cppm.cpp

@@ -28,14 +28,11 @@
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, version 2.
  */
-
-#include <avr/io.h>
-#include <avr/interrupt.h>
-
+#include <TimerOne.h>
 #include "cppm.h"
 
-#define MAX_STATES 17
 #define CHANNELS 8
+#define MAX_STATES ((2 * CHANNELS) + 1)
 #define WHOLE_PULSE_WIDTH 20000
 #define PULSE_WIDTH 2000
 #define MAX_PULSE_WIDTH (CHANNELS * PULSE_WIDTH) // 16.000
@@ -48,32 +45,15 @@
 volatile uint16_t cppmData[CHANNELS] = { 1500, 1500, 1500, 1500, 1500, 1500, 1500, 1500 };
 volatile uint16_t delaySum = 0;
 volatile uint8_t state = 0;
-volatile uint16_t triggerTimeRemaining = 0;
-
-#define NONE 0
-#define COMPARE_MATCH 1
-#define OVERFLOW 2
-volatile uint8_t triggerState = NONE;
 
 static void triggerIn(uint16_t us);
 static void nextState(void);
 
 void cppmInit(void) {
-    // Set pin to output mode
-    CPPM_DDR |= (1 << CPPM_PIN);
-
-    // Start with a low pulse
-    CPPM_PORT &= ~(1 << CPPM_PIN);
-
-    TCCR0B |= (1 << CS01); // Prescaler: 8
-
-#ifdef DEBUG
-    TIMSK0 |= (1 << TOIE0) | (1 << OCIE0A); // Enable Overflow and Compare Match Interrupt
-#else
-    TIMSK |= (1 << TOIE0) | (1 << OCIE0A); // Enable Overflow and Compare Match Interrupt
-#endif
-    OCR0A = 0;
-
+    pinMode(CPPM_OUTPUT_PIN, OUTPUT);
+    digitalWrite(CPPM_OUTPUT_PIN, LOW);
+    Timer1.initialize();
+    Timer1.attachInterrupt(&nextState);
     state = 0;
     delaySum = MIN_WAIT;
     triggerIn(PULSE_LOW);
@@ -88,17 +68,13 @@ void cppmCopy(uint16_t *data) {
 }
 
 static void triggerIn(uint16_t us) {
-    TCNT0 = 0; // Reset Timer
-    if (us <= (TIME_AFTER_OVERFLOW - 1)) {
-        triggerState = COMPARE_MATCH;
-        OCR0A = us * TIME_MULTIPLIER;
-    } else {
-        triggerState = OVERFLOW;
-        triggerTimeRemaining = us - TIME_AFTER_OVERFLOW;
-    }
+    Timer1.setPeriod(us);
+    // TODO reset timer?
 }
 
 static void nextState(void) {
+    // TODO stop timer?
+    
     state++;
     if (state > MAX_STATES) {
         state = 0;
@@ -106,10 +82,10 @@ static void nextState(void) {
     }
     if ((state % 2) == 0) {
         // pulse pause
-        CPPM_PORT &= ~(1 << CPPM_PIN);
+        digitalWrite(CPPM_OUTPUT_PIN, LOW);
         triggerIn(PULSE_LOW);
     } else {
-        CPPM_PORT |= (1 << CPPM_PIN);
+        digitalWrite(CPPM_OUTPUT_PIN, HIGH);
         if (state <= 15) {
             // normal ppm pulse
             uint8_t index = state / 2;
@@ -122,29 +98,3 @@ static void nextState(void) {
     }
 }
 
-#ifdef DEBUG
-ISR(TIMER0_OVF_vect) {
-#else
-ISR(TIM0_OVF_vect) {
-#endif
-    if (triggerState == OVERFLOW) {
-        if (triggerTimeRemaining == 0) {
-            triggerState = NONE;
-            nextState();
-        } else {
-            triggerIn(triggerTimeRemaining);
-        }
-    }
-}
-
-#ifdef DEBUG
-ISR(TIMER0_COMPA_vect) {
-#else
-ISR(TIM0_COMPA_vect) {
-#endif
-    if (triggerState == COMPARE_MATCH) {
-        triggerState = NONE;
-        nextState();
-    }
-}
-

cppm.h

@@ -7,30 +7,15 @@
  * published by the Free Software Foundation, version 2.
  */
 
-#ifndef _CPPM_H
-#define _CPPM_H
+#ifndef __CPPM_H__
+#define __CPPM_H__
 
 #include <stdint.h>
 
-#ifdef DEBUG
-
-// Arduino D10
-#define CPPM_PORT PORTB
-#define CPPM_DDR DDRB
-#define CPPM_PIN PB2
-
-#else
-
-#define CPPM_PORT PORTB
-#define CPPM_DDR DDRB
-#define CPPM_PIN PB5
-
-#endif
-
-extern volatile uint16_t cppmData[8];
+#define CPPM_OUTPUT_PIN 13
 
 void cppmInit(void);
 void cppmCopy(uint16_t *data);
 
-#endif
+#endif // __CPPM_H__
 

data.h

@@ -0,0 +1,30 @@
+/*
+ * Saitek X52 Arduino USB Host Shield Library.
+ * Copyright 2016 by Thomas Buck <xythobuz@xythobuz.de>
+ *
+ * Based on the USB Host Library HID Joystick example
+ * https://www.circuitsathome.com/mcu/hid-joystick-code-sample
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ */
+
+#ifndef __GAMEPAD_EVENT_DATA_H__
+#define __GAMEPAD_EVENT_DATA_H__
+
+#include <stdint.h>
+
+class GamePadEventData {
+  public:
+    GamePadEventData(uint16_t v) : X(v), Y(v), Z(v), Rx(v), Ry(v), Rz(v), Slider(v) { }
+    GamePadEventData(uint16_t x, uint16_t y, uint8_t z, uint8_t rx, uint8_t ry,
+            uint16_t rz, uint8_t slider)
+            : X(x), Y(y), Z(z), Rx(rx), Ry(ry), Rz(rz), Slider(slider) { }
+
+    uint16_t X, Y, Rz; // 11bit, 11bit, 10bit
+    uint8_t Z, Rx, Ry, Slider;
+};
+
+#endif // __GAMEPAD_EVENT_DATA_H__
+

joystick_events.h → events.h

@@ -13,20 +13,13 @@
 #ifndef __JOYSTICK_EVENTS_H__
 #define __JOYSTICK_EVENTS_H__
 
-class GamePadEventData {
-  public:
-    GamePadEventData(uint16_t v) : X(v), Y(v), Z(v), Rx(v), Ry(v), Rz(v), Slider(v) { }
-    GamePadEventData(uint16_t x, uint16_t y, uint8_t z, uint8_t rx, uint8_t ry,
-            uint16_t rz, uint8_t slider)
-            : X(x), Y(y), Z(z), Rx(rx), Ry(ry), Rz(rz), Slider(slider) { }
+#include <stdint.h>
 
-    uint16_t X, Y, Rz; // 11bit, 11bit, 10bit
-    uint8_t Z, Rx, Ry, Slider;
-};
+class GamePadEventData;
 
 class JoystickEvents {
   public:
-    JoystickEvents(JoystickEvents* _client = NULL) : client(_client) { }
+    JoystickEvents(JoystickEvents* _client = 0) : client(_client) { }
     virtual void OnGamePadChanged(const GamePadEventData& evt) = 0;
     virtual void OnHatSwitch(uint8_t hat) = 0;
     virtual void OnButtonUp(uint8_t but_id) = 0;
@@ -39,13 +32,14 @@ class JoystickEvents {
 
 class JoystickEventsDeadZone : public JoystickEvents {
   public:
+    JoystickEventsDeadZone(JoystickEvents* client = 0) : JoystickEvents(client) { }
     virtual void OnGamePadChanged(const GamePadEventData& evt);
     virtual void OnHatSwitch(uint8_t hat);
     virtual void OnButtonUp(uint8_t but_id);
     virtual void OnButtonDn(uint8_t but_id);
     virtual void OnMouseMoved(uint8_t x, uint8_t y);
 
-  protected:
+  private:
     const static GamePadEventData deadZone;
     const static uint8_t deadZoneMouseX, deadZoneMouseY;
 
@@ -53,5 +47,19 @@ class JoystickEventsDeadZone : public JoystickEvents {
     const static uint8_t centerMouseX, centerMouseY;
 };
 
+class JoystickEventsCPPM : public JoystickEvents {
+  public:
+    JoystickEventsCPPM(JoystickEvents* client = 0);
+    virtual void OnGamePadChanged(const GamePadEventData& evt);
+    virtual void OnHatSwitch(uint8_t hat);
+    virtual void OnButtonUp(uint8_t but_id);
+    virtual void OnButtonDn(uint8_t but_id);
+    virtual void OnMouseMoved(uint8_t x, uint8_t y);
+
+  private:
+    const static uint8_t channels = 8;
+    uint16_t values[channels];
+};
+
 #endif // __JOYSTICK_EVENTS_H__
 

events_cppm.cpp

@@ -0,0 +1,63 @@
+/*
+ * Saitek X52 Arduino USB Host Shield Library.
+ * Copyright 2016 by Thomas Buck <xythobuz@xythobuz.de>
+ *
+ * Based on the USB Host Library HID Joystick example
+ * https://www.circuitsathome.com/mcu/hid-joystick-code-sample
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2.
+ */
+
+#include "data.h"
+#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_YAW 3
+#define CHANNEL_AUX1 4
+#define CHANNEL_AUX2 5
+
+JoystickEventsCPPM::JoystickEventsCPPM(JoystickEvents* client) : JoystickEvents(client) {
+    for (uint8_t i = 0; i < channels; i++) {
+        values[i] = 1500;
+    }
+
+    values[CHANNEL_AUX1] = 200;
+    values[CHANNEL_AUX2] = 200;
+    
+    cppmInit();
+    cppmCopy(values);
+}
+
+void JoystickEventsCPPM::OnGamePadChanged(const GamePadEventData& evt) {
+    values[CHANNEL_THROTTLE] = evt.Z;
+    values[CHANNEL_PITCH] = evt.Y;
+    values[CHANNEL_ROLL] = evt.X;
+    values[CHANNEL_YAW] = evt.Rz;
+
+    cppmCopy(values);
+}
+
+void JoystickEventsCPPM::OnHatSwitch(uint8_t hat) {
+
+}
+
+void JoystickEventsCPPM::OnButtonUp(uint8_t but_id) {
+
+}
+
+void JoystickEventsCPPM::OnButtonDn(uint8_t but_id) {
+
+}
+
+void JoystickEventsCPPM::OnMouseMoved(uint8_t x, uint8_t y) {
+
+}
+

joystick_events.cpp → events_deadzone.cpp

@@ -10,7 +10,10 @@
  * published by the Free Software Foundation, version 2.
  */
 
-#include "hid_parser.h"
+#include <usb.h>
+
+#include "data.h"
+#include "events.h"
 
 //#define DEBUG_OUTPUT_RAW
 #define DEBUG_OUTPUT

hid_parser.cpp → parser.cpp

@@ -10,7 +10,8 @@
  * published by the Free Software Foundation, version 2.
  */
 
-#include "hid_parser.h"
+#include "events.h"
+#include "parser.h"
 
 //#define DEBUG_OUTPUT
 

hid_parser.h → parser.h

@@ -10,15 +10,17 @@
  * published by the Free Software Foundation, version 2.
  */
 
-#ifndef __HID_PARSER_H__
-#define __HID_PARSER_H__
+#ifndef __PARSER_H__
+#define __PARSER_H__
 
 #include <hid.h>
-#include "joystick_events.h"
+#include "data.h"
 
 #define RPT_GEMEPAD_LEN 8
 #define BUFFER_SIZE 16
 
+class JoystickEvents;
+
 class JoystickReportParser : public HIDReportParser {
   public:
     JoystickReportParser(JoystickEvents* evt);
@@ -34,5 +36,5 @@ class JoystickReportParser : public HIDReportParser {
     JoystickEvents* joyEvents;
 };
 
-#endif // __HID_PARSER_H__
+#endif // __PARSER_H__