Read about our upcoming Code of Conduct on this issue

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

Merged in daniel_fort/magic-lantern/update-to-700D.115 (pull request #813)

Update to 700D.115

--HG--
branch : unified
SUPPORTED_INSTALLERS := 1100D.105 500D.111 50D.109 550D.109 5D2.212 5D3.113 60D.111 600D.102 650D.104 6D.116 700D.114 EOSM.202 7D.203
SUPPORTED_INSTALLERS := 1100D.105 500D.111 50D.109 550D.109 5D2.212 5D3.113 60D.111 600D.102 650D.104 6D.116 700D.115 EOSM.202 7D.203
# this need some more work: 5DC.111
TOP_DIR=..
......
MODEL=700D
include ../Makefile.minimal
......@@ -1060,7 +1060,7 @@ static unsigned int adtg_gui_init()
ADTG_WRITE_FUNC = 0x178FC; //"[REG] @@@@@@@@@@@@ Start ADTG[CS:%lx]"
CMOS_WRITE_FUNC = 0x17A1C; //"[REG] ############ Start CMOS"
}
else if (is_camera("700D", "1.1.4"))
else if (is_camera("700D", "1.1.5"))
{
ADTG_WRITE_FUNC = 0x178FC; //"[REG] @@@@@@@@@@@@ Start ADTG[CS:%lx]"
CMOS_WRITE_FUNC = 0x17A1C; //"[REG] ############ Start CMOS"
......
......@@ -836,7 +836,7 @@ static unsigned int isoless_init()
CMOS_FLAG_BITS = 2;
CMOS_EXPECTED_FLAG = 0;
}
else if (is_camera("700D", "1.1.4"))
else if (is_camera("700D", "1.1.5"))
{
is_700d = 1;
......
......@@ -2499,7 +2499,7 @@ static unsigned int raw_rec_init()
cam_600d = is_camera("600D", "1.0.2");
cam_650d = is_camera("650D", "1.0.4");
cam_7d = is_camera("7D", "2.0.3");
cam_700d = is_camera("700D", "1.1.4");
cam_700d = is_camera("700D", "1.1.5");
cam_60d = is_camera("60D", "1.1.1");
cam_500d = is_camera("500D", "1.1.1");
......
......@@ -4208,7 +4208,7 @@ static unsigned int raw_rec_init()
cam_600d = is_camera("600D", "1.0.2");
cam_650d = is_camera("650D", "1.0.4");
cam_7d = is_camera("7D", "2.0.3");
cam_700d = is_camera("700D", "1.1.4");
cam_700d = is_camera("700D", "1.1.5");
cam_60d = is_camera("60D", "1.1.1");
cam_500d = is_camera("500D", "1.1.1");
......
......@@ -83,7 +83,7 @@ static unsigned int sf_dump_init()
SF_flash_size = 0x1000000;
}
if (is_camera("700D", "1.1.4"))
if (is_camera("700D", "1.1.5"))
{
SF_CreateSerial = (void*) 0xFF139578;
SF_readSerialFlash = (void*) 0xFF139520;
......
#Makefile.setup.platform for 700D
ifeq ($(FW_VERSION),114)
CANON_NAME_FIR=CCF14114.FIR
ifeq ($(FW_VERSION),115)
CANON_NAME_FIR=CCF14115.FIR
# DryOSmemory map
# RESTARTSTART is selected to be just above the end of the bss
#
ROMBASEADDR = 0xFF0C0000
RESTARTSTART = 0x0007EC00
ROMBASEADDR = 0xFF0C0000
RESTARTSTART = 0x0007EC00
AUTOEXEC_BASE = 0x40800000
FIR_BASE = 0x40800120
......
/*
* 700D 1.1.4 consts
* 700D 1.1.5 consts
*/
#define CANON_SHUTTER_RATING 100000
......@@ -53,7 +53,7 @@
// for gui_main_task
#define GMT_NFUNCS 7
#define GMT_FUNCTABLE 0xFF7FA7F8 //dec gui_main_task
#define GMT_FUNCTABLE 0xFF7FA7fC //dec gui_main_task
#define CURRENT_GUI_MODE (*(int*)0x2658C) // in SetGUIRequestMode
#define ISO_ADJUSTMENT_ACTIVE ((*(int*)(0x31254)) == 0xF) // dec ptpNotifyOlcInfoChanged and look for: if arg1 == 1: MEM(0x79B8) = *(arg2)
......@@ -171,9 +171,9 @@
#define BULB_MIN_EXPOSURE 1000
// http://magiclantern.wikia.com/wiki/Fonts
#define BFNT_CHAR_CODES 0xFFCF67E4
#define BFNT_BITMAP_OFFSET 0xFFCF972C
#define BFNT_BITMAP_DATA 0xFFCFC674
#define BFNT_CHAR_CODES 0xFFCF8174
#define BFNT_BITMAP_OFFSET 0xFFCFB0BC
#define BFNT_BITMAP_DATA 0xFFCFE004
// from CFn
......
/**
* Camera internals for 700D 1.1.4
* Camera internals for 700D 1.1.5
*/
/** Properties are persistent (saved in NVRAM) => a mistake can cause permanent damage. Undefine this for new ports. */
......
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