Skip to content

Commit

Permalink
Fix includes
Browse files Browse the repository at this point in the history
  • Loading branch information
@xxxajk
xxxajk committed Nov 5, 2013
1 parent 3445338 commit 921cac1
Show file tree
Hide file tree
Showing 43 changed files with 338 additions and 458 deletions.
9 changes: 1 addition & 8 deletions eoseventdump.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,8 @@ e-mail : [email protected]
#if !defined(__EOSEVENTDUMP_H__)
#define __EOSEVENTDUMP_H__

#if defined(ARDUINO) && ARDUINO >=100
#include <Arduino.h>
#else
#include <WProgram.h>
#endif
#include <inttypes.h>
#include <avr/pgmspace.h>
#include "ptpcallback.h"
#include "Usb.h"
#include "ptpcallback.h"


class EOSEventDump : public PTPReadParser
Expand Down
1 change: 0 additions & 1 deletion eoseventparser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ e-mail : [email protected]
#ifndef __EOSEVENTPARSER_H__
#define __EOSEVENTPARSER_H__

#include <inttypes.h>
#include <Usb.h>
#include <canoneos.h>

Expand Down
3 changes: 0 additions & 3 deletions examples/Canon_EOS/EOSBulb/EOSBulb.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
5 changes: 1 addition & 4 deletions examples/Canon_EOS/EOSCamController/eoseventhandler.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
#ifndef __EOSEVENTHANDLERS_H__
#define __EOSEVENTHANDLERS_H__

#include <inttypes.h>
#include <avr/pgmspace.h>
#include <Max_LCD.h>
#include <message.h>
#include <Usb.h>
#include <Max_LCD.h>
#include <canoneos.h>
#include <eoseventparser.h>

Expand Down
26 changes: 12 additions & 14 deletions examples/Canon_EOS/EOSCamController/hdrcapture.h
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#if !defined(__HDRCAPTURE_H__)
#define __HDRCAPTURE_H__

#include <inttypes.h>
#include <avr/pgmspace.h>
#include <qp_port.h>
#include <ptp.h>
#include <qp_port.h>
#include <canoneos.h>
#include <simplefifo.h>
#include <valuelist.h>
Expand All @@ -16,7 +14,7 @@
#define TA_INTR_TIMER 0x05
#define TA_BULB_TIMER 0x07

enum HDRCaptureSignals
enum HDRCaptureSignals
{
TICK_MILLIS_SIG = Q_USER_SIG,
SET_FRAMES_SIG,
Expand All @@ -31,13 +29,13 @@ enum HDRCaptureSignals
PTP_RC_OK_SIG
};

struct SetTimeoutEvt : public QEvent
struct SetTimeoutEvt : public QEvent
{
uint32_t timeout;
uint8_t attribs;
};

struct SetEvt : public QEvent
struct SetEvt : public QEvent
{
uint32_t value;
};
Expand All @@ -54,7 +52,7 @@ struct PTP_RC_Evt : public QEvent
uint16_t rc;
};

class HDRCapture : public QHsm
class HDRCapture : public QHsm
{
uint16_t frmCntdn;
uint16_t frmCount;
Expand All @@ -66,19 +64,19 @@ class HDRCapture : public QHsm
uint8_t bktCntdn;
uint8_t bktPos;
uint8_t bktOldVal;

CanonEOS &Eos;

SetTimeoutEvt toEvt;
PTP_RC_Evt rcEvt;
QEvent qpEvt;

QStateHandler activeHistory;

SimpleFIFO<QEvent*, 4> theQueue;

public:
HDRCapture(CanonEOS &eos) :
HDRCapture(CanonEOS &eos) :
QHsm((QStateHandler)&HDRCapture::Initial),
frmCount(0),
frmCntdn(0),
Expand All @@ -103,7 +101,7 @@ class HDRCapture : public QHsm
void Run()
{
QEvent *e = NULL;

while ( (e = theQueue.Pop()) )
dispatch(e);
};
Expand All @@ -120,7 +118,7 @@ class HDRCapture : public QHsm
static QState SaveSettings(HDRCapture *me, QEvent const *e);
static QState RestoreSettings(HDRCapture *me, QEvent const *e);
static QState Timeout(HDRCapture *me, QEvent const *e);

virtual void OnFrameCaptured(uint16_t left) {};
virtual void OnBktFrameCaptured(uint16_t left) {};
virtual void OnSelfTimerProgress(uint32_t left) {};
Expand Down
3 changes: 0 additions & 3 deletions examples/Canon_EOS/EOSCapture/EOSCapture.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
3 changes: 0 additions & 3 deletions examples/Canon_EOS/EOSDualCapture/EOSDualCapture.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
3 changes: 0 additions & 3 deletions examples/Canon_EOS/EOSEventLab/EOSEventLab.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
3 changes: 0 additions & 3 deletions examples/Canon_EOS/EOSFocus/EOSFocus.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
3 changes: 0 additions & 3 deletions examples/Canon_EOS/EOSHDRCapture/EOSHDRCapture.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
26 changes: 12 additions & 14 deletions examples/Canon_EOS/EOSHDRCapture/hdrcapture.h
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#if !defined(__HDRCAPTURE_H__)
#define __HDRCAPTURE_H__

#include <inttypes.h>
#include <avr/pgmspace.h>
#include <qp_port.h>
#include <ptp.h>
#include <qp_port.h>
#include <canoneos.h>
#include <simplefifo.h>
#include <valuelist.h>
Expand All @@ -16,7 +14,7 @@
#define TA_INTR_TIMER 0x05
#define TA_BULB_TIMER 0x07

enum HDRCaptureSignals
enum HDRCaptureSignals
{
TICK_MILLIS_SIG = Q_USER_SIG,
SET_FRAMES_SIG,
Expand All @@ -31,13 +29,13 @@ enum HDRCaptureSignals
PTP_RC_OK_SIG
};

struct SetTimeoutEvt : public QEvent
struct SetTimeoutEvt : public QEvent
{
uint32_t timeout;
uint8_t attribs;
};

struct SetEvt : public QEvent
struct SetEvt : public QEvent
{
uint32_t value;
};
Expand All @@ -54,7 +52,7 @@ struct PTP_RC_Evt : public QEvent
uint16_t rc;
};

class HDRCapture : public QHsm
class HDRCapture : public QHsm
{
uint16_t frmCntdn;
uint16_t frmCount;
Expand All @@ -66,19 +64,19 @@ class HDRCapture : public QHsm
uint8_t bktCntdn;
uint8_t bktPos;
uint8_t bktOldVal;

CanonEOS &Eos;

SetTimeoutEvt toEvt;
PTP_RC_Evt rcEvt;
QEvent qpEvt;

QStateHandler activeHistory;

SimpleFIFO<QEvent*, 4> theQueue;

public:
HDRCapture(CanonEOS &eos) :
HDRCapture(CanonEOS &eos) :
QHsm((QStateHandler)&HDRCapture::Initial),
frmCount(0),
frmCntdn(0),
Expand All @@ -103,7 +101,7 @@ class HDRCapture : public QHsm
void Run()
{
QEvent *e = NULL;

while ( (e = theQueue.Pop()) )
dispatch(e);
};
Expand All @@ -120,7 +118,7 @@ class HDRCapture : public QHsm
static QState SaveSettings(HDRCapture *me, QEvent const *e);
static QState RestoreSettings(HDRCapture *me, QEvent const *e);
static QState Timeout(HDRCapture *me, QEvent const *e);

virtual void OnFrameCaptured(uint16_t left) {};
virtual void OnBktFrameCaptured(uint16_t left) {};
virtual void OnSelfTimerProgress(uint32_t left) {};
Expand Down
2 changes: 0 additions & 2 deletions examples/Canon_EOS/EOSRemote/eoseventhandlers.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef __EOSEVENTHANDLERS_H__
#define __EOSEVENTHANDLERS_H__

#include <inttypes.h>
#include <avr/pgmspace.h>
#include <Usb.h>
#include <canoneos.h>
#include <eoseventparser.h>
Expand Down
3 changes: 0 additions & 3 deletions examples/Canon_PS/PSCapture/PSCapture.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
2 changes: 0 additions & 2 deletions examples/Canon_PS/PSCapture/pseventparser.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef __PSEVENTPARSER_H__
#define __PSEVENTPARSER_H__

#include <inttypes.h>
#include <avr/pgmspace.h>
#include <Usb.h>
#include "ptpdebug.h"
#include "canonps.h"
Expand Down
2 changes: 0 additions & 2 deletions examples/Canon_PS/PSCapture/ptpobjinfoparser.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef __PTPOBJINFOPARSER_H__
#define __PTPOBJINFOPARSER_H__

#include <Usb.h>

#include <ptp.h>
#include <mtpconst.h>

Expand Down
3 changes: 0 additions & 3 deletions examples/Canon_PS/PSDevProp/PSDevProp.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
6 changes: 0 additions & 6 deletions examples/Canon_PS/PSDevProp/devpropparser.h
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
#ifndef __DEVPROPPARSER_H__
#define __DEVPROPPARSER_H__

#include <inttypes.h>
#include <avr/pgmspace.h>
//#include <../ptp/ptpconst.h>
//#include <../ptp/ptp.h>
//#include <../ParseTools/parsetools.h>
#include <ptpconst.h>
#include <ptp.h>
#include <Usb.h>

// Device properties
const char msgUndefined [] PROGMEM = "Undefined";
Expand Down
3 changes: 0 additions & 3 deletions examples/Canon_PS/PSRemote/PSRemote.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
2 changes: 0 additions & 2 deletions examples/Canon_PS/PSRemote/pseventparser.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef __PSEVENTPARSER_H__
#define __PSEVENTPARSER_H__

#include <inttypes.h>
#include <avr/pgmspace.h>
#include <Usb.h>
#include "ptpdebug.h"
#include "canonps.h"
Expand Down
2 changes: 0 additions & 2 deletions examples/Canon_PS/PSRemote/ptpobjinfoparser.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef __PTPOBJINFOPARSER_H__
#define __PTPOBJINFOPARSER_H__

#include <Usb.h>

#include <ptp.h>
#include <mtpconst.h>

Expand Down
3 changes: 0 additions & 3 deletions examples/Nikon/NKEventLab/NKEventLab.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <eoseventdump.h>
Expand Down
3 changes: 0 additions & 3 deletions examples/Nikon/NKEventMonitor/NKEventMonitor.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>
#include <eoseventdump.h>

Expand Down
3 changes: 0 additions & 3 deletions examples/Nikon/NKLiveView/NKLiveView.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <eoseventdump.h>
Expand Down
3 changes: 0 additions & 3 deletions examples/Nikon/NKRemote/NKRemote.pde
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
3 changes: 0 additions & 3 deletions examples/ptpsketches/PTPCapture/PTPCapture.ino
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
3 changes: 0 additions & 3 deletions examples/ptpsketches/PTPDevInfo/PTPDevInfo.ino
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#include <inttypes.h>
#include <avr/pgmspace.h>

#include <usbhub.h>

#include <ptp.h>
Expand Down
Loading

0 comments on commit 921cac1

Please sign in to comment.