[Ovmsdev] sprintf / crashes
mark at webb-johnson.net
Thu Dec 20 20:02:35 HKT 2012
Merge from v2 branch back into master has been done. The main github project master is now v2.1.1.
Michael: Please check "47517d2 Fix for twizy without OVMS_TWIZY_BATTMON" as it wouldn't build without the battmon code, so I had to #define a couple of places in the twizy.c.
Others: It compiles (for both v1 and v2 hardware), but no idea if it runs or not. Give us a few days to check it out and fix as necessary.
On 20 Dec, 2012, at 3:50 PM, Mark Webb-Johnson <mark at webb-johnson.net> wrote:
> To save time, I just fixed the conflicts. If you 'pull' again from master v2, you should get up-to-date.
> I'm going to do the switch back from v2 to master tonight (in a few hours time). I'll let you know when done.
> Regards, Mark.
> On 20 Dec, 2012, at 9:29 AM, Mark Webb-Johnson wrote:
>> I think our revisions overlapped. I'd just merged in all your previous changes, plus documentation and server code updates.
>> I did make some minor layout fixes (where the indentation was wrong - I think you are using 4 spaces, or perhaps tabs, where the rest of the project uses 2). I also added your pseudo-command #6 to the protocol document.
>> Can you merge in my changes, then re-push yours? I'd like to get this v2 branch complete today and merge back into master tonight (my time).
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the OvmsDev