Skip to content

PTP 2.0 Library compiler error fixing for newer Arduino Versions #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robotfreak wants to merge 9 commits into
base: master
Choose a base branch
from
Open

PTP 2.0 Library compiler error fixing for newer Arduino Versions #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6aecd98
added missing Quantum Leaps QP/C++ port 4.2.04 files
robotfreak Mar 13, 2015
c66c7d5
removed double declaration of Q_onAssert function
robotfreak Mar 13, 2015
1d99d2f
fixed 'PROGMEMcauses a section type conflict' error
robotfreak Mar 13, 2015
12b4881
fixed 'PROGMEM causes a section type conflict' error
robotfreak Mar 13, 2015
51ea362
fixed 'PROGMEM causes a section type conflict' error
robotfreak Mar 13, 2015
86b0458
fixed 'QP namespace' errors
robotfreak Mar 13, 2015
4e86e9f
fixed ' cannot declare variable ‘hnd’ to be of abstract type ‘EosEven…
robotfreak Mar 13, 2015
d89d52d
fixed const & 'cannot declare variable ‘hnd’ to be of abstract type ‘…
robotfreak Mar 13, 2015
bcafb9a
remove LCD I2C functions
robotfreak Mar 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions examples/Canon_EOS/EOSCamController/EOSCamController.pde
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ PgmStringDataItem diSecond(msgDisconnected);
ScreenItem siFirst (5, 0, 16, false, &diFirst);
ScreenItem siSecond (2, 1, 16, false, &diSecond);

ScreenItem *messageScreenItems[] PROGMEM = { &siFirst, &siSecond };
const ScreenItem * const messageScreenItems[] PROGMEM = { &siFirst, &siSecond };
Screen messageScreen(2, (ScreenItem*)messageScreenItems);

#ifndef NO_SETTINGS_SCREEN
//--- (1) Main Menu Screen --------------------------------------------------------------------
ScreenItem siIntervalometer (1, 0, 8, true, (const char*)&msgIntervalometer);
ScreenItem siSettings (1, 1, 8, false, (const char*)&msgSettings);

ScreenItem *mainMenuScreenItems[] PROGMEM = { &siIntervalometer, &siSettings };
const ScreenItem * const mainMenuScreenItems[] PROGMEM = { &siIntervalometer, &siSettings };
Screen scrMainMenu(2, (ScreenItem*)mainMenuScreenItems);
#endif

Expand All @@ -108,10 +108,10 @@ ScreenItem siRun (10, 0, 4, false, (const char*)&msgSetRun);
#ifndef NO_SETTINGS_SCREEN
ScreenItem siExit (10, 1, 4, false, (const char*)&msgExit);

ScreenItem *timerSettingsScreenItems[] PROGMEM = { &siSelf, &siFrames, &siBkt, &siInterval, &siRun, &siExit };
const ScreenItem * const timerSettingsScreenItems[] PROGMEM = { &siSelf, &siFrames, &siBkt, &siInterval, &siRun, &siExit };
Screen timerSettingsScreen(6, (ScreenItem*)timerSettingsScreenItems);
#else
ScreenItem *timerSettingsScreenItems[] PROGMEM = { &siSelf, &siFrames, &siBkt, &siInterval, &siRun };
const ScreenItem * const timerSettingsScreenItems[] PROGMEM = { &siSelf, &siFrames, &siBkt, &siInterval, &siRun };
Screen timerSettingsScreen(5, (ScreenItem*)timerSettingsScreenItems);
#endif

Expand All @@ -125,7 +125,7 @@ ScreenItem siHourSelf (3, 1, 2, false, &diHourSelf);
ScreenItem siMinSelf (6, 1, 2, false, &diMinSelf);
ScreenItem siSecSelf (9, 1, 2, false, &diSecSelf);

ScreenItem *scitmSelfTimerSet[] PROGMEM = { &siSelfTimer, &siHourSelf, &siMinSelf, &siSecSelf };
const ScreenItem * const scitmSelfTimerSet[] PROGMEM = { &siSelfTimer, &siHourSelf, &siMinSelf, &siSecSelf };
Screen scrSelfTimerSet(4, (ScreenItem*)scitmSelfTimerSet);

//--- (4) Number of Frames Screen -------------------------------------------------------------
Expand All @@ -135,7 +135,7 @@ IntDataItem<uint16_t, 5> diFramesLeft(0);
ScreenItem siFramesText (5, 0, 6, false, (const char*)&msgCntFrames);
ScreenItem siFramesCount (6, 1, 4, false, &diFramesCount);

ScreenItem *scitmFramesSet[] PROGMEM = { &siFramesText, &siFramesCount };
const ScreenItem * const scitmFramesSet[] PROGMEM = { &siFramesText, &siFramesCount };
Screen scrFramesSet(2, (ScreenItem*)scitmFramesSet);

//--- (5) Bracketing Screen -------------------------------------------------------------------
Expand All @@ -149,7 +149,7 @@ ScreenItem siBracketing(0, 0, 15, false, (const char*)&msgBracketing
ScreenItem siBktEV (1, 1, 6, false, &diBktEV);
ScreenItem siBktStep (9, 1, 6, false, &diBktStep);

ScreenItem *scitmBkt[] PROGMEM = { &siBracketing, &siBktEV, &siBktStep };
const ScreenItem * const scitmBkt[] PROGMEM = { &siBracketing, &siBktEV, &siBktStep };
Screen scrBktSet(3, (ScreenItem*)scitmBkt);

//--- (6) Interval Timer Screen ---------------------------------------------------------------
Expand All @@ -158,7 +158,7 @@ ScreenItem siHourInt (3, 1, 2, false, &diHourInt);
ScreenItem siMinInt (6, 1, 2, false, &diMinInt);
ScreenItem siSecInt (9, 1, 2, false, &diSecInt);

ScreenItem *scitmIntTimerSet[] PROGMEM = { &siIntTimer, &siHourInt, &siMinInt, &siSecInt };
const ScreenItem * const scitmIntTimerSet[] PROGMEM = { &siIntTimer, &siHourInt, &siMinInt, &siSecInt };
Screen scrIntTimerSet(4, (ScreenItem*)scitmIntTimerSet);

//--- (7) Run Screen ---------------------------------------------------------------------------
Expand All @@ -170,7 +170,7 @@ ScreenItem siRunIntTime( 0, 1, 8, false, &diIntTimer);
ScreenItem siRunFramesLeft ( 10, 0, 4, false, &diFramesLeft);
ScreenItem siAbort(10, 1, 5, false, (const char*)&msgAbort);

ScreenItem *scitmRun[] PROGMEM = { &siRunLeftTime, &siRunIntTime, &siRunFramesLeft, &siAbort };
const ScreenItem * const scitmRun[] PROGMEM = { &siRunLeftTime, &siRunIntTime, &siRunFramesLeft, &siAbort };
Screen scrRun(4, (ScreenItem*)scitmRun);

#ifndef NO_SETTINGS_SCREEN
Expand All @@ -194,7 +194,7 @@ ScreenItem siPStyle ( 8, 0, 3, false, &diPStyle);
ScreenItem siIso (12, 0, 4, false, &diIso);
ScreenItem siExpComp ( 9, 1, 6, false, &diExpComp);

ScreenItem *scitmSettings[] PROGMEM = { &siMode, &siAperture, &siWb, &siShutterSpeed, &siPStyle, &siIso, &siExpComp };
const ScreenItem * const scitmSettings[] PROGMEM = { &siMode, &siAperture, &siWb, &siShutterSpeed, &siPStyle, &siIso, &siExpComp };
Screen scrSettings(7, (ScreenItem*)scitmSettings);
#endif

Expand Down
1 change: 1 addition & 0 deletions examples/Canon_EOS/EOSCamController/eoseventhandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class EosEventHandlers : public EOSEventHandlers
virtual void OnPropertyChanged(const EOSEvent *evt);
virtual void OnAcceptedListSize(const EOSEvent *evt, const uint16_t size);
virtual void OnPropertyValuesAccepted(const EOSEvent *evt, const uint16_t index, const uint32_t &val);
virtual void OnObjectCreated(const EOSEvent *evt) {};
};

#endif // __EOSEVENTHANDLERS_H__
1 change: 1 addition & 0 deletions examples/Canon_EOS/EOSRemote/eoseventhandlers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class EosEventHandlers : public EOSEventHandlers
virtual void OnPropertyChanged(const EOSEvent *evt);
virtual void OnAcceptedListSize(const EOSEvent *evt, const uint16_t size);
virtual void OnPropertyValuesAccepted(const EOSEvent *evt, const uint16_t index, const uint32_t &val);
virtual void OnObjectCreated(const EOSEvent *evt) {};
};

#endif // __EOSEVENTHANDLERS_H__
6 changes: 3 additions & 3 deletions examples/Canon_PS/PSCapture/ptpobjinfoparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "ptpobjinfoparser.h"

const char* PTPObjInfoParser::acNames[] PROGMEM =
const char* const PTPObjInfoParser::acNames[] PROGMEM =
{
msgUndefined,
msgAssociation,
Expand All @@ -18,7 +18,7 @@ const char* PTPObjInfoParser::acNames[] PROGMEM =
msgQT
};

const char* PTPObjInfoParser::imNames[] PROGMEM =
const char* const PTPObjInfoParser::imNames[] PROGMEM =
{
msgUndefined,
msgEXIF_JPEG,
Expand All @@ -36,7 +36,7 @@ const char* PTPObjInfoParser::imNames[] PROGMEM =
msgTIFF,
msgTIFF_IT,
msgJP2,
msgJPX,
msgJPX
};

void PTPObjInfoParser::PrintFormat(uint16_t op)
Expand Down
4 changes: 2 additions & 2 deletions examples/Canon_PS/PSCapture/ptpobjinfoparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ const char msg3GP_Container [] PROGMEM = "3GP_Container";

class PTPObjInfoParser : public PTPReadParser
{
static const char* acNames[];
static const char* imNames[];
static const char* const acNames[];
static const char* const imNames[];

MultiValueBuffer theBuffer;
uint32_t varBuffer;
Expand Down
6 changes: 3 additions & 3 deletions examples/Canon_PS/PSDevProp/devpropparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "devpropparser.h"

const char* DevPropParser::dtNames1[] PROGMEM =
const char* const DevPropParser::dtNames1[] PROGMEM =
{
msgUNDEF,
msgINT8,
Expand All @@ -15,7 +15,7 @@ const char* DevPropParser::dtNames1[] PROGMEM =
msgUINT128
};

const char* DevPropParser::dtNames2[] PROGMEM =
const char* const DevPropParser::dtNames2[] PROGMEM =
{
msgUNDEF,
msgAINT8,
Expand All @@ -30,7 +30,7 @@ const char* DevPropParser::dtNames2[] PROGMEM =
msgAUINT128
};

const char* DevPropParser::prNames[] PROGMEM =
const char* const DevPropParser::prNames[] PROGMEM =
{
msgUndefined,
msgBatteryLevel,
Expand Down
6 changes: 3 additions & 3 deletions examples/Canon_PS/PSDevProp/devpropparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ const char msgSTR [] PROGMEM = "STR";

class DevPropParser : public PTPReadParser
{
static const char* dtNames1[];
static const char* dtNames2[];
static const char* prNames[];
static const char* const dtNames1[];
static const char* const dtNames2[];
static const char* const prNames[];

uint8_t nStage;
uint8_t enStage;
Expand Down
10 changes: 5 additions & 5 deletions examples/Canon_PS/PSRemote/PSRemote.pde
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
#include "pseventparser.h"
#include "psconsole.h"

using namespace QP;
//using namespace QP;

//............................................................................
void Q_onAssert(char const Q_ROM * const Q_ROM_VAR file, int line) {
QF_INT_DISABLE(); // disable all interrupts
//void Q_onAssert(char const Q_ROM * const Q_ROM_VAR file, int line) {
// QF_INT_DISABLE(); // disable all interrupts
// USER_LED_ON(); // User LED permanently ON
asm volatile ("jmp 0x0000"); // perform a software reset of the Arduino
}
// asm volatile ("jmp 0x0000"); // perform a software reset of the Arduino
//}


class CamStateHandlers : public PSStateHandlers
Expand Down
2 changes: 1 addition & 1 deletion examples/Canon_PS/PSRemote/psconsole.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include "ptpdpparser.h"

using namespace QP;
//using namespace QP;

enum TextMenuSignals
{
Expand Down
4 changes: 2 additions & 2 deletions examples/Canon_PS/PSRemote/ptpobjinfoparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "ptpobjinfoparser.h"

const char* PTPObjInfoParser::acNames[] PROGMEM =
const char* const PTPObjInfoParser::acNames[] PROGMEM =
{
msgUndefined,
msgAssociation,
Expand All @@ -18,7 +18,7 @@ const char* PTPObjInfoParser::acNames[] PROGMEM =
msgQT
};

const char* PTPObjInfoParser::imNames[] PROGMEM =
const char* const PTPObjInfoParser::imNames[] PROGMEM =
{
msgUndefined,
msgEXIF_JPEG,
Expand Down
4 changes: 2 additions & 2 deletions examples/Canon_PS/PSRemote/ptpobjinfoparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ const char msg3GP_Container [] PROGMEM = "3GP_Container";

class PTPObjInfoParser : public PTPReadParser
{
static const char* acNames[];
static const char* imNames[];
static const char* const acNames[];
static const char* const imNames[];

MultiValueBuffer theBuffer;
uint32_t varBuffer;
Expand Down
14 changes: 7 additions & 7 deletions examples/Nikon/NKRemote/NKRemote.pde
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ NKEventDump Dmp;
QEvent evtTick;
PSConsole psConsole;

void Q_onAssert(char const Q_ROM * const Q_ROM_VAR file, int line) {
(void)file; /* avoid compiler warning */
(void)line; /* avoid compiler warning */
QF_INT_DISABLE(); /* make sure that interrupts are disabled */
for (;;) {
}
}
//void Q_onAssert(char const Q_ROM * const Q_ROM_VAR file, int line) {
// (void)file; /* avoid compiler warning */
// (void)line; /* avoid compiler warning */
// noInterrupts(); //QF_INT_DISABLE(); /* make sure that interrupts are disabled */
// for (;;) {
// }
//}

void CamStateHandlers::OnDeviceDisconnectedState(PTP *ptp)
{
Expand Down
6 changes: 3 additions & 3 deletions examples/Nikon/NKRemote/ptpobjinfoparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "ptpobjinfoparser.h"

const char* PTPObjInfoParser::acNames[] PROGMEM =
const char* const PTPObjInfoParser::acNames[] PROGMEM =
{
msgUndefined,
msgAssociation,
Expand All @@ -18,7 +18,7 @@ const char* PTPObjInfoParser::acNames[] PROGMEM =
msgQT
};

const char* PTPObjInfoParser::imNames[] PROGMEM =
const char* const PTPObjInfoParser::imNames[] PROGMEM =
{
msgUndefined,
msgEXIF_JPEG,
Expand All @@ -36,7 +36,7 @@ const char* PTPObjInfoParser::imNames[] PROGMEM =
msgTIFF,
msgTIFF_IT,
msgJP2,
msgJPX,
msgJPX
};

void PTPObjInfoParser::PrintFormat(uint16_t op)
Expand Down
4 changes: 2 additions & 2 deletions examples/Nikon/NKRemote/ptpobjinfoparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ const char msg3GP_Container [] PROGMEM = "3GP_Container";

class PTPObjInfoParser : public PTPReadParser
{
static const char* acNames[];
static const char* imNames[];
static const char* const acNames[];
static const char* const imNames[];

MultiValueBuffer theBuffer;
uint32_t varBuffer;
Expand Down
18 changes: 9 additions & 9 deletions examples/ptpsketches/PTPDevInfo/devinfoparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "devinfoparser.h"

const char* DevInfoParser::ptpopNames[] PROGMEM =
const char* const DevInfoParser::ptpopNames[] PROGMEM =
{
msgUndefined,
msgGetDeviceInfo,
Expand Down Expand Up @@ -33,7 +33,7 @@ const char* DevInfoParser::ptpopNames[] PROGMEM =
msgInitiateOpenCapture
};

const char* DevInfoParser::mtpopNames[] PROGMEM =
const char* const DevInfoParser::mtpopNames[] PROGMEM =
{
msgUndefined,
msgGetObjectPropsSupported,
Expand All @@ -46,7 +46,7 @@ const char* DevInfoParser::mtpopNames[] PROGMEM =
msgSendObjectPropList
};

const char* DevInfoParser::ptpevNames[] PROGMEM =
const char* const DevInfoParser::ptpevNames[] PROGMEM =
{
msgUndefined,
msgCancelTransaction,
Expand All @@ -65,15 +65,15 @@ const char* DevInfoParser::ptpevNames[] PROGMEM =
msgUnreportedStatus
};

const char* DevInfoParser::mtpevNames[] PROGMEM =
const char* const DevInfoParser::mtpevNames[] PROGMEM =
{
msgUndefined,
msgObjectPropChanged,
msgObjectPropDescChanged,
msgObjectReferencesChanged
};

const char* DevInfoParser::ptpprNames[] PROGMEM =
const char* const DevInfoParser::ptpprNames[] PROGMEM =
{
msgUndefined,
msgBatteryLevel,
Expand Down Expand Up @@ -109,7 +109,7 @@ const char* DevInfoParser::ptpprNames[] PROGMEM =
msgCopyrightInfo
};

const char* DevInfoParser::mtpprNames[] PROGMEM =
const char* const DevInfoParser::mtpprNames[] PROGMEM =
{
msgUndefined,
msgSynchronization_Partner,
Expand All @@ -124,7 +124,7 @@ const char* DevInfoParser::mtpprNames[] PROGMEM =
msgPlayback_Container
};

const char* DevInfoParser::acNames[] PROGMEM =
const char* const DevInfoParser::acNames[] PROGMEM =
{
msgUndefined,
msgAssociation,
Expand All @@ -142,7 +142,7 @@ const char* DevInfoParser::acNames[] PROGMEM =
msgQT
};

const char* DevInfoParser::imNames[] PROGMEM =
const char* const DevInfoParser::imNames[] PROGMEM =
{
msgUndefined,
msgEXIF_JPEG,
Expand All @@ -160,7 +160,7 @@ const char* DevInfoParser::imNames[] PROGMEM =
msgTIFF,
msgTIFF_IT,
msgJP2,
msgJPX,
msgJPX
};

DevInfoParser::DevInfoParser() :
Expand Down
16 changes: 8 additions & 8 deletions examples/ptpsketches/PTPDevInfo/devinfoparser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,14 +234,14 @@ const char msg3GP_Container [] PROGMEM = "3GP_Container";

class DevInfoParser : public PTPReadParser
{
static const char* ptpopNames[];
static const char* mtpopNames[];
static const char* ptpevNames[];
static const char* mtpevNames[];
static const char* acNames[];
static const char* imNames[];
static const char* ptpprNames[];
static const char* mtpprNames[];
static const char* const ptpopNames[];
static const char* const mtpopNames[];
static const char* const ptpevNames[];
static const char* const mtpevNames[];
static const char* const acNames[];
static const char* const imNames[];
static const char* const ptpprNames[];
static const char* const mtpprNames[];

uint8_t nStage;

Expand Down
Loading