On Tue, Nov 19, 2013 at 5:24 AM, Michiel Konstapel <[email protected]<mailto:[email protected]>> wrote: Currently merging tinyprod/tp-master into our fork based off tinyos-main. The USCI code between the two repos is different, but I don't have a way of telling which one is right/better.
you want usci-v2. in tp-master. which flavor are you using? gh:tp-freeforall/prod(tp-master)/tos/chips/msp430/x5xxx/usci-v2/. My I2C (i2c-sm) has been wrung out. The SPI code is actively being used as well. Seems tinyos-main is more up to date in this case. Why do you say that? Sorry, I was referring to the x2xx code, which is much more important to me than the 5xx stuff. I don't mind having unknown bugs in the under-development CC430 boards, but if I compile a bug fix release for x2xx apps it has to work. Bug-by-bug compatible might be better than "fixed in subtly incompatible ways". tinyprod HplMsp430UsciAB1RawInterruptsP.nc is from March 2011, tinos-main got a bug fix applied<https://github.com/tinyos/tinyos-main/issues/172> 6 months ago. Which of these do I want? You want to take your changes and move them over to a branch off tp-master. That really is how you want to do it. I don't know if my code will ever make it into tinyos-main. too painful at this point and I don't know if I want to take the time. https://github.com/tinyos/tinyos-main/blob/master/tos/chips/msp430/x2xxx/usci/HplMsp430UsciAB1RawInterruptsP.nc vs https://github.com/tinyprod/prod/commits/tp-master/tos/chips/msp430/x2xxx/usci/HplMsp430UsciAB1RawInterruptsP.nc I haven't been paying attention to the x2 stuff. Sounds like it is time I do another pull from the upstream. You should still move your code over to a branch off tp-master. Then when I update tp-master by advancing upstream you can then pull and get the latest bits from tinyos-main too. I'll do that soon. I'll keep an eye on your repo, and I'll probably start tracking that instead of tinyos-main if you merge. Alternatively, I'll just cherry pick from both and push the results into our internal repo. Second question: why are HplMsp430UsciAB0RawInterruptsP and HplMsp430UsciAB1RawInterruptsP significantly different in their handling of the TX/RX interrupts? Because it is broken. And I've got a different version yet again, which works for what we do... so I'll stick to that instead of either main or prod, unless I understand which fix is the correct one, and unfortunately, there's never much time to dive in to that kind of low level stuff :-/ Anyway, thanks for the pointers, it's been a great help! Michiel
_______________________________________________ Tinyos-help mailing list [email protected] https://www.millennium.berkeley.edu/cgi-bin/mailman/listinfo/tinyos-help
