Read about our upcoming Code of Conduct on this issue

Commit ec253f80 authored by alex@thinkpad's avatar alex@thinkpad
Browse files

MPU spells: allow changing various Canon properties that require confirmation from the MPU:

ISO, shutter, aperture, EC, FEC, metering, drive, AF mode, picture style, WB, ExpSim, ALO, HTP, MLU
all but WB were broken if changed from ML menu/scripts; they are working now (fixme: not included in tests)
some of them were working from Canon UI before this patch (picture style, WB, ExpSim, metering and drive mode)
WB was working before, but uses confirmation in logs; updated for consistency

could not test on: 5D2, 40D, 50D, 550D, 650D, 700D, EOSM2
not working: EOSM (breaks previous tests => disabled)

--HG--
branch : qemu
parent 09403d4ea610
......@@ -194,6 +194,7 @@ static struct mpu_init_spell mpu_init_spells_100D[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -198,6 +198,7 @@ static struct mpu_init_spell mpu_init_spells_450D[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -163,6 +163,7 @@ static struct mpu_init_spell mpu_init_spells_500D[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -168,6 +168,7 @@ static struct mpu_init_spell mpu_init_spells_50D[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -160,6 +160,7 @@ static struct mpu_init_spell mpu_init_spells_550D[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -184,6 +184,7 @@ static struct mpu_init_spell mpu_init_spells_5D2[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -495,6 +495,7 @@ static struct mpu_init_spell mpu_init_spells_5D3[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -258,6 +258,7 @@ static struct mpu_init_spell mpu_init_spells_600D[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -171,6 +171,7 @@ static struct mpu_init_spell mpu_init_spells_60D[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -245,6 +245,7 @@ static struct mpu_init_spell mpu_init_spells_6D[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -770,6 +770,7 @@ static struct mpu_init_spell mpu_init_spells_700D[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -280,6 +280,7 @@ static struct mpu_init_spell mpu_init_spells_70D[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -7,3 +7,11 @@
static struct mpu_init_spell mpu_init_spells_EOSM[] = {
{ { 0x06, 0x04, 0x02, 0x00, 0x00 }, .description = "Init", .out_spells = { /* spell #1 */
{ 0x50, 0x4e, 0x02, 0x0e, 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x19, 0x64, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x48, 0x78, 0x48, 0x00, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01 },/* reply #1.1, PROP_SHOOTING_MODE_CHANGE? */
@@ -430,7 +433,6 @@
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
- #include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
......@@ -194,6 +194,7 @@ static struct mpu_init_spell mpu_init_spells_EOSM2[] = {
#include "NotifyGUIEvent.h"
#include "UILock.h"
#include "CardFormat.h"
#include "MpuProperties.h"
#include "GPS.h"
#include "Shutdown.h"
};
/* various settings that may require confirmation from the MPU */
{ { 0x06, 0x05, 0x01, 0x02, ARG0, 0x00 }, .description = "PROP_METERING_MODE", .out_spells = {
{ 0x06, 0x05, 0x01, 0x02, ARG0, 0x00 },
{ 0 } } },
{ { 0x06, 0x05, 0x01, 0x03, ARG0, 0x00 }, .description = "PROP_DRIVE_MODE", .out_spells = {
{ 0x06, 0x05, 0x01, 0x03, ARG0, 0x00 },
{ 0 } } },
{ { 0x08, 0x06, 0x01, 0x04, ARG0, ARG1, 0x00, 0x00 }, .description = "PROP_AF_MODE", .out_spells = {
{ 0x08, 0x06, 0x01, 0x04, ARG1, ARG1, 0x00, 0x00 }, /* not 100% sure */
{ 0 } } },
{ { 0x06, 0x05, 0x01, 0x05, ARG0, 0x00 }, .description = "PROP_SHUTTER", .out_spells = {
{ 0x06, 0x05, 0x01, 0x05, ARG0, 0x00 },
{ 0x0e, 0x0c, 0x0a, 0x08, 0x02, 0x00, 0x01, 0x01, 0xa0, 0x10, 0x00, ARG0, 0x00 }, /* OLC info - also with "range tv" */
{ 0 } } },
{ { 0x06, 0x05, 0x01, 0x06, ARG0, 0x00 }, .description = "PROP_APERTURE", .out_spells = {
{ 0x06, 0x05, 0x01, 0x06, ARG0, 0x00 },
{ 0x0c, 0x0b, 0x0a, 0x08, 0x04, 0x00, 0x01, 0x01, 0x50, 0x20, ARG0, 0x00 }, /* OLC info - also with "range av" */
{ 0 } } },
{ { 0x06, 0x05, 0x01, 0x07, ARG0, 0x00 }, .description = "PROP_ISO", .out_spells = {
{ 0x06, 0x05, 0x01, 0x07, ARG0, 0x01 },
{ 0x0c, 0x0a, 0x0a, 0x08, 0x08, 0x00, 0x01, 0x01, 0x00, ARG0, 0x00 }, /* OLC info to update ISO */
{ 0 } } },
{ { 0x06, 0x05, 0x01, 0x08, ARG0, 0x00 }, .description = "PROP_AE", .out_spells = {
{ 0x06, 0x05, 0x01, 0x08, ARG0, 0x00 },
{ 0x0e, 0x0d, 0x0a, 0x08, 0x40, 0x00, 0x01, 0x01, ARG0, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* OLC info */
/* fixme: these are for PROP_FEC: ================ */
{ 0 } } },
{ { 0x06, 0x05, 0x01, 0x09, ARG0, 0x00 }, .description = "PROP_FEC", .out_spells = {
{ 0x06, 0x05, 0x01, 0x09, ARG0, 0x00 },
{ 0x0e, 0x0d, 0x0a, 0x08, 0x40, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, ARG0, 0x00, 0x00 }, /* OLC info */
/* fixme: these are for PROP_AE: ================ */
/* fixme: these should be 0 if ARG0 is 0 ========== */
{ 0 } } },
{ { 0x08, 0x06, 0x00, 0x00, 0x01, 0x05, 0x00 }, .description = "Complete WaitID = 0x80000005 (PROP_SHUTTER)", .out_spells = {
{ 0 } } },
{ { 0x08, 0x06, 0x00, 0x00, 0x01, 0x06, 0x00 }, .description = "Complete WaitID = 0x80000006 (PROP_APERTURE)", .out_spells = {
{ 0 } } },
{ { 0x08, 0x06, 0x00, 0x00, 0x01, 0x07, 0x00 }, .description = "Complete WaitID = 0x80000007 (PROP_ISO)", .out_spells = {
{ 0 } } },
{ { 0x08, 0x06, 0x01, 0x1d, ARG0, ARG1, 0x00 }, .description = "PROP_PICTURE_STYLE", .out_spells = {
{ 0x08, 0x06, 0x01, 0x1d, ARG0, ARG1, 0x00 },
{ 0 } } },
{ { 0x06, 0x05, 0x01, 0x0d, ARG0, 0x00 }, .description = "PROP_WB_MODE_PH", .out_spells = {
{ 0x06, 0x05, 0x01, 0x0d, ARG0, 0x00 },
{ 0 } } },
{ { 0x08, 0x06, 0x01, 0x0e, ARG0, ARG1, 0x00 }, .description = "PROP_WB_KELVIN_PH", .out_spells = {
{ 0x08, 0x06, 0x01, 0x0e, ARG0, ARG1, 0x00 },
{ 0 } } },
{ { 0x06, 0x05, 0x01, 0x4b, ARG0, 0x00 }, .description = "PROP_LIVE_VIEW_MOVIE_SELECT", .out_spells = {
{ 0x06, 0x05, 0x01, 0x4b, ARG0, 0x00 },
{ 0 } } },
{ { 0x08, 0x07, 0x01, 0x52, ARG0, ARG1, ARG2, 0x00 }, .description = "PROP_ALO", .out_spells = {
{ 0x08, 0x07, 0x01, 0x52, ARG0, ARG1, ARG2, 0x00 },
{ 0 } } },
{ { 0x06, 0x05, 0x01, 0x72, ARG0, 0x00 }, .description = "PROP_MLU", .out_spells = {
{ 0x06, 0x05, 0x01, 0x72, ARG0, 0x00 },
{ 0 } } },
{ { 0x06, 0x05, 0x01, 0x75, ARG0, 0x00 }, .description = "PROP_HTP", .out_spells = {
{ 0x06, 0x05, 0x01, 0x75, ARG0, 0x00 },
{ 0 } } },
......@@ -598,6 +598,7 @@ print("")
print(' #include "NotifyGUIEvent.h"')
print(' #include "UILock.h"')
print(' #include "CardFormat.h"')
print(' #include "MpuProperties.h"')
print(' #include "GPS.h"')
print(' #include "Shutdown.h"')
print("};")
......@@ -16,10 +16,13 @@ a5a0356299adec355ca5ed975e02e9ce menu12.png
7b08d082c3e223ffed595475fd1a875e menu15.png
10940cd040f229484e4ef43c4060f9c5 menu16.png
29111dbcc05311cea60499434d29d85f menu17.png
f63885088d6a1645dbc731b9cf309820 menu18.png
edfd6fc28becc9cb6b22261038d77d38 menu19.png
f63885088d6a1645dbc731b9cf309820 menu20.png
29111dbcc05311cea60499434d29d85f menu21.png
8f1cd5cbc682e2700ec2d3bce6c4c769 menu22.png
10940cd040f229484e4ef43c4060f9c5 menu23.png
3fad686993f5a16e484177ddc6aa54ad menu24.png
769afa2eeabbc04bcae7651568e47fd6 menu18.png
b570705c1bd48b5e7aef6763e8f33111 menu19.png
063c2bb6398ecb6ce17e73e7974efc08 menu20.png
f63885088d6a1645dbc731b9cf309820 menu21.png
edfd6fc28becc9cb6b22261038d77d38 menu22.png
f63885088d6a1645dbc731b9cf309820 menu23.png
29111dbcc05311cea60499434d29d85f menu24.png
8f1cd5cbc682e2700ec2d3bce6c4c769 menu25.png
10940cd040f229484e4ef43c4060f9c5 menu26.png
3fad686993f5a16e484177ddc6aa54ad menu27.png
......@@ -24,6 +24,21 @@ bb6b246ab6bcda39a75d9870a99ff5e2 menu20.png
67eabda0683b9399612f3ed3bb81f955 menu23.png
2060ccfdece8e7e0dc3b206e76026164 menu24.png
70bdacdaf7145f51b523a04945093427 menu25.png
d42f2153e0a75682f57232e32bfc8308 menu26.png
cbffbf4a26e6806ad82629926533747d menu27.png
90a87f8b77763af7e8a305f7c8ffbb7a menu28.png
11265b84b9e61409bfcfb8190b40933e menu26.png
5e10f7c1d22132b5ee0cc461a522c3bb menu27.png
bcd9d4025e5f00077928a2a747063b31 menu28.png
5f0f274ea4906be8ef84f42e9f6ae287 menu29.png
5258b30c08b09708682550c881822b89 menu30.png
af5c7bd9ec1fd359d0430ddd67a7acc1 menu31.png
9ff013557ed736fe81a8da89f4feb3d4 menu32.png
f8904d122d97824ab0f5d71d6c9f8663 menu33.png
71e278f244a85540d305f406dd57e494 menu34.png
9e42fe821cbd4c9479eb6c50f07052a7 menu35.png
347afbe4615590bffce89e8b73a14c0e menu36.png
46788fabc4ed5c2a94b4b714ead53e6f menu37.png
8b0312bbabf2d31906f82add3e9cc052 menu38.png
45ca0e6b883a231861dff013850decf0 menu39.png
2dfdb56cd414a6ceb1321cc0b8db3ee7 menu40.png
e2cf97b9ee7372c07228ceadb3ee0011 menu41.png
5b26601d3b59c484358d67298f80cb4b menu42.png
6700b97ea35bdb05723eae95187f0c2d menu43.png
......@@ -10,13 +10,15 @@
05da3e76e204f607db85e4130dbdbcfa menu9.png
c767552dcdb6f676cf814a3ff7ca0da1 menu10.png
e12635f2977788bfe9a409925765b99a menu11.png
fa903596b22edfe5e0aa2ca00e0f252f menu12.png
2a4e302a0f0b10d6b8774e1feaab00de menu13.png
fbe0860c1fd679273efcad3c50ee3d8b menu14.png
251c4e1d1ceda3c1bc84ecaf3a7c66de menu15.png
268873894a5c254364255784f2514597 menu16.png
e281bb99f2445fa5a835f00e03aff83b menu17.png
6e5f1f1dff5eaa45a4b3d31573a41284 menu18.png
183cb5ddeac1a4e507818f0d3d9740b7 menu18.png
00604f5d14a7371a3b6c31bf5f2f1e44 menu19.png
6cd8b4f8858d0d568e432270171d7aaf menu20.png
6cd8b4f8858d0d568e432270171d7aaf menu21.png
449971e6fe4267b85dd558b68df29257 menu22.png
4a7711f75fd6797e7f46164ce22b871c menu22.png
5a43cf441dd4029ba3093100114b6dbf menu23.png
......@@ -11,13 +11,15 @@
66c70e881d9b9464078b058b98a7eb4f menu10.png
d1ffc9f26aeb9675dbdc71da55c6c2ba menu11.png
130a9c4600941bd14a462cbbcb0ebbb8 menu12.png
1dba825b157c690d3b0a5b16970f373f menu13.png
cb9c7ac0626577ad387e44f6af0d615e menu14.png
7133c7826b445bd10699428625919418 menu15.png
836932a58f1c845de68b5fad5e706f0a menu16.png
883279f380e1f29f0825972973073748 menu17.png
b7b2c93b39de62061b6404ad8f7c4ce4 menu18.png
a7425d9d1d6e4eaf202f1493e90d9cf3 menu19.png
19b13c3dba408920b99a784c297fd647 menu19.png
77fa12d7003d4962ab141c72ebabe66d menu20.png
15530c0ad038efeab67c07970950f40e menu21.png
15530c0ad038efeab67c07970950f40e menu22.png
2e1bd26633dbc7a22de7848369738d21 menu23.png
f41320a105e173e85a04fd09016675be menu23.png
a26a6d8b6aff025e28171223166d7fb8 menu24.png
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment