Commit graph

65 commits

Author SHA1 Message Date
Mariano Alvira 552408b241 Merge pull request #685 from SmallLars/mc1322x
Added mc1322x functions: clock_set_seconds, soft_reset, nvm_verify
2015-09-13 12:35:53 -05:00
kkrentz 4493783ce9 'free_packet' in csma.c conflicted with 'free_packet' in maca.c 2014-08-04 01:09:57 -07:00
Lars Schmertmann 879fd8de81 Added mc1322x functions 2014-05-23 12:12:26 +02:00
Adam Dunkels bb2dcaa057 A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix 2013-11-24 20:20:11 +01:00
Mariano Alvira 6307f3ff95 mc1322x: make uart buffer sizes configurable from contiki-conf.h 2013-07-04 14:09:40 -04:00
Mariano Alvira fb8bbf37cf Use the RTC only as the main timer.
This is a major change to how the main tick interrupt is handled on
the mc1322x platforms. Instead of using two timer resources, TMR0 and
RTC, this patch unifies all the timers to use the RTC. This is enabled by
implementing etimers as scheduled rtimers. The main advantage (aside
from freeing TMR0 for general use) is have the Contiki timebase come
from the same source that will be used for sleeping and wakeup.
2013-02-03 15:15:05 -05:00
Mariano Alvira ad55ccdec4 add working routines to turn the mc1322x radio on and off 2013-02-03 14:48:38 -05:00
Mariano Alvira a53e653bbf Receive packets in a dummy_rx when the maca packet pool is
empty. These packets get dropped.
2013-01-06 15:12:07 -05:00
Mariano Alvira b3bb3ff53d fix very incorrect insert_at_rx_head; the bugged version would make
the rest of the rx list dangling.

this is used to insert the ack packet needed by the upper layers in
the netstack.
2012-12-02 14:25:39 -05:00
Mariano Alvira f7d1d78ac9 disable pad keeper when using ADC pin; otherwise you'll see a 20k input
impedance.
2012-11-30 10:44:26 -05:00
Mariano Alvira 03ab3fe317 Newer and cleaner TARGET=econotag as well as robust mc13224v
configuration system.

(also deprecate TARGET=redbee-econotag)

- mc13224v now automatically probes hardware config for buck converter
and 32kHz crystal as well as automatically monitors battery voltage
and manages the buck accordingly.

- new flashed based config system for mc13224v parameters such has
  radio modes (demod, autoack), nvmtype, mac address, channel and
  power.

- considerably cleaned up econotag platform code (suffered from severe
  case of bit-rot)
2012-11-19 19:16:29 -05: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
Adam Dunkels 944537fccf Removed all old RCS tags in the Contiki source tree. Those RCS tags are not used any more, as we are now using git to manage the Contiki source tree 2012-10-26 15:54:49 +02:00
Laurent Deru 56914963ef Reactivate flash protection after maca init 2012-05-09 10:24:38 -04:00
Mariano Alvira 2b9f4e8fed Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x 2011-08-01 19:50:46 -04:00
Mariano Alvira 485d6716e0 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x
Conflicts:
	cpu/mc1322x/src/default_lowlevel.c
2011-07-18 07:25:19 -04:00
Mariano Alvira 758fc37307 mc1322x: flush the rx fifos when full 2011-07-12 07:05:04 -04:00
Mariano Alvira 6d96721ac4 mc1322x: block in uart putc if the TX buffer is full. Can also be
configured to drop chars instead with UARTx_DROP_CHARS
2011-07-09 12:46:30 -04:00
Mariano Alvira e80f9eb4b5 mc1322x: build fixes for uart2 2011-07-08 19:40:42 -04:00
Mariano Alvira e2d74fa0a5 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into uart-upstream
Conflicts:
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/src/default_lowlevel.c
2011-07-08 19:21:15 -04:00
Mariano Alvira 33b32c61e9 Only insert an ack packet if the ack request bit is set 2011-06-01 13:47:05 -04:00
Mariano Alvira 724bcbd2d3 Merge remote branch 'libmc1322x/master'
Conflicts:
	cpu/mc1322x/src/default_lowlevel.c
2011-05-14 21:19:47 -04:00
Mariano Alvira 0a2b86456b add option to insert an ack packet on autoack 2011-05-08 09:50:57 -04:00
Mariano Alvira 65671c66c6 turn on insert ack packet by default 2011-05-08 09:50:57 -04:00
Mariano Alvira d80449244d Merge remote branch 'libmc1322x/master' 2011-04-20 21:23:47 -04:00
dak664 2e14df3981 Options to extend mc1322x fifo to RAM buffer, or use hardware flow control with tunslip6. 2011-04-08 15:15:16 -04:00
Mariano Alvira 11f5bca7c4 Merge remote branch 'libmc1322x/master'
Conflicts:
	cpu/mc1322x/board/redbee-econotag.h
2011-03-22 16:28:08 -04:00
Mariano Alvira 59d7fad746 Merge remote branch 'libmc1322x/master' 2011-03-11 16:28:14 -05:00
Mariano Alvira a1ae79307b mc1322x: remove auto reception mode as it appears to be the cause of
the periodic autoack checksum errors. removing auto mode doesn't seem
to create any performance issue.
2011-03-11 06:28:47 -05:00
dak664 bb574fd1e2 Don't create an object directory if target does not exist 2011-03-10 14:59:21 -05:00
Mariano Alvira 5208aa14ea mc1322x: remove auto reception mode as it appears to be the cause of
the periodic autoack checksum errors. removing auto mode doesn't seem
to create any performance issue.
2011-03-08 15:36:53 -05:00
Mariano Alvira fa08b09770 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into update-lib 2011-03-07 12:37:26 -05:00
Mariano Alvira 07f77b02eb Merge remote branch 'libmc1322x/master' 2011-02-18 12:38:30 -05:00
Mariano Alvira 2e331b51e8 Merge remote branch 'libmc1322x/master' into update-libmc1322x
Conflicts:
	cpu/mc1322x/COPYING
2011-02-17 14:41:47 -05:00
Mariano Alvira 2e33e1694a Merge branch 'libmc13-9f82e068' into update-libmc1322x 2011-02-17 14:39:20 -05:00
Mariano Alvira 7cdfbb0947 remove cvs keywords from cpu/mc1322x 2011-02-17 14:36:55 -05:00
maralvira ce92a90e58 new timer setup routines. 2011-01-17 15:51:19 +00:00
maralvira b3c8c14b7d add timer setup routines 2011-01-17 15:51:02 +00:00
maralvira ca098db611 fix a race condition regarding advancement of the softclock. Without
this, the advancment would fail to trigger a tx cycle
occasionally. This would cause the packet to get deferred until the
next expiration of the softclock.
2011-01-17 15:49:17 +00:00
maralvira 9b2a2bb5e6 fix up stdint include 2010-11-10 22:12:29 +00:00
maralvira 6da84819dd use stdint.h instead of custom types.h
stdint.h is more portable across compilers
2010-11-10 22:06:28 +00:00
maralvira 77cf0f0f5e update ring_osc_on and _off to the new bit structs 2010-11-07 14:42:31 +00:00
maralvira dab7faf13c Add gpio_set and gpio_reset
Use them like gpio_set(GPIO_xx) and gpio_reset(GPIO_xx).
These macros efficiently set the DATA_SET and DATA_RESET bits without
reading the registers first, as a direct GPIO->DATA_SET.GPIO_xx would do
2010-11-07 14:29:04 +00:00
maralvira 4a4a39c84a Name the GPIO structure so we can set multiple bits at once 2010-11-07 14:28:30 +00:00
maralvira 65d3942c76 Add the disable_int({}) macro
This is similar to safe_irq_enable and disable
2010-11-07 14:26:24 +00:00
maralvira 83e6995af1 Add TMR_ADDR helper 2010-11-07 14:25:07 +00:00
maralvira d930ce0e2b Add some useful timer macros 2010-11-07 14:24:36 +00:00
maralvira 5e00219a9c Register definitions: get rid of some macro magic that doesn't help much
Instead of e.g. GPIO.DATA.GPIO_08, you now use GPIO->DATA.GPIO_08.
2010-11-07 14:24:11 +00:00
maralvira 091e4cd84e Add structure-based ITC access 2010-11-07 14:23:15 +00:00
maralvira 11ac20a361 REF_OSC is a 32-bit number, not 64-bit number 2010-11-07 14:22:51 +00:00