deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8017 commits 6 branches 13 tags 80 MiB
Commit graph

8017 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Dunkels 31da83d0a3 Merge pull request #30 from malvira/bump-libmc1322x 
Bump libmc1322x
 2012-11-18 15:34:53 -08:00
Mariano Alvira 2c9a538582 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into bump-libmc1322x 
bump libmc1322x to 7bee48243c

Conflicts:
	cpu/mc1322x/board/Makefile.board
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/lib/uart1.c
	cpu/mc1322x/lib/uart2.c
	cpu/mc1322x/src/default_lowlevel.c
 2012-11-18 18:27:39 -05:00
Mariano Alvira 7bee48243c remove old uart1_init and uart2_init prototypes 2012-11-18 18:07:05 -05:00
Mariano Alvira 92856d8831 m12 low power 2012-11-18 17:35:35 -05:00
Mariano Alvira d12df2eed3 use rx and tx queues for uart 2012-11-18 17:35:35 -05:00
Mariano Alvira 731272c240 add routines to set flow control 2012-11-18 17:35:35 -05:00
Mariano Alvira b3e2f30674 change uart_init to take a baud so you don't need a second call to 
setbaud
 2012-11-18 17:35:35 -05:00
Mariano Alvira e7e149d354 new uart_init and uart_setbaud 2012-11-18 17:35:34 -05:00
Mariano Alvira 4d4b09f7ff pick a better adc vbatt trim as default 2012-11-18 17:35:34 -05:00
Mariano Alvira b9defeee02 small tweaks to how ADC channels are enabled. 2012-11-18 17:35:34 -05:00
Mariano Alvira 009180e0a9 add M12 2012-11-18 17:35:34 -05:00
Adam Dunkels 67f938cb9b Merge pull request #29 from malvira/ignore 
Ignore
 2012-11-18 12:39:29 -08:00
Mariano Alvira 1c4a359810 ignore *.d 2012-11-18 14:35:20 -05:00
Mariano Alvira d3bdfff76e ignore elfs created from targets 2012-11-18 14:34:45 -05:00
Mariano Alvira 2418d23529 ignore things generated by cooja build 2012-11-18 14:32:47 -05:00
Adam Dunkels 6a7435e0ba Merge pull request #17 from cmorty/Cooja_automation 
Cooja automation related patches.
 2012-11-13 03:59:17 -08:00
Adam Dunkels 1db75f3b98 Merge pull request #23 from boeglin/cooja_pcap_802154 
Export Pcap as LINKTYPE_IEEE802_15_4
 2012-11-13 03:52:16 -08:00
Adam Dunkels 23f9cdd90d Merge pull request #24 from boeglin/cooja_radiologger_no 
Add a "Packet Number" column to the RadioLogger plugin
 2012-11-13 03:51:18 -08:00
Adam Dunkels 8eeae7689e Merge pull request #25 from eduble/master 
Set of fixes related to stm32w boards.
 2012-11-12 11:27:19 -08:00
Etienne Duble 97da754b1c Fixed login make target repeated in Makefile.mbxxx and Makefile.stm32w108 2012-11-09 15:43:15 +01:00
Etienne Duble 7905316c54 Fix: stm32w flasher for Ubuntu 12.04 and later 2012-11-09 14:14:57 +01:00
Etienne Duble ecdbbaec9a Fix: handle stm32f-based serial interfaces (/dev/ttyACMx) 2012-11-09 14:00:16 +01:00
Adam Dunkels cf541fc0a6 Merge pull request #22 from boeglin/doxygen_uip6_rpl 
Generate Doxygen doc for UIP6 and RPL
 2012-11-07 11:33:11 -08:00
Alexandre Boeglin 8f9931a215 Add a "Packet Number" column 2012-11-07 17:35:08 +01:00
Alexandre Boeglin fb7dcf982b Export Pcap as LINKTYPE_IEEE802_15_4 2012-11-07 17:31:59 +01:00
Alexandre Boeglin d7833cd271 Define IPv6 and RPL related macros in Doxygen config 2012-11-07 17:04:13 +01:00
Alexandre Boeglin 3b492cf82f Add missing Doxygen marker 2012-11-07 16:57:27 +01:00
George Oikonomou 5762179159 cc2530dk: Sniffer example changes: 
- Building for the cc2531 USB dongle by default
- We turn on USB-serial buffered mode

Closes #21
 2012-11-04 21:44:38 +00:00
George Oikonomou 5399fa2b6f cc2530dk: Fixed the startup text for dongle builds 
See Pull Request #21
 2012-11-04 21:44:34 +00:00
George Oikonomou 9215081f41 cc2530dk: Border router example changes: 
- It now plays nicely with the cc2531 USB dongle
- We build it for the dongle by default
- Debugging with cc2530dk functions instead of printf
- Using __nonbanked optimisations
- During prefix requests, invert LED blinking to make things more visible
- Removed leftover include
- Code style fixes

See Pull Request #21
 2012-11-04 21:44:24 +00:00
George Oikonomou 13f20225a6 Sensinode: Border router debug without printf 
Closes #20
 2012-11-04 21:44:06 +00:00
George Oikonomou 53fdb96816 cc2530dk and Sensinode: Local copy of uip-debug.c 
Copied this file to the platform directories and
changed it to use putstring(), puthex() etc so
that we can print addresses without linking in
printf

See Pull Request #20
 2012-11-04 21:43:57 +00:00
George Oikonomou 79cffa030f cc2531: USB CDC-ACM code style fixes 
Closes #18
 2012-11-01 17:42:04 +00:00
George Oikonomou be93f1ae52 cc2531: Added a new USB demo project (CDC-ACM) 
See Pull Request #18
 2012-11-01 17:42:01 +00:00
George Oikonomou 1a0f01ccc4 cc253x: Config to swap between UART and USB I/O 
See Pull Request #18
 2012-11-01 17:41:57 +00:00
George Oikonomou 2cc74c5fd4 cc2530dk: Added a 'Serial over USB' platform process 
This is based on a usb-test example by Philippe Retornaz. It has
been moved to platform and modified accordingly. With this in place:

- putchar() can work over USB. So we can use things like
  printf, slip output
- USB input can be redirected to slip or serial input

The example itself is no longer needed in the source tree

See Pull Request #18
 2012-11-01 17:41:53 +00:00
Philippe Rétornaz eabaa0c8e4 cc253x: DMA Changes 
- Fixed DMA irq flag clearing
- Added a dma_reset helper

See Pull Request #18
 2012-11-01 17:41:49 +00:00
Philippe Rétornaz 898bd07810 cc253x: optionally push bits in p2 interrupt 
See Pull Request #18
 2012-11-01 17:41:46 +00:00
Philippe Rétornaz 0a6e65acdf cc2531: USB changes: 
- usb cdc-acm:
  * implement get line coding
  * use printf only when debugging
  * Add events

- usb-core: do not force debugging

See Pull Request #18
 2012-11-01 17:41:41 +00:00
George Oikonomou c1d72475d7 cc253x: Renamed P2 interrupt-related files for better consistency 
See Pull Request #18
 2012-11-01 17:41:38 +00:00
George Oikonomou c60f0b4349 cc253x: P2-related routines are now bankable 
We keep the ISR in its own file and move everything else
to a different one, so that we only have to keep the ISR
in HOME

See Pull Request #18
 2012-11-01 17:41:32 +00:00
George Oikonomou d9d4fa168d cc253x: Renamed the P2 ISR 
This is mainly a naming convention thing, we want to have 'isr'
as part of the name, instead of 'int'. We also want port_2 instead
of p2 because we already had port_1

See Pull Request #18
 2012-11-01 17:41:28 +00:00
George Oikonomou fea4970142 cc253x: Configurable linkage for the P2 ISR 
See Pull Request #18
 2012-11-01 17:41:24 +00:00
Philippe Rétornaz ba96408f37 cc253x: Add USB support to the compilation scripts 
See Pull Request #18
 2012-11-01 17:41:21 +00:00
Philippe Rétornaz d93fee612d cc2531: Add USB driver 
See Pull Request #18
 2012-11-01 17:41:17 +00:00
Philippe Rétornaz ddc8120d7c cc253x: Add p2 interrupt handler 
The P2 Interrupt is shared across many periferal (I2C, USB, GPIO).
This adds a generic interrupt handler on which the differents drivers
can register a handler.

See Pull Request #18
 2012-11-01 17:41:11 +00:00
Philippe Rétornaz dec34c21ef cc2531: change cdc-acm descriptor 
Change to have a real usb VID/PID and better fit the capabilities
of the CC2531 hardware (enpoint size, location).

Compile only if the cdc-acm class is requested.

See Pull Request #18
 2012-11-01 17:41:07 +00:00
Philippe Rétornaz 0e55eb0947 cc2531: Copy arm usb framework 
See Pull Request #18
 2012-11-01 17:40:35 +00:00
Moritz 'Morty' Strübe 7bca2e23fc Cooja: Allow running the simulation without motes. 
Normally it is not possible to start a simulation without motes. While
 this nomally makes sense, it might be, that motes are added at a later
 point in time by plugins.
 Removing this requirement is not problem, as it is still not possible
 to start the simulation without registered events. Thus a plugin can now
 register an event in the future to add motes at that point of time.
 2012-10-31 17:37:12 +01:00
Moritz 'Morty' Strübe 64c0b9c241 Cooja: Fix command line override of ContikiPath 
Without the fix the command line parameter was overwritten by the simulation configuration.
 2012-10-31 17:29:07 +01:00