you want to use tp-master and then take what you have that is different and merge that onto a branch off tp-master.
If you merge your branch off tinyos-main onto tp-master, you effectively are duplicating the merge work that I do every once in a while. tp-master tracks tinyos-main. tinyos-main is my upstream. tp-master should be your upstream. more below. On Tue, Nov 19, 2013 at 5:24 AM, Michiel Konstapel <[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? > 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. > > Second question: why are HplMsp430UsciAB0RawInterruptsP and > HplMsp430UsciAB1RawInterruptsP significantly different in their handling of > the TX/RX interrupts? > Because it is broken. > > > -----Original Message----- > > From: [email protected] [mailto:tinyos-help- > > [email protected]] On Behalf Of Michiel Konstapel > > Sent: Tuesday, November 19, 2013 12:36 > > To: [email protected] > > Subject: [Tinyos-help] CC430 > > > > What would be the best jumping off point for our CC430F5137 based > > platform? Eric, since I know you've done a lot of work on the 5xx > > series, I've taken the liberty of CCing you personally. > > > > As far as I can tell, tinyos-main (https://github.com/tinyos/tinyos- > > main) has no 5xx support. tinyprod (https://github.com/tinyprod/prod ) > > does, but I don't know what branch I would want to start from; master, > > mm-core or tp-master? I'm working my way through the commit logs and > > code, but I could use some guidance. > > > > The surf platform is based on the same chip, but it has not been > > updated recently. Are there known issues with it, or the x5xx support > > in general? Any gotchas I should look out for? > > > > Kind regards, > > Michiel Konstapel > > > > _______________________________________________ > > Tinyos-help mailing list > > [email protected] > > https://www.millennium.berkeley.edu/cgi-bin/mailman/listinfo/tinyos- > > help > > _______________________________________________ > Tinyos-help mailing list > [email protected] > https://www.millennium.berkeley.edu/cgi-bin/mailman/listinfo/tinyos-help > -- Eric B. Decker Senior (over 50 :-) Researcher
_______________________________________________ Tinyos-help mailing list [email protected] https://www.millennium.berkeley.edu/cgi-bin/mailman/listinfo/tinyos-help
