From cb1396e742dbada13a164ebe51b10cea52db75e4 Mon Sep 17 00:00:00 2001
From: jmheder <64579262+jmheder@users.noreply.github.com>
Date: Sun, 26 Nov 2023 11:24:36 +0100
Subject: [PATCH 1/3] Fixes to intervalometer and SRM memory

DISPLAY_IS_ON fixed
SRM_BUFFER_SIZE fixed
Constants  and features  for intervalomater added
Intervalometer was tested with PROP_REQUEST_CHANGE + is_prop_alloweD(...) {return true;}
---
 platform/7D2.112/consts.h    | 7 ++++++-
 platform/7D2.112/features.h  | 6 +++++-
 platform/7D2.112/internals.h | 8 ++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/platform/7D2.112/consts.h b/platform/7D2.112/consts.h
index f825913a3..8dd34639e 100644
--- a/platform/7D2.112/consts.h
+++ b/platform/7D2.112/consts.h
@@ -25,6 +25,7 @@
 /* "Malloc Information" */
 #define MALLOC_STRUCT 0x41b50                    // from get_malloc_info, helper of malloc_info
 #define MALLOC_FREE_MEMORY (MEM(MALLOC_STRUCT + 8) - MEM(MALLOC_STRUCT + 0x1C)) // "Total Size" - "Allocated Size"
+#define SRM_BUFFER_SIZE  0x2314000   /* print it from srm_malloc_cbr */
 
 /* high confidence */
 #define DRYOS_ASSERT_HANDLER 0x28d50               // from debug_assert function, hard to miss
@@ -58,7 +59,7 @@
 
 #define CANON_SHUTTER_RATING 200000
 
-    #define DISPLAY_IS_ON               0x1  // TODO: find real value
+#define DISPLAY_IS_ON ((MEM(0x027e98) & 0x100) ? 0 : 1)  // found at 0xfe0b6824 : MEM(0x027e98) == 0x10001(on) 0x10101(off)
 
 #define GMT_FUNCTABLE 0xfe658084           // from gui_main_task
 #define GMT_NFUNCS 0x7                  // size of table above
@@ -166,3 +167,7 @@
 //address of XimrContext structure to redraw in FEATURE_VRAM_RGBA
 //0x5d138 + 0x10 is pointer to XimrContext struct
 #define XIMR_CONTEXT ((void*)0x5d148)
+
+// Safe settings 
+#define BULB_EXPOSURE_CORRECTION 0
+#define BULB_MIN_EXPOSURE 500
diff --git a/platform/7D2.112/features.h b/platform/7D2.112/features.h
index 3c7f25bb4..a5caaf6d8 100644
--- a/platform/7D2.112/features.h
+++ b/platform/7D2.112/features.h
@@ -7,7 +7,7 @@
 // and allowing triggering from a menu context.
 #define FEATURE_DONT_CLICK_ME
 
-//#define FEATURE_SHOW_SHUTTER_COUNT
+#define FEATURE_SHOW_SHUTTER_COUNT
 
 // working but incomplete, some allocators don't report
 // anything yet as they're faked / not yet found
@@ -32,3 +32,7 @@
 // explicitly disable stuff that don't work or may break things
 #undef CONFIG_AUTOBACKUP_ROM
 #undef CONFIG_ADDITIONAL_VERSION
+
+// full intervalometer requires CONFIG_PROP_REQUEST_CHANGE + "bool is_prop_allowed(...){ return true;}"
+#define FEATURE_INTERVALOMETER
+#define FEATURE_BULB_TIMER
diff --git a/platform/7D2.112/internals.h b/platform/7D2.112/internals.h
index 373869e04..93d4c9073 100644
--- a/platform/7D2.112/internals.h
+++ b/platform/7D2.112/internals.h
@@ -18,10 +18,6 @@
 // enable state objects hooks
 #define CONFIG_STATE_OBJECT_HOOKS
 
-// SRM is untested, this define is to allowing building
-// without SRM_BUFFER_SIZE being found
-#define CONFIG_MEMORY_SRM_NOT_WORKING
-
 // Cam has very few spare tasks for ML, steal more mem
 // during boot to raise the limit
 #define CONFIG_INCREASE_MAX_TASKS 4
@@ -32,3 +28,7 @@
 #define CONFIG_NEW_TASK_STRUCTS
 #define CONFIG_TASK_STRUCT_V2
 #define CONFIG_TASK_ATTR_STRUCT_V3
+
+// This camera has BULB mode
+#define CONFIG_BULB
+#define CONFIG_SEPAEATE_BULB_MODE // has "B" mode

From aaca69a35e4ead9a77ae97ee63d1ce715f44b090 Mon Sep 17 00:00:00 2001
From: jmheder <64579262+jmheder@users.noreply.github.com>
Date: Mon, 27 Nov 2023 09:26:49 +0100
Subject: [PATCH 2/3] Fixed typo

---
 platform/7D2.112/internals.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/7D2.112/internals.h b/platform/7D2.112/internals.h
index 93d4c9073..a9e37cf18 100644
--- a/platform/7D2.112/internals.h
+++ b/platform/7D2.112/internals.h
@@ -31,4 +31,4 @@
 
 // This camera has BULB mode
 #define CONFIG_BULB
-#define CONFIG_SEPAEATE_BULB_MODE // has "B" mode
+#define CONFIG_SEPARATE_BULB_MODE // has "B" mode

From a37b91dabb2c7deab653ebd397510b707a1c23fc Mon Sep 17 00:00:00 2001
From: jmheder <64579262+jmheder@users.noreply.github.com>
Date: Wed, 13 Dec 2023 09:34:24 +0100
Subject: [PATCH 3/3] Add files via upload

Updated DISPLAY_IS_ON
---
 platform/7D2.112/consts.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/7D2.112/consts.h b/platform/7D2.112/consts.h
index 8dd34639e..c485cfeff 100644
--- a/platform/7D2.112/consts.h
+++ b/platform/7D2.112/consts.h
@@ -59,7 +59,7 @@
 
 #define CANON_SHUTTER_RATING 200000
 
-#define DISPLAY_IS_ON ((MEM(0x027e98) & 0x100) ? 0 : 1)  // found at 0xfe0b6824 : MEM(0x027e98) == 0x10001(on) 0x10101(off)
+#define DISPLAY_IS_ON (!(char)(MEM(0x27e99)))  // found at 0xfe0b6824 : MEM(0x027e98) == 0x10001(on) 0x10101(off)
 
 #define GMT_FUNCTABLE 0xfe658084           // from gui_main_task
 #define GMT_NFUNCS 0x7                  // size of table above