Complex Lock mode for WP-34s

[Nigel (UK)]

(03-17-2015 08:26 PM)BarryMead Wrote:  I downloaded the patch file "cmode.patch" and attempted to apply these patches to the source for both SVN versions 3767 (shown in patch files) and 3769 (shown in posting), and NEARLY ALL of the patch hunks FAILED.

I tried from the wp34s-3769/ directory with patch --ignore-whitespace -p0 <cmode.patch and from the wp34s-3769/trunk/ directory with patch --ignore-whitespace -p1 <cmode.patch and neither worked. I also tried the patch file with and without stripping out the non-unix carriage returns at the end of each line of the patch file, and the result was the same.

Do you have any patching instructions that you can CONFIRM work? Have you performed a fresh checkout of the source tree and test run of your patch files to confirm that they are built correctly and work as expected?

Thanks for your hard work and I appreciate any assistance you can provide in passing these source changes on to others to experiment with.

Sorry about this - as you can probably tell, I'm not an expert. I made the patch file by first updating to 3767 (mistake in post, sorry), executing svn diff on each of the source code files that I had modified, and concatenating the outputs from these runs. I didn't check it would work before posting.

However, I've checked it now and it does work, for me at least. This is what I've done.

• First, I checked out a completely fresh copy of build 3769. This went into a directory called wp34s_latest - i.e., directories such as trunk, artwork, branches etc. are all subdirectories of this.
• I copied cmodes.patch into this directory and opened a DOS command window.
• I then typed svn patch cmodes.patch and the patches were applied correctly. There were small offsets of 5 and 3 lines for files keys.c and xeq.c (reflecting the differences between 3767 and 3769) but everything went through smoothly and the windows emulator builds.
  

I hope this helps. Maybe the problem is that my directory names don't include the version number as yours do?

Nigel (UK)