Zolertia Z1 port for RIOT OS #893

rousselk · 2014-03-17T09:05:14Z

First version of RIOT OS for Zolertia Z1 (platform described in RIOT's Wiki on GitHub).

What should work:

All functions related to the MSP430F2617 MCU; this includes: timers, UARTs (can communicate on the micro-USB port, and thus have a shell/console), GPIOs (can control LEDs, receive signal from user button...), etc.
802.15.4 networking via the CC2420 transceiver.

Todo (in a next version):

support the real-world sensors (TMP102 thermometer and ADXL345 accelerometer) by creating the appropriate drivers
support the data/log flash memory (M25P16 -- 16 Mbit Flash chip)

OlegHahm · 2014-03-17T17:06:13Z

How can I test this? I tried with hello_world and ipc_pingpong but failed to see any output in pyterm using the µUSB connector (flashing seems to work).

rousselk · 2014-03-18T08:53:29Z

One can also execute the built ELF file with Cooja (after renaming 'xxx.elf' to 'xxx.z1').

But yes, there are still issues I need to address (especially with the radio transceiver).

rousselk · 2014-03-18T12:39:49Z

Indeed, pingpong works on Cooja, but on the real machine, I can't get the expected output from the USB port (while the UART LEDs indicate that there is actually something passing on the port). Hmmm....

rousselk · 2014-03-18T14:31:12Z

It seems to be a problem related to the MCU frequency (the UART configuration supposes it runs at 8 MHz). After a bit of fiddling with DCO configuration, I'm now having some output from the mote.

By the way, what's the pyterm you use? I'm currently using minicom to communicate with my motes, but maybe is your program better?...

OlegHahm · 2014-03-18T14:54:01Z

Actually pyterm is a self-written python script: https://github.com/RIOT-OS/RIOT/tree/master/dist/tools/pyterm

LudwigKnuepfer · 2014-03-18T15:33:32Z

If better means higher hackability, yes ;-)

rousselk · 2014-03-19T09:42:16Z

Rebased on current master to have the merged #881 and #882 fixes.

OlegHahm · 2014-03-19T15:39:19Z

Hmm, still don't get any output from the Z1 even with UART_SLOW_MODE set to 1 and changed pyterm to 9600 baud.

rousselk · 2014-03-19T15:57:26Z

Looks like I will have to trace this thing at the cycle-level with JTAG.
Well, stay tuned...

OlegHahm · 2014-04-08T23:12:24Z

Any progress?

rousselk · 2014-04-09T08:48:49Z

Well, not yet. I have to hurry and prepare some submission (as part of my thesis job) on 802.15.4 radio MAC protocols for a conference whose submission deadline is only a few days away; so I have to concentrate on that part for now, instead of watching for UART-related problem (it's also the reason I submitted some fixes about CC2420 and HW timers lately).

I don't give up on that point, rest assured it's only a matter of time before I delve into this.

rousselk · 2014-04-23T10:00:20Z

@OlegHahm Does this change makes things better? I can now see the correct output of the 'pingpong' example.

thomaseichinger · 2014-04-28T13:54:40Z

boards/z1/board.c

+//    TACTL = 0;                            /* Stop Timer_A */
+
+//    BCSCTL1 &= ~(DIVA1 + DIVA0);          /* remove divisor from ACLK again */
+


The above 53 lines are not used at all?

They are the code that configures the MSP430 clock module for the MCU frequency you choose. For now, since I'm trying to debug UART, I commented it and replaced it by direct affectation of clock HW registers...
I'll probably re-enable this portion of code when everything is fixed.

Do you intend to fix the UART and un-comment this before the PR gets merged? If not:
It would be a lot cleaner to split it to a different PR.
If yes:
Please mark the PR as WIP (via label and description).

Yes, it's an ongoing WIP effort; I just marked it as you suggested.

rousselk · 2014-04-30T15:47:52Z

Rebased on master (again).

OlegHahm · 2014-04-30T16:07:18Z

Still cannot see any output (neither with pyterm nor with minicom). What't the intended baudrate?

mehlis · 2014-05-02T13:02:36Z

@rousselk please look at the travis output, seems link the z1 needs some blacklisting for some boards, but every fail case needs it's attention, perhaps there is something other wrong with it :)

OlegHahm · 2014-05-04T11:54:17Z

@rousselk please look at the travis output, seems link the z1 needs some blacklisting for some boards, but every fail case needs it's attention, perhaps there is something other wrong with it :)

I guess you meant "blacklisting for some applications".

mehlis · 2014-05-04T23:37:37Z

blacklisting the Z1 in applications....

rousselk · 2014-05-05T12:50:29Z

@OlegHahm The intended baudrate is 115200 bps as usual... Argh! What's wrong with that UART?
By the way, what kind of hardware are you using? The built-in Micro-USB port of the Z1, right?

@mehlis I'll look at this ASAP.

OlegHahm · 2014-05-05T12:59:59Z

So

git checkout rousselk/z1-port
cd examples/ipc_pingpong
BOARD=z1 make -B clean all flash term

should result in the expected output, right? I don't see anything after:

...
make[1]: Leaving directory '/home/oleg/git/RIOT'
   text    data     bss     dec     hex filename
   8028      10    1520    9558    2556 /home/oleg/git/RIOT/examples/ipc_pingpong/bin/z1/ipc_pingpong.elf
goodfet.bsl --z1 -I -c /dev/ttyUSB3 -r -e -p /home/oleg/git/RIOT/examples/ipc_pingpong/bin/z1/ipc_pingpong.hex
MSP430 Bootstrap Loader Version: 1.39-goodfet-8
Mass Erase...
Transmit default password ...
Invoking BSL...
Transmit default password ...
Current bootstrap loader version: 2.13 (Device ID: f26f)
Changing baudrate to 38400 ...
Program ...
8038 bytes programmed.
Reset device ...
/home/oleg/git/RIOT/dist/tools/pyterm/pyterm.py /dev/ttyUSB3
Welcome to pyterm!
Type 'exit' to exit.

rousselk · 2014-05-05T13:06:05Z

Indeed, it should work the way you build it...
Well, let's try something other. Is this version any better?

OlegHahm · 2014-05-05T13:08:49Z

No difference.

thomaseichinger · 2014-05-05T13:46:00Z

As comparison below the implementation of the OpenWSN project.
https://github.com/openwsn-berkeley/openwsn-fw/blob/develop/firmware/openos/bsp/boards/z1/uart.c#L28
They are applying other values to UCA0BR0 and UCA0BR1 although your calculations seem correct following the data sheet.

rousselk · 2014-05-06T08:34:04Z

@thomaseichinger Hello. Actually the computations made by my macros produce values 0x45 for UCA0BR0 and 0x00 for UCA0BR1, like in OpenWSN code, or Zolertia's own demo code (see at http://zolertia.sourceforge.net/wiki/index.php/Mainpage:TOS_advanced#Printf_using_UART_port).

Well, I'll try to disable the macros and directly put the numeric values in the registers, but according to the JTAG debugger, it won't really change anything...

I must admit, I'm at a loss... The values I use for configuration are the same than in Contiki's Z1 port, the same that Zolertia recommend... and you have now learnt me than OpenWSN also use the same!... Just why doesn'it work now?...

rousselk · 2014-05-15T10:56:01Z

OK, fixed the Makefiles (and reorder again the blacklisted board alphabetically), made the DCO calibration optional with #ifdef, and squashed.

After a last round of tests, I expect this one to be the one.

thomaseichinger · 2014-05-15T11:15:44Z

👍 ACK

thomaseichinger · 2014-05-15T11:18:37Z

I'll leave the gratification to press the merge button to you.

haukepetersen · 2014-05-15T11:29:54Z

boards/z1/board.c

+ * This file subject to the terms and conditions of the LGPLv2. See the file
+ * LICENSE in the  top level directory for more details.
+ */
+


Missing doxygen header

haukepetersen · 2014-05-15T11:35:46Z

Ok, works fine! ACK from me once you address the documentation and comment style issues

rousselk · 2014-05-16T08:41:52Z

Fixed doc/comments.
I squashed this directly to save some time.
Let's wait for a last Travis verdict.

haukepetersen · 2014-05-16T08:48:20Z

Looking good, ACK (again)

LudwigKnuepfer · 2014-05-16T08:52:06Z

May I suggest you reword the second commit to boards/z1: initial import?
In any case: the project's name is RIOT, not RIOT OS. (Although I guess we need to accept the fact that people will call it RIOT OS as it happens all the time...)

rousselk · 2014-05-16T08:54:52Z

OK.

LudwigKnuepfer · 2014-05-16T08:59:13Z

Oh, and one more thing:
Your license headers contain a copy paste error. If you use our standard license header you've got my ACK ;-)

  * This file is subject to the terms and conditions of the GNU Lesser General
  * Public License. See the file LICENSE in the top level directory for more
  * details.

rousselk · 2014-05-16T09:03:01Z

OK (again).

LudwigKnuepfer · 2014-05-16T09:04:33Z

ACK ACK!

LudwigKnuepfer · 2014-05-16T09:04:39Z

..and thanks for bearing..

rousselk · 2014-05-16T09:06:49Z

@LudwigOrtmann You're welcome; I saw you had some work on this item lately (for native if I remember correctly...)

LudwigKnuepfer · 2014-05-16T09:08:08Z

I automated it: #1181

LudwigKnuepfer · 2014-05-16T09:27:05Z

@rousselk Hooray, Travis likes your PR =)

LudwigKnuepfer · 2014-05-16T09:36:29Z

@rousselk Do you want to merge it?

thomaseichinger · 2014-05-16T09:56:02Z

Yay, @rousselk it's your honour to push the button.

rousselk · 2014-05-16T10:08:51Z

OK, time has come.

Zolertia Z1 port for RIOT OS

LudwigKnuepfer · 2014-05-16T10:09:52Z

Congratulations =)

rousselk · 2014-05-16T10:10:33Z

Thanks everyone, especially Thomas: I think I would still be wondering what's wrong with USB/UART if you didn't give me the finger.
This is a collective achievement.

thomaseichinger · 2014-05-16T10:17:46Z

\o/ Congratulations! Happy I could help and looking forward to your next PR!

rousselk added the msp label Mar 17, 2014

OlegHahm self-assigned this Mar 19, 2014

OlegHahm added this to the Release 2014.04 milestone Apr 8, 2014

thomaseichinger reviewed Apr 28, 2014
View reviewed changes

rousselk added the WIP label Apr 29, 2014

rousselk changed the title ~~Zolertia Z1 port for RIOT OS!~~ Zolertia Z1 port for RIOT OS (WIP) Apr 29, 2014

rousselk changed the title ~~Zolertia Z1 port for RIOT OS (WIP)~~ Zolertia Z1 port for RIOT OS (experimental/WIP) Apr 29, 2014

haukepetersen reviewed May 15, 2014
View reviewed changes

LudwigKnuepfer removed the NEEDS SQUASHING label May 16, 2014

boards/z1: initial import

2a3033b

rousselk added a commit that referenced this pull request May 16, 2014

Merge pull request #893 from rousselk/z1-port

988de6b

Zolertia Z1 port for RIOT OS

rousselk merged commit 988de6b into RIOT-OS:master May 16, 2014

rousselk deleted the z1-port branch May 16, 2014 11:53

		// TACTL = 0; /* Stop Timer_A */

		// BCSCTL1 &= ~(DIVA1 + DIVA0); /* remove divisor from ACLK again */

Zolertia Z1 port for RIOT OS #893

Zolertia Z1 port for RIOT OS #893

Conversation

rousselk commented Mar 17, 2014

OlegHahm commented Mar 17, 2014

rousselk commented Mar 18, 2014

rousselk commented Mar 18, 2014

rousselk commented Mar 18, 2014

OlegHahm commented Mar 18, 2014

LudwigKnuepfer commented Mar 18, 2014

rousselk commented Mar 19, 2014

OlegHahm commented Mar 19, 2014

rousselk commented Mar 19, 2014

OlegHahm commented Apr 8, 2014

rousselk commented Apr 9, 2014

rousselk commented Apr 23, 2014

thomaseichinger Apr 28, 2014

Choose a reason for hiding this comment

rousselk Apr 29, 2014

Choose a reason for hiding this comment

LudwigKnuepfer Apr 29, 2014

Choose a reason for hiding this comment

rousselk Apr 29, 2014

Choose a reason for hiding this comment

rousselk commented Apr 30, 2014

OlegHahm commented Apr 30, 2014

mehlis commented May 2, 2014

OlegHahm commented May 4, 2014

mehlis commented May 4, 2014

rousselk commented May 5, 2014

OlegHahm commented May 5, 2014

rousselk commented May 5, 2014

OlegHahm commented May 5, 2014

thomaseichinger commented May 5, 2014

rousselk commented May 6, 2014

rousselk commented May 15, 2014

thomaseichinger commented May 15, 2014

thomaseichinger commented May 15, 2014

haukepetersen May 15, 2014

Choose a reason for hiding this comment

haukepetersen commented May 15, 2014

rousselk commented May 16, 2014

haukepetersen commented May 16, 2014

LudwigKnuepfer commented May 16, 2014

rousselk commented May 16, 2014

LudwigKnuepfer commented May 16, 2014

rousselk commented May 16, 2014

LudwigKnuepfer commented May 16, 2014

LudwigKnuepfer commented May 16, 2014

rousselk commented May 16, 2014

LudwigKnuepfer commented May 16, 2014

LudwigKnuepfer commented May 16, 2014

LudwigKnuepfer commented May 16, 2014

thomaseichinger commented May 16, 2014

rousselk commented May 16, 2014

LudwigKnuepfer commented May 16, 2014

rousselk commented May 16, 2014

thomaseichinger commented May 16, 2014