#687 Open
Repository
Branch
patchmgr
Repository
Branch
unified

Bitbucket cannot automatically merge this request.

The commits that make up this pull request have been removed.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update 7a3b5fa3f4c6
# Note: This will create a new head!
hg merge 503843206c97
hg commit -m 'Merged in patchmgr (pull request #687)'
Author
  1. Alex
Reviewers
Description

See https://bitbucket.org/hudson/magic-lantern/pull-requests/476/experimental-library-for-managing-memory/diff

It appears as "merged", but it wasn't (bitbucket screw-up).

It was a little broken lately, as I've added some additional functionality, but should be up and running again. I'll update the description after running some basic tests and bringing it up to date with latest code.

Example: https://bitbucket.org/hudson/magic-lantern/src/card_fmt/modules/card_fmt/

Another example: https://bitbucket.org/hudson/magic-lantern/src/crop_rec/modules/crop_rec/crop_rec.c

Comments (5)

    1. Georg Hofstetter

      as always, hard to find anything that could be made better :D

      were there some weird problems with some camera models we had problems before? i just can remember the 5Dc which magically flushed caches and stuff.

  1. Daniel Fort

    Won't build on 7D

    gdb.o: In function `gdb_unarm_bkpt':
    gdb.c:(.text+0x2ec): undefined reference to `unpatch_memory'
    gdb.o: In function `gdb_arm_bkpt':
    gdb.c:(.text+0x380): undefined reference to `patch_instruction'
    make[1]: *** [magiclantern] Error 1
    make: *** [all] Error 2
    

    Did an ugly hack to get it to compile for some lossless compression experiments on the crop_rec_4k branch but thought I'd report it on this PR because it seems to have originated here.

    1. Daniel Fort

      This is what is causing the 7D build error:

      platform/7D.203/Makefile

      all::
          $(MAKE) -C $(PLATFORM_PATH)/7D_MASTER.203
      

      Commenting it out will result in a successful build and it seems to work fine. Is this really needed? Doesn't ML only run on the slave processor?

      1. Alex author

        It currently runs just on slave, but we'd like to figure out how to run it on Master too, at some point, as certain features depend on this. So, a tiny step (done after writing the patch manager) was to make sure the master code still builds.