ObjectCreated added

felis · Sep 23, 2012 · 707cca7 · 707cca7
1 parent 76c1d3e
commit 707cca7
Show file tree

Hide file tree

Showing 29 changed files with 44 additions and 558 deletions.
diff --git a/canoneos.cpp b/canoneos.cpp
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #include "canoneos.h"
 
 

diff --git a/canoneos.h b/canoneos.h
@@ -1,24 +1,8 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #ifndef __CANONEOS_H__
 #define __CANONEOS_H__
 
 #if defined(ARDUINO) && ARDUINO >=100
-#include "Arduino.h"
+#include <Arduino.h>
 #else
 #include <WProgram.h>
 #endif
@@ -61,7 +45,6 @@ e-mail   :  support@circuitsathome.com
 #define EOS_DPC_UnixTime					0xD113
 #define EOS_DPC_ImageQuality				0xD120
 #define EOS_DPC_LiveView					0xD1B0
-#define EOS_DPC_EVFRecordStatus     		0xD1B8
 #define EOS_DPC_AvailableShots  			0xD11B
 #define EOS_DPC_CaptureDestination    		0xD11C
 #define EOS_DPC_BracketMode           		0xD11D

diff --git a/canonps.cpp b/canonps.cpp
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #include "canonps.h"
 
 void PSStateHandlers::OnSessionOpenedState(PTP *ptp)

diff --git a/canonps.h b/canonps.h
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #ifndef __CANONPS_H__
 #define __CANONPS_H__
 

diff --git a/eoseventdump.cpp b/eoseventdump.cpp
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #include "eoseventdump.h"
 
 void EOSEventDump::Parse(const uint16_t len, const uint8_t *pbuf, const uint32_t &offset)

diff --git a/eoseventdump.h b/eoseventdump.h
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #if !defined(__EOSEVENTDUMP_H__)
 #define __EOSEVENTDUMP_H__
 
@@ -23,7 +7,7 @@ e-mail   :  support@circuitsathome.com
 #include "parsetools.h"
 
 #if defined(ARDUINO) && ARDUINO >=100
-#include "Arduino.h"
+#include <Arduino.h>
 #else
 #include <WProgram.h>
 #endif

diff --git a/eoseventparser.cpp b/eoseventparser.cpp
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #include "eoseventparser.h"
 
 bool EOSEventParser::EventRecordParse(uint8_t **pp, uint16_t *pcntdn)
@@ -47,18 +31,19 @@ bool EOSEventParser::EventRecordParse(uint8_t **pp, uint16_t *pcntdn)
 				break;
 			// Property Code
 			case 2:
-//				if (eosEvent.eventCode == EOS_EC_ObjectCreated)
-//				{
-//				}
-				eosEvent.propCode = (uint16_t)varBuffer;
+				eosEvent.propCode = (uint32_t)varBuffer;
 				break;
 			// C189 - Property Value, C18A - Enumerator Type
 			case 3:
 				eosEvent.propValue = varBuffer;
 
-				if (eosEvent.eventCode == EOS_EC_DevPropChanged)
-					if (pHandler)
-						pHandler->OnPropertyChanged(&eosEvent);
+				if (pHandler)
+				{
+					if (eosEvent.eventCode == EOS_EC_DevPropChanged)
+							pHandler->OnPropertyChanged(&eosEvent);
+					if (eosEvent.eventCode == EOS_EC_ObjectCreated)
+							pHandler->OnObjectCreated(&eosEvent);
+				}
 				break;
 			// C18A/enumType == 3 - Size of enumerator array
 			case 4:

diff --git a/eoseventparser.h b/eoseventparser.h
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #ifndef __EOSEVENTPARSER_H__
 #define __EOSEVENTPARSER_H__
 
@@ -24,7 +8,7 @@ e-mail   :  support@circuitsathome.com
 struct EOSEvent
 {
 	uint16_t	eventCode;
-	uint16_t	propCode;
+	uint32_t	propCode;
 	uint32_t	propValue;
 };
 
@@ -34,7 +18,7 @@ class EOSEventHandlers
 	virtual void OnPropertyChanged(const EOSEvent *evt) = 0;
 	virtual void OnAcceptedListSize(const EOSEvent *evt, const uint16_t size) = 0;
 	virtual void OnPropertyValuesAccepted(const EOSEvent *evt, const uint16_t index, const uint32_t &val) = 0;
-	//void OnObjectCreated() = 0;
+	virtual void OnObjectCreated(const EOSEvent *evt) = 0;
 	//void OnCaptureComplete() = 0;
 };
 

diff --git a/eosvaluetitles.h b/eosvaluetitles.h
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #if !defined(__EOSVALUETITLES_H__)
 #define __EOSVALUETITLES_H__
 

diff --git a/mtpconst.h b/mtpconst.h
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #ifndef __MTPCONST_H__
 #define __MTPCONST_H__
 

diff --git a/nikon.cpp b/nikon.cpp
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #include "nikon.h"
 
 NikonDSLR::NikonDSLR(USB *pusb, PTPStateHandlers *s)

diff --git a/nikon.h b/nikon.h
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #if !defined(__NIKON_H__)
 #define __NIKON_H__
 

diff --git a/nkeventparser.cpp b/nkeventparser.cpp
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #include "nkeventparser.h"
 
 void NKEventParser::Parse(const uint16_t len, const uint8_t *pbuf, const uint32_t &offset)

diff --git a/nkeventparser.h b/nkeventparser.h
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #ifndef __NKEVENTPARSER_H__
 #define __NKEVENTPARSER_H__
 

diff --git a/nkvaluetitles.h b/nkvaluetitles.h
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #if !defined(__NKVALUETITLES_H__)
 #define __NKVALUETITLES_H__
 

diff --git a/psvaluetitles.h b/psvaluetitles.h
@@ -1,19 +1,3 @@
-/* Copyright (C) 2011 Circuits At Home, LTD. All rights reserved.
-
-This software may be distributed and modified under the terms of the GNU
-General Public License version 2 (GPL2) as published by the Free Software
-Foundation and appearing in the file GPL2.TXT included in the packaging of
-this file. Please note that GPL2 Section 2[b] requires that all works based
-on this software must also be made publicly available under the terms of
-the GPL2 ("Copyleft").
-
-Contact information
--------------------
-
-Circuits At Home, LTD
-Web      :  http://www.circuitsathome.com
-e-mail   :  support@circuitsathome.com
-*/
 #if !defined(__PSVALUETITLES_H__)
 #define __PSVALUETITLES_H__