As I see this algorithm has implemented by match_exposures function. It's right?
Etiquette, expectations, entitlement...
@autoexec_bin | #magiclantern | Discord | Reddit | Server issues
This section allows you to view all posts made by this member. Note that you can only see posts made in areas you currently have access to.
Show posts Menu#if defined(CONFIG_5D2) || defined(CONFIG_50D)
{
// 'm'
.width = 40,
.height = 34,
.yoff = 3,
.display_width = 40,
.bitmap = {
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0xc0, 0x00, // ##
0x0f, 0xe6, 0x30, 0xe0, 0x00, // ####### ## ## ###
0x0c, 0x06, 0x30, 0xf0, 0x00, // ## ## ## ####
0x0c, 0x06, 0x30, 0xf8, 0x00, // ## ## ## #####
0x0f, 0x86, 0x30, 0xfc, 0x00, // ##### ## ## ######
0x0c, 0x06, 0x30, 0xfe, 0x00, // ## ## ## #######
0x0c, 0x06, 0x30, 0xff, 0x00, // ## ## ## ########
0x0c, 0x03, 0xe0, 0xff, 0x80, // ## ##### #########
0x00, 0x00, 0x00, 0xff, 0xc0, // ##########
0x0c, 0x61, 0xe0, 0xff, 0x80, // ## ## #### #########
0x0c, 0x63, 0x30, 0xff, 0x00, // ## ## ## ## ########
0x0e, 0x66, 0x00, 0xfe, 0x00, // ### ## ## #######
0x0d, 0x66, 0x00, 0xfc, 0x00, // ## # ## ## ######
0x0c, 0xe6, 0x00, 0xf8, 0x00, // ## ### ## #####
0x0c, 0x63, 0x30, 0xf0, 0x00, // ## ## ## ## ####
0x0c, 0x61, 0xe0, 0xe0, 0x00, // ## ## #### ###
0x00, 0x00, 0x00, 0xc0, 0x00, // ##
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
},
},
{
// 'n'
.width = 40,
.height = 34,
.yoff = 3,
.display_width = 40,
.bitmap = {
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x01, 0x80, 0x00, 0x00, // ##
0x00, 0x03, 0x87, 0xf3, 0x18, // ### ####### ## ##
0x00, 0x07, 0x86, 0x03, 0x18, // #### ## ## ##
0x00, 0x0f, 0x86, 0x03, 0x18, // ##### ## ## ##
0x00, 0x1f, 0x87, 0xc3, 0x18, // ###### ##### ## ##
0x00, 0x3f, 0x86, 0x03, 0x18, // ####### ## ## ##
0x00, 0x7f, 0x86, 0x03, 0x18, // ######## ## ## ##
0x00, 0xff, 0x86, 0x01, 0xf0, // ######### ## #####
0x01, 0xff, 0x80, 0x00, 0x00, // ##########
0x00, 0xff, 0x86, 0x30, 0xf0, // ######### ## ## ####
0x00, 0x7f, 0x86, 0x31, 0x98, // ######## ## ## ## ##
0x00, 0x3f, 0x87, 0x33, 0x00, // ####### ### ## ##
0x00, 0x1f, 0x86, 0xb3, 0x00, // ###### ## # ## ##
0x00, 0x0f, 0x86, 0x73, 0x00, // ##### ## ### ##
0x00, 0x07, 0x86, 0x31, 0x98, // #### ## ## ## ##
0x00, 0x03, 0x86, 0x30, 0xf0, // ### ## ## ####
0x00, 0x01, 0x80, 0x00, 0x00, // ##
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x00, 0x00, 0x00, //
},
},
#else //defined(CONFIG_5D2) || defined(CONFIG_50D)
--- a/src/shoot.c Thu Jan 14 00:52:20 2016 +0200
+++ b/src/shoot.c Thu Jan 28 12:49:16 2016 +0300
@@ -4794,7 +4794,12 @@
#ifdef CONFIG_BULB
// then choose the best option (bulb for long exposures, regular for short exposures)
- if (msc >= 20000 || is_bulb_mode())
+ //if (msc >= 20000 || is_bulb_mode())
+ if (msc >= 20000
+ #ifdef CONFIG_SEPARATE_BULB_MODE
+ || shooting_mode == SHOOTMODE_BULB
+ #endif
+ )
{
bulb_take_pic(msc);
}
--- a/Makefile.top Thu Jan 14 00:52:20 2016 +0200
+++ b/Makefile.top Thu Jan 28 12:49:16 2016 +0300
@@ -1,4 +1,4 @@
-MAKE=make
+MAKE?=make
RM=rm
MV=mv
MKDIR=mkdir
--- a/modules/Makefile Thu Jan 14 00:52:20 2016 +0200
+++ b/modules/Makefile Thu Jan 28 12:49:16 2016 +0300
@@ -13,7 +13,7 @@
MODULES_ALL_TARGETS_DELETE_IF_FAILED = $(call targets_rules, $(MODULES_ALL_TARGETS), delete_if_failed)
all:
- @make --silent all_silent
+ @$(MAKE) --silent all_silent
all_silent: $(MODULES_ALL_TARGETS_DELETE_IF_FAILED)
--- a/modules/Makefile.modules Thu Jan 14 00:52:20 2016 +0200
+++ b/modules/Makefile.modules Thu Jan 28 12:49:16 2016 +0300
@@ -21,13 +21,13 @@
delete_if_failed:
@echo ""
@echo "Building module $(MODULE_NAME)..."
- @make all --no-print-directory || { \
+ @$(MAKE) all --no-print-directory || { \
echo ""; \
echo "********************************************************"; \
echo "WARNING: module $(MODULE_NAME) failed to build, deleting"; \
echo "********************************************************"; \
echo ""; \
- make clean; \
+ $(MAKE) clean; \
}
-include $(MODULE_DEPS)
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -5055,7 +5055,7 @@
#ifdef CONFIG_BULB
// then choose the best option (bulb for long exposures, regular for sh
- if (msc >= 20000 || is_bulb_mode())
+ if (msc >= 20000 || shooting_mode == SHOOTMODE_BULB)
{
bulb_take_pic(msc);
}
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -5055,7 +5055,11 @@
#ifdef CONFIG_BULB
// then choose the best option (bulb for long exposures, regular for sh
- if (msc >= 20000 || is_bulb_mode())
+#ifdef CONFIG_SEPARATE_BULB_MODE
+ if (msc >= 20000 || shooting_mode == SHOOTMODE_BULB)
+#else
+ if (msc >= 20000)
+#endif
{
bulb_take_pic(msc);
}
$ hg log -v -r 3225af1b94b5
changeset: 9368:3225af1b94b5
branch: unified
user: a1ex <[email protected]>
date: Fri Jan 17 14:01:30 2014 +0000
files: src/shoot.c
description:
minor fix for bulb bracketing at short exposure times
$ hg diff -r 466490e467b9 -r 3225af1b94b5 src/shoot.c
diff -r 466490e467b9 -r 3225af1b94b5 src/shoot.c
--- a/src/shoot.c Fri Jan 17 15:32:04 2014 +0200
+++ b/src/shoot.c Fri Jan 17 14:01:30 2014 +0000
@@ -5055,7 +5055,7 @@
#ifdef CONFIG_BULB
// then choose the best option (bulb for long exposures, regular for sh
- if (msc >= 20000)
+ if (msc >= 20000 || is_bulb_mode())
{
bulb_take_pic(msc);
}
#ifdef CONFIG_BULB
// then choose the best option (bulb for long exposures, regular for short exposures)
if (msc >= 20000 || is_bulb_mode())
{
bulb_take_pic(msc);
}
else
#endif
{
#if defined(CONFIG_5D2) || defined(CONFIG_50D)
if (get_expsim() == 2) { set_expsim(1); msleep(300); } // can't set shutter slower than 1/30 in movie mode
#endif
ans = MIN(ans, hdr_set_rawshutter(rc));
take_a_pic(AF_DONT_CHANGE);
}
Page created in 0.104 seconds with 13 queries.