Adding new cameras, applying patches into trunk (with source code prepared) - page 152 - General Discussion and Assistance - CHDK Forum  

Adding new cameras, applying patches into trunk (with source code prepared)

  • 1611 Replies
  • 419875 Views
Advertisements
Patch to fix the partition type being incorrectly reported by get_partitionInfo() as discussed.
Author of CHIMP, Canon Hack Installation and Management Platform

*

Offline reyalp

  • ******
  • 11900
Patch to localize the remaining module names (not included in the previous patch due to false perception of the existence of "system modules").
Something is wrong with this patch file, saved in some unicode format maybe?

edit:
Quote
This replaces the previously posted one, since the "Compute hash" submenu is no longer relevant.
This one too.

As far as the partition info patch goes, I don't understand what the underlying problem was, or why the proposed patch is a valid solution.
« Last Edit: 25 / June / 2017, 21:21:10 by reyalp »
Don't forget what the H stands for.

Something is wrong with this patch file, saved in some unicode format maybe?

Strange. I just did git diff.

I pushed both branches:

https://github.com/dmitry-shechtman/CHDK/tree/module_loc
https://github.com/dmitry-shechtman/CHDK/tree/fselect_loc

The latter derives from the former, so you may do a direct diff from master.
Author of CHIMP, Canon Hack Installation and Management Platform

As far as the partition info patch goes, I don't understand what the underlying problem was, or why the proposed patch is a valid solution.

The partition type is read directly from the MBR, where the active partition is always the first one.

The patch has been tested, see my last CHIMP post.
Author of CHIMP, Canon Hack Installation and Management Platform


Patch to fix the partition type being incorrectly reported by get_partitionInfo() as discussed.

I fixed the partition size as well. I'll post an updated patch as soon as we settle on backwards compatibility.

Edit: Updated link.
« Last Edit: 26 / June / 2017, 13:37:03 by dmitrys »
Author of CHIMP, Canon Hack Installation and Management Platform

*

Offline reyalp

  • ******
  • 11900
The latter derives from the former, so you may do a direct diff from master.
I'm not going to go digging around your github to try to figure out what you wanted added. If you want to submit a change, please post a patch that can be applied to the current trunk.
Don't forget what the H stands for.

Since this seems to be a recurring issue, I shall take this opportunity and urge you to migrate CHDK to a modern VCS. If you find git too complex, go for hg, which is what both SDM and ML have been using. Both git and hg predate CHDK.

As for the patches, they are indeed Unicode, which is what Git for Windows seems to be generating. I will see if removing russian.lng helps.
Author of CHIMP, Canon Hack Installation and Management Platform

*

Offline reyalp

  • ******
  • 11900
Since this seems to be a recurring issue, I shall take this opportunity and urge you to migrate CHDK to a modern VCS. If you find git too complex, go for hg, which is what both SDM and ML have been using.
In the abstract, a VCS like git would probably be a better fit for CHDK, but switching would involve a significant amount of time and effort.

Producing a plain vanilla patch from SVN or a regular source tree is not that hard to do. Certainly learning to do that should be a lot less effort than would be required for us to switch the whole project.
Quote
As for the patches, they are indeed Unicode, which is what Git for Windows seems to be generating. I will see if removing russian.lng helps.
This sounds like a mis-configuration or bug. CHDK not support unicode or use unicode encoded files in the source tree. The text of lang files has to be encoded for the appropriate code page. This will cause "mojibake" when viewed in other encodings, but that is not a problem. A good editor will let you select the appropriate encoding when editing those files.
Don't forget what the H stands for.


*

Online philmoz

  • *****
  • 3107
    • Photos
Patch to fix the partition type being incorrectly reported by get_partitionInfo() as discussed.


I recommend rejecting this patch, as IMHO the current code is working - although perhaps not doing what dmitrys want.
Changing behaviour that could have unexpected side effects is not a good idea, no matter how innocuous it might seem.
See - https://chdk.setepontos.com/index.php?topic=13091.msg133556#msg133556


Phil.
CHDK ports:
  sx30is (1.00c, 1.00h, 1.00l, 1.00n & 1.00p)
  g12 (1.00c, 1.00e, 1.00f & 1.00g)
  sx130is (1.01d & 1.01f)
  ixus310hs (1.00a & 1.01a)
  sx40hs (1.00d, 1.00g & 1.00i)
  g1x (1.00e, 1.00f & 1.00g)

*

Online philmoz

  • *****
  • 3107
    • Photos
If you find git too complex, go for hg...


Please take the time to read your own posts and ask yourself, 'how would I react if this was directed at me?'.


This is a very condescending post to make to people, many of whom were coding long before you were born.


Anyone can have a simple idea - and moving away from SVN has been brought up before. Implementation is not always that easy.
It is not as simple as you might think - there is a huge history in SVN that should not be lost, as well as tools (like the autobuild system and parts of the CHDK build itself) that use SVN.


Phil.

CHDK ports:
  sx30is (1.00c, 1.00h, 1.00l, 1.00n & 1.00p)
  g12 (1.00c, 1.00e, 1.00f & 1.00g)
  sx130is (1.01d & 1.01f)
  ixus310hs (1.00a & 1.01a)
  sx40hs (1.00d, 1.00g & 1.00i)
  g1x (1.00e, 1.00f & 1.00g)

 

Related Topics