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
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
George Oikonomou
79cffa030f
cc2531: USB CDC-ACM code style fixes
...
Closes #18
2012-11-01 17:42:04 +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
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
George Oikonomou
713c2e5974
DOS EOL and indentation fixes (core/ apps/ cpu/)
...
- Removed some DOS EOLs
- Changed some tabs to spaces
- Removed some trailing whitespaces
Part of Pull Request #6
2012-10-30 13:43:51 +00:00
Adam Dunkels
6c8fbd2dff
Merge pull request #11 from adamdunkels/remove-rtl8019
...
Removed old unused RTL8019 code that had license issues
2012-10-29 08:43:59 -07:00
Adam Dunkels
1af22fa4fe
Removed old unused RTL8019 code that had license issues
2012-10-29 16:08:09 +01:00
Mariano Alvira
4087c0785f
remove -g
...
see http://comments.gmane.org/gmane.os.contiki.devel/13869
2012-10-29 10:34:28 -04: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
Niclas Finne
f5c8cff5b2
Made MT stack size configurable
2012-10-23 00:52:52 +02:00
George Oikonomou
d84a97103f
cc2x3x stack debugging macro fix
2012-09-20 15:12:02 +01:00
George Oikonomou
fde1510653
Added definitions for cc2530 DMA-related SFR bits
2012-09-20 15:09:15 +01:00
George Oikonomou
3b0e92168b
Copied cc2530 stack functions to the cc2430 port
2012-09-20 15:09:15 +01:00
George Oikonomou
95b9d4ee29
Sensinode/cc2430 stack depth optimisation
...
This replicates the method used by the cc2530 port
2012-09-20 15:09:15 +01:00
George Oikonomou
cb168da729
Changed the cc2430 sleep_flag to uint8_t
2012-09-20 15:09:15 +01:00
George Oikonomou
fa5a38666b
Removed redundant #else blocks
2012-09-20 15:09:15 +01:00
George Oikonomou
88c6689e38
cc2430: Build with --fomit-frame-pointer
2012-09-20 15:09:15 +01:00
Niclas Finne
767e8bb551
Default value for _DATA20_HEAP_SIZE when using the IAR compiler on MSP430 platforms
2012-09-20 14:01:56 +02:00
Niclas Finne
4630945475
Made the stack and heap size configurable when using the IAR compiler on the MSP430 platforms
2012-09-19 22:49:19 +02:00
George Oikonomou
ee7af77ca9
Reworked the cc2530 stack debugging facilities:
...
- Moved to their own file
(so we can later copy the entire thing over to cc2430)
- Renamed the functions
(for naming convention reasons)
- The entire thing can be enabled/disabled
- Added a couple more macros
- Hooked into main()
2012-09-07 17:40:17 +01:00
Philippe Rétornaz
9a63e8c027
cc253x: Add stack monitoring helpers
2012-09-07 17:32:54 +01:00
Philippe Rétornaz
48d99f15c8
cc253x: fix dma interrupt enable flag
2012-09-07 17:32:54 +01:00
George Oikonomou
c6ec22c4c8
cc2530: Added a method to maximise stack depth
...
This was oringinally contributed/reported/discussed/patched by
Philippe Retornaz (EPFL) but it's implemented
in a more configurable fashion here.
2012-09-07 17:32:53 +01:00
Philippe Rétornaz
666ff6ca55
cc253x: use a uint8_t for sleep_flag
...
__bit variables must be located after the 0x20 address
This force the stack to start after 0x20, thus decrease
the stack size by a considerable amount.
2012-09-07 17:32:10 +01:00
Philippe Rétornaz
44bcabe89c
cc253x: Change CFLAGS
...
This add -fomit-frame-pointer by default, it decrease sliglty the
stack usage when several function call are nested.
On some specific case 30 bytes could be saved on the stack.
2012-09-07 17:32:10 +01:00
George Oikonomou
8699f7741d
Fixed typos and a stray printf. Adjusted comments
2012-09-07 17:31:25 +01:00
Ivan Delamer
b43dad00b0
Cleaned up RF230BB, and refactored FRAME_RETRIES and CSMA_RETRIES
...
#defines.
2012-09-04 11:12:18 -06:00
Ivan Delamer
2e72ec3594
Place ATmega1281 define in correct section (it does have compare C
...
unit, avoid duplicate define and compiler warning).
2012-09-01 15:22:13 -06:00
Ivan Delamer
5636357243
Fix RF230 transition: RX_AACK_ON -> TX_ARET_ON (go through PLL_ON,
...
as per datasheet). Tested on RF230 and 128RFA1 (RF231).
2012-09-01 15:20:00 -06:00
George Oikonomou
26a87ee9cb
Improved handling of cc2x3x rf_flags
2012-07-11 10:53:14 +01:00
George Oikonomou
43f2790357
Added channel_get() to the cc2x3x RF drivers
2012-07-11 10:53:14 +01:00
George Oikonomou
d66241fd97
Bugfixed the cc2530 LOW_POWER_RX configuration
...
Report and fix by Tom Xiao
2012-07-11 10:53:14 +01:00
George Oikonomou
62fbd389d8
Renamed a cc253x SFRX to stop namespace conflicts
...
The TR0 SFRX can not use the name TR0 because it
conflicts with TCON.TR0 on the default 8051.
See SDCC bug 3513300
2012-07-11 10:53:14 +01:00
George Oikonomou
4b73b48f60
Fixed the cc2530 RSSI adjustment
2012-07-11 10:53:14 +01:00
Ivan Delamer
17a62a649c
ATmega128RFA1 bug fix: no interrupt pin used (embedded radio).
...
Enabling interrupt caused MCU reset if using pin as GPIO.
2012-07-10 14:36:47 -06:00
Niclas Finne
418a5772e6
Removed leds debug output
2012-06-07 10:35:22 +02:00
George Oikonomou
47db065034
Bugfixed the cc253x UART0 init (Thanks, Deng Jian)
...
The flush instruction was resetting the stop bit level to 'low'
2012-06-06 15:25:57 +01:00
David Kopf
e9a55cc222
Enable check on received length to prevent buffer overflow. Thank you Cooja!
2012-05-28 13:02:23 -04:00
George Oikonomou
259b497122
Minor Sensinode build cleanup
2012-05-16 15:22:31 +01:00
George Oikonomou
1f7171f943
Adjust cc2x3x ports to the new clock API
2012-05-16 15:22:31 +01:00
George Oikonomou
0d4b90c42b
cc2530 watchdog improvements and cleanup
2012-05-16 15:22:31 +01:00
George Oikonomou
274a5ebb9c
Fixed a typo which was preventing the cc253x watchdog from starting
2012-05-16 15:22:30 +01:00
Laurent Deru
56914963ef
Reactivate flash protection after maca init
2012-05-09 10:24:38 -04:00
Mariano Alvira
a4813d815f
use --gc-sections instead of -gc-sections
2012-05-06 12:19:20 -04:00
Mariano Alvira
4acad929f0
add gc-sections, roughly 4kB savings.
2012-05-06 09:24:06 -04:00
David Kopf
d6dc216e02
Reorder includes to prefer platform routines. Remove redundant RPL define.
2012-04-27 16:54:09 -04:00
George Oikonomou
dd26accc07
We can now use SDCC's __nonbanked feature
...
This allows us to reduce CODE footprint of SDCC projects
built with --model-huge. Use carefully!
* Added a facility which allows us to enable/disable the
feature from the CPU dir (CC_CONF_NON_BANKED_OPTIMIZATION)
* Added the CC_NON_BANKED keyword to some platform files
(expands to __nonbanked)
* Started using this for some examples
2012-04-26 15:28:43 +01:00
Adam Dunkels
b85bc3379c
Bugfix in clock_wait() declaration. Various style fixes.
2012-04-22 20:54:29 +02:00
George Oikonomou
e95f94a9a8
Added support for reading MAC from the cc253x flash
...
We still use the primary location by default (Info Page) but
this is now configurable. This change is useful for users who
wish to specify their own MAC address. Since the Info Page is
read-only, they need to be able to use the secondary location
2012-04-20 16:03:38 +01:00
George Oikonomou
29090a3dda
The cc253x Makefile specifies SoC flavor
...
This will help us slowly add better support for smaller SoCs
instead of just assuming that all cc253x SoCs are F256
- We build for F256 by default but the project Makefile can override this
- We currently ignore this when passing --code-size. This is a ToDo
- The bank allocator always assumes 7 banks. Once we fix --code-size above this will be irrelevant
2012-04-20 16:03:38 +01:00
George Oikonomou
6fb48174ba
Fixed a documentation typo
2012-04-20 16:03:37 +01:00
Niclas Finne
1b13b69814
Added support for mspgcc 4.6+ that no longer supports generic MCU identifiers such as msp430x1611
2012-04-10 16:05:10 +02:00
Niclas Finne
57a166c3db
Corrected compiler flags for the IAR compiler
2012-04-10 15:27:44 +02:00
David Kopf
cac4e9a222
Add clock_delay_us and clock_set_seconds to clock.h. Modify clock_wait to use clock_time_t.
...
Remove the troublesome avr/dev/delay.* files.
Add PLATFORM_NAME and combine the confusing *_REVISION defines into a single PLATFORM_TYPE
2012-04-09 15:49:53 -04:00
David Kopf
40bd020394
Fix wrong register addresses.
2012-04-09 09:58:12 -04:00
George Oikonomou
57969259ce
cc2x3x clock_delay(len) now delays for approx. len usecs
2012-04-03 16:26:11 +01:00
George Oikonomou
3cb26adeda
Added an ASM(foo) macro for cc243x
2012-04-03 16:26:11 +01:00
George Oikonomou
242e02658f
The cc2530 UART driver was sending a 0 down the line on init
2012-04-03 16:26:10 +01:00
George Oikonomou
b3de052e01
Ported the stack-friendly clock ISR code over from cc243x to cc253x
2012-04-03 16:26:10 +01:00
George Oikonomou
11a7f644ac
Comment rewording and formatting
2012-04-03 16:26:10 +01:00
George Oikonomou
ce17fa131c
Stack-friendly cc243x clock ISR enabled by default
...
This new approach (CLOCK_CONF_ACCURATE=0) was not as inaccurate
as originally thought. In fact, it has pretty much the same
accuracy as the old, stack-hungry version.
* Renamed the define from CLOCK_CONF_ACCURATE (1: old) to
CLOCK_CONF_STACK_FRIENDLY (1: new) to stop implying
that one is more accurate than the other.
* Using CLOCK_CONF_STACK_FRIENDLY by default.
2012-04-03 16:26:10 +01:00
George Oikonomou
924fe934c1
Deleted obsolete macros. Minor formatting
2012-04-03 16:26:10 +01:00
George Oikonomou
ffa3a1c4c3
cc2x3x clock driver cleanup
...
* Bit-Addressable SFRs are now accessed as such,
instead of (N)OR-ing the byte
* A routine was declared as CCIF but not defined as such. Fixed
* Deleted a leftover duplicate define
* Formatting
* Comment updates and clarifications
2012-04-03 16:26:10 +01:00
simonduq
930c7c25bc
fixes in mb851 and stm32w108: erroneous linking with mpu.o, conf file,
...
more printouts in main when ipv6 is used, and a target for memory
profiling taking stm's gnu.ld static stack size into account
2012-04-03 11:47:30 +02:00
George Oikonomou
5240519dd9
Renamed a config define to better match contiki's naming philosophy
2012-04-02 11:38:54 +01:00
George Oikonomou
bce34e4b9a
For cc2x30, moved CLOCK_CONF_SENCOND to the cpu dir.
...
The value is not really configurable by the platform so having it
in contiki-conf.h didn't make huge sense.
2012-04-02 11:22:19 +01:00
George Oikonomou
d958ee3125
Deleted the old Sensinode 'read mac from flash' routine.
...
Since the introduction of a purpose-written routine, the old
generic one (which was written in asm) was never being used.
There was a configuration directive which allowed us to switch
between the two. All references to this configuration directive
have also been removed.
2012-04-02 11:21:32 +01:00
George Oikonomou
5d8f63a61b
We've not been using the cc2430 converter for a while now
2012-04-02 11:03:49 +01:00
George Oikonomou
7854ee499a
Wrapped cc2x30 SOFT_RESET() macro inside do {...} while(0)
2012-03-29 13:11:04 +01:00
George Oikonomou
5afdd19403
Adjusted check to determine if we are being built with SDCC
...
Since rev #7342 , SDCC defines __SDCC_mcs51 instead of SDCC_mcs51.
We check for either
2012-03-29 13:10:25 +01:00
George Oikonomou
4f1e251603
Some uN_t had crept back in cc2530dk and sensinode.
...
Changed to uintN_t plus a bit of code formatting
2012-03-29 13:10:10 +01:00
simonduq
946f00bf7b
stm32w: added ability to upload and reset all connected boards, and login using MOTE=x
2012-03-26 23:00:44 +02:00
simonduq
95ae5c5d51
avoid unnecessary symbols.c/h copying
2012-03-26 23:00:43 +02:00
George Oikonomou
ad256e5014
New platform: TI cc2530 Development Kit
...
This commits adds support for TI's SmartRF05 Eval. Board with cc2530 EMs
Some initial support for cc2531 USB dongles
2012-03-23 14:41:07 +00:00
George Oikonomou
b7674c3636
Reincarnate the sensinode/cc2430 port
2012-03-23 14:41:07 +00:00
simonduq
e4fb360262
stm32w platforms: contikimac support in the Rime case, with EUI-64
2012-03-20 17:30:59 +01:00
simonduq
5da4463236
adding ducy cycling support to the stm32w-based platforms (patch by Chi-Anh La)
2012-03-20 17:29:58 +01:00
Niclas Finne
ff7a977dc7
Improved support for the IAR compiler for the MSP430 platforms
2012-03-07 23:09:05 +01:00
Niclas Finne
684c3edfa6
Cross compiler interrupt service routine compatibility definitions for MSP430 based platforms based on isr_compat.h by Steve Underwood.
2012-03-07 23:04:52 +01:00
Niclas Finne
2eee14a1d8
Allow compiler flag SMALL to be set to disable SMALL-build. Patch by Andre Frimberger.
2012-03-06 15:35:20 +01:00
Ilya Dmitrichenko
49cd7878e3
Avoid deprecated error on Darwin.
2012-03-02 15:15:47 -05:00
Ilya Dmitrichenko
499d3052ee
Fixed TARGET=native compilation issues on Darwin.
2012-03-02 15:15:42 -05:00
David Kopf
2b7ecefce7
Remove unused SPI initializer flag from AVR. Comment out in the msp-430 template.
2012-02-27 17:05:22 -05:00
Ilya Dmitrichenko
9c99d46e24
Simplified host OS platform detection in Makefiles
2012-02-25 10:09:33 -05:00
David Kopf
deb75d3d97
Several bugfixes
2012-02-21 11:14:52 -05:00
David Kopf
59e459e0e9
Add missing mtarch_stop function
2012-02-21 11:11:53 -05:00
David Kopf
6e45dfe5ff
PROGMEM changes needed for newer avr-gcc compiler
2012-02-21 11:10:57 -05:00
Nicholas J Humfrey
1cda3da17e
Converted u8_t to uint8_t and u16_t to uint16_t in the cpu directory.
2012-02-21 08:33:24 -05:00
Mariano Alvira
68591919e6
mc1322x: add -MMD to Makefile.mc1322x to correctly create dependencies
2012-02-16 11:17:15 -05:00
Mariano Alvira
43062b6d74
mc1322x: change how board.h works to allow default board.h (defaults
...
to econotag)
2012-02-13 10:01:36 -05:00
Mariano Alvira
ee8f2c669e
mc1322x: remove symbols.{c,h}
2012-02-13 10:01:36 -05:00
David Kopf
9d6542d49b
Fix minimal-net webserver6, broken after native border router changes.
2012-02-11 15:03:24 -05:00
David Kopf
38267bfd5a
Webserver-nano: Add page load times, remove workaround code for bug in arm strformat.c, correct the double count of leading zeros there.
2012-02-11 14:58:35 -05:00
David Kopf
987906be97
rf230bb updates: involves setting the 801.15.4 pending bit,
...
0x800000 cpu clock, and a jtag reset bugfix
2012-02-01 14:16:39 -07:00
Ivan Delamer
57e686179c
Improved rf230bb.c synchronization/locking. Removed unnecessary locks
...
during Tx (single-threaded environment). Added protection to Rx thread
from buffer access by ISR.
2012-02-01 13:37:45 -07:00
David Kopf
7ca141b457
Access uart registers directly instead of through intermediate addresses in a RAM struct.
...
Add a platform define to reduce the number of ports supported by the cpu.
2012-01-21 13:49:58 -05:00
Niclas Finne
f26920ae9b
Define the BV macro if not already defined
2012-01-11 08:46:16 +01:00
David Kopf
58298f59db
Add F_CPU=0x800000 option with phase lock to external 32768 Hz crystal
...
Add MCU_CONF_LOW_WEAR option to avoid eeprom writes during development.
2012-01-10 12:42:27 -05:00
Niclas Finne
f3db12c19d
MSP430 setup for f2xxx based on Z1
2012-01-09 14:56:03 +01:00
Niclas Finne
9ffcd53868
Fixed compiler warning (with IAR compiler)
2012-01-09 14:56:00 +01:00
Niclas Finne
3daa822f89
Moved configuration of memcpy workaround to cpu (only needed for an older version of mspgcc)
2012-01-09 14:55:57 +01:00
Niclas Finne
fd81a0d393
Minor cleanup (avoid setting some compiler flags twice)
2012-01-09 14:55:54 +01:00
Niclas Finne
8e1e12dfd3
Ignore SMALL when using IAR compiler
2012-01-09 14:55:48 +01:00
Nicolas Tsiftes
eba64bdc5e
Be more explicit with the relationship between inheritance between MSP430 families.
2012-01-09 14:55:45 +01:00
Niclas Finne
cdfa8708e3
* Added f2xxx for two series (for example z1)
...
* f1xxx is baseline and always included
* Cleaned up the names of uart and spi (no x in names)
* Updated SPI configuration for WiSMote
2012-01-09 14:54:57 +01:00
Niclas Finne
f4f84ffca4
Updated SPI config for faster SPI, split msp430/clock/spi into separate versions for MSP430/MSP430X
2012-01-09 14:54:01 +01:00
Niclas Finne
09082f02fe
Changed clock_delay to use the nop instruction
2012-01-09 14:49:39 +01:00
Niclas Finne
cd4be4927a
Fixed quick dco sync to also work with mspgcc
2012-01-09 14:41:42 +01:00
Niclas Finne
708f9d77d2
Corrected timing for higher CPU speed
2012-01-09 14:41:36 +01:00
Niclas Finne
05b10eb9ce
Initial WiSMote port based on code from Arago Systems.
2012-01-09 12:25:06 +01:00
Niclas Finne
367c82a5ab
added compiler flags and macros for IAR and mspgcc 4.4.5 compilers
2012-01-09 12:24:33 +01:00
David Kopf
b251619a2f
Add wpcap for cygwin/Windows native border router
2012-01-08 13:37:56 -05:00
Fredrik Osterlind
2644057fb2
using dma by default
2011-12-21 10:53:18 +01:00
David Kopf
81af871db9
Bugfix: use 16 bit tick count to adjust clock after sleep
2011-12-01 09:58:55 -05:00
Oliver Schmidt
e38f008b9b
The dependency on the ucontext functions has the potential to keep others from successfully using cpu/native for other platforms. As the Contiki multithreading library typically isn't used at all it's not worth the trouble. So we just limit it to Windows and Linux - where it is known to not only build but actually work. If someone needs the Contiki cpu/native multithreading library on another platform he's certainly welcome to add that platform - hopefully by just activating the codepath that we now made exclusive for Linux for his platform.
2011-11-30 23:41:39 +01:00
David Kopf
fb977cb9ef
Better fix for hardware FCS error on JTAG reset
...
Correct silly error introduced by trying to save two bytes.
2011-11-15 13:24:58 -05:00
David Kopf
31ba84eb75
Improve rf23x cca procesing
...
Fix delay_loop timing bug by using long long calculation.
128rfa1 and rf230 both working with contikimac RDC
2011-11-14 11:49:58 -05:00
David Kopf
d1cd3f213c
Add general unsupported interrupt vector suggested by Daniel Willmann
2011-11-14 11:36:18 -05:00
David Kopf
6eba721af1
Add rtimer_arch_sleep function, enabled with RDC_CONF_MCU_SLEEP
2011-11-14 11:10:35 -05:00
David Kopf
c2364897f8
atmega128rfa1 cca fixes, energest and rimestat macros.
...
Add option to return ACK to RDC layer when in extended mode, based on Georg von Zengen code.
2011-11-08 12:20:22 -05:00
Niclas Finne
bf299b1a07
Fixed splhigh/splx for the IAR compiler
2011-09-27 22:51:28 +02:00
Joakim Eriksson
5b1d9617c4
moved io and signal and IAR-GCC checks from driver files into contiki include file
2011-09-26 10:38:41 +02:00
Joakim Eriksson
95dde73618
fixed Sky platform for IAR compiler
2011-09-11 17:18:02 +02:00
David Kopf
f721f646fa
Adjust sleep time by ticks instead of seconds, proposed by Ivan Delamer
2011-09-10 12:44:49 -04:00
Adam Dunkels
4fd8133aa3
Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE)
2011-09-05 20:42:19 +02:00
Mariano Alvira
43910c1be7
don't worry about wraparound in rtimer_arch_schedule
2011-09-02 12:36:10 -04:00
Mariano Alvira
6c0bbc492b
change mc1322x rtimers to 32-bit
...
hardcode a close default value for the RTC
2011-09-02 12:32:47 -04:00
David Kopf
dfdae5b02b
This fixes commit 9a1ce7 for spaces instead of ....
2011-08-31 12:08:01 -04:00
David Kopf
470887eddd
Print elf size if ELF_SIZE is defined
2011-08-31 11:50:14 -04:00
David Kopf
9a1ce7cf75
Use enumerated tx return values
2011-08-31 11:40:23 -04:00
David Kopf
5f2b2074f0
Implement WITH_RPL option in makefile
2011-08-28 16:11:48 -04:00
David Kopf
bdec65b889
Fix typos and file endings
2011-08-28 16:04:36 -04:00
David Kopf
94fc40f736
Move LEDONPORTE1 define to contiki-conf.h, fixing typo.
2011-08-24 11:35:58 -04:00
David Kopf
09db159876
128rfa1 cca fix, NETSTACK_RADIO.off now returns 0/1 if radio off/on
2011-08-18 14:36:04 -04:00
David Kopf
53737d9a38
Use correct prescale factor
2011-08-18 13:58:20 -04:00
David Kopf
3ea102050b
Apply patch of Ivan Delamer for atmega1281 @ 4 MHz
2011-08-17 13:16:46 -04:00
David Kopf
36fa735323
Calculate best prescaler based on F_CPU and CLOCK_CONF_SECONDS. Inspired by patch from Ivan Delamer.
2011-08-17 13:15:26 -04:00
maniacbug
0990896f54
Added an .eu target to upload only the eeprom for AVR cpu.
2011-08-16 14:10:48 -04:00
maniacbug
8f0bb86c02
No strict aliasing for AVR
...
AVR build generates numerous aliasing errors. This -f switch silences them.
2011-08-16 14:07:06 -04:00
David Kopf
577215deca
Use 128rfa1 interrupts instead of timing.
...
Generalize DEBUGFLOW macro for use in multiple routines.
2011-08-15 15:06:38 -04:00
David Kopf
50d1086553
Add changes needed for contikimac
2011-08-13 11:38:38 -04:00
David Kopf
03ab525652
Option for nested rtimer interrupts
2011-08-13 11:35:03 -04:00
David Kopf
cdcb2c4744
CCA measurement was always returning busy
2011-08-06 13:48:52 -04:00
David Kopf
b70d2b3163
Remove duplicate code block
2011-08-05 17:34:38 -04:00
David Kopf
c9b19ce655
Change timer setups for arbitrary CLOCK_CONF_SECOND
...
Change raven to 128 ticks and enable 32KHz crystal as default.
2011-08-05 15:14:35 -04:00
David Kopf
e2ad2acde4
Add stk500 platform and changes suggested by Daniel Willmann
2011-08-03 11:18:55 -04:00
David Kopf
6ec85fe079
Add Iris port of Shinta Hatatani
2011-08-03 10:17:59 -04:00
Mariano Alvira
2b9f4e8fed
Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x
2011-08-01 19:50:46 -04:00
David Kopf
cf3241c5db
Add file needed for rpl border router
2011-07-24 12:07:39 -04:00
David Kopf
0bb585fd60
Replace WEBSERVER by AVR_WEBSERVER
2011-07-24 11:43:17 -04:00
Simon Berg
506eced1bc
Bug fix by Jonathan Chung
2011-07-22 15:07:52 +02: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
HATATANI Shinta
f4740a062a
IRIS port is working with uIPv6
2011-07-15 16:36:25 +09:00
Mariano Alvira
758fc37307
mc1322x: flush the rx fifos when full
2011-07-12 07:05:04 -04:00
Mariano Alvira
4cf9514aa9
fix gpio initialization for uart2
2011-07-09 14:33:03 -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
David Kopf
6ea7250af7
Change ctimer startup order, add multihop to wpcap and minimal-net platform.
2011-06-30 12:12:07 -04:00
David Kopf
c48b7ab78d
Add RPL nodes and border router to minimal-net platform (cygwin only)
2011-06-28 08:19:48 -04:00
David Kopf
6b434a553f
Implement SRAM routine of Georg von Zengen
2011-06-21 13:03:58 -04:00
Joakim Eriksson
af601dfb23
improved support for IAR compiler for z1
2011-06-05 00:21:47 +02:00
Mariano Alvira
33b32c61e9
Only insert an ack packet if the ack request bit is set
2011-06-01 13:47:05 -04:00
Joakim Eriksson
77ec0bfa0f
fixed the z1 platform and generic code used by z1 to work with IAR compiler
2011-05-25 17:21:51 +02:00
Mariano Alvira
724bcbd2d3
Merge remote branch 'libmc1322x/master'
...
Conflicts:
cpu/mc1322x/src/default_lowlevel.c
2011-05-14 21:19:47 -04:00
Joakim Eriksson
fd75050c67
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-05-13 11:53:45 +02:00
Joakim Eriksson
2c16538e6a
fixed support for IAR compiler
2011-05-13 11:52:42 +02:00
Salvatore Pitrulli
7a48110067
STM32W flasher utilities for Linux and Windows merged into a single folder.
2011-05-10 19:26:33 +02: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
Joakim Eriksson
3fa8da5ddf
fixed IAR compilation paths
2011-05-02 15:19:28 +02:00
Salvatore Pitrulli
5eabf33211
Added functions for deep sleep to mbxxx platform.
2011-04-27 18:12:23 +02:00
Mariano Alvira
d80449244d
Merge remote branch 'libmc1322x/master'
2011-04-20 21:23:47 -04:00
Salvatore Pitrulli
01a7a78a94
Fixed temperature ADC conversion bug on mbxxx.
...
The conversion was made from an incorrect source when
the GPIO pin was not PB7.
Added functions and macros used to select the correct
ADC channel.
2011-04-20 18:06:20 +02:00
Salvatore Pitrulli
aa968309af
Merge remote branch 'sf/master'
2011-04-16 16:27:10 +02:00
Niclas Finne
813489633c
Added missing include
2011-04-15 15:49:43 +02:00
Salvatore Pitrulli
4ff82b76e5
Removed -fsigned-char GCC compiler options.
2011-04-14 08:12:11 +02:00
Salvatore Pitrulli
0105057c44
Removed unwanted file.
2011-04-14 08:10:58 +02:00
Salvatore Pitrulli
0a0ad39c9b
Added weak symbols for STM32W exception handlers and other minor updates for the HAL.
2011-04-14 08:06:13 +02:00
Salvatore Pitrulli
57163c616d
Removed some warnings.
2011-04-14 08:05:21 +02:00
Salvatore Pitrulli
af8e58e063
Set LED pins to output when MB851 is in sleep mode.
...
This reduces power consumption.
2011-04-13 18:14:12 +02: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
Salvatore Pitrulli
6655c876f2
Added functions and example for deep sleep on mb851.
...
The added function let a process to make the system go
into deep sleep for maximum power saving.
The udp-ipv6-example shows how to use these new functions.
2011-04-08 11:53:48 +00:00
dak664
89741bd322
Exit on watchdog reboot call
2011-04-07 17:47:54 -04:00
dak664
581d081ffe
Don't use RF230_CONF_CCA_THRES if it is not defined.
2011-04-07 17:44:10 -04:00
Joakim Eriksson
f603c965c1
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-04-06 20:15:44 +02:00
Joakim Eriksson
928bf6b6c1
fixed cpu/msp430 for compilation with IAR compiler
2011-04-06 20:08:48 +02:00
Mariano Alvira
4f4e06c71b
Merge remote branch 'libmc1322x/master'
2011-04-06 05:56:06 -04:00
Oliver Schmidt
5da4faf71e
Allow VC++ to be used as alternative to GCC for building in the WIN32 target.
...
TODOs:
- Update README
- Add dependency handling
- Add rtimersupport
2011-04-03 22:32:11 +02:00
Oliver Schmidt
f83fb3704b
Replaced make-empty-symbols with empty-symbols.[c|h]
...
The symbol generation shell scripts cause CRLF issues on Windows/Cygwin again and again. Instead of fixing this yet again I opted to remove the symbol generation script at least for the "no symbols" scenario with two C source files to be copied.
2011-04-03 13:24:58 +02:00
dak664
a9cbbb4570
Add sneezer mode and tx power change
2011-03-23 18:08:07 -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
Salvatore Pitrulli
eb588f1aec
New HAL and SimpleMAC for STM32W108.
2011-03-22 19:35:49 +01:00
dak664
5dd7500d0b
Add configurable auto cca threshold and implement driver cca call.
...
Show smallest rssi in jackdaw menu.
2011-03-21 11:10:30 -04:00
dak664
d9b5bac953
Refactor with WATCHDOG_CONF_TIMEOUT
2011-03-14 16:14:47 -04:00
Mariano Alvira
74517b9df4
Merge remote branch 'libmc1322x/master'
2011-03-13 17:14:32 -04:00
dak664
59109b9893
Fix type, diagnostic interrupt code on conditional
2011-03-13 14:08:02 -04:00
dak664
a210e14d78
Add defines for watchdog configuration.
2011-03-13 13:45:12 -04:00
dak664
0b2d3d1615
Refactor clock code with optional interrupt optimizing.
...
Put periodic radio calibration on conditional.
2011-03-13 13:07:32 -04:00
dak664
0573ecd62f
Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki
2011-03-11 16:51:10 -05:00
dak664
bf5be5056f
Testing $OS works with cygwin and DOS command windows
2011-03-11 16:50:35 -05:00
Mariano Alvira
f2b92cfa98
mc1322x: remove bad rule from cpu Makfile
2011-03-11 16:32:25 -05:00
Mariano Alvira
59d7fad746
Merge remote branch 'libmc1322x/master'
2011-03-11 16:28:14 -05:00
dak664
6a5c8ff1c4
Include file needed for slip rpl-border-router build
2011-03-11 14:10:30 -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
dak664
de7bcda99f
avrdude and makefile changes suggested by Georg von Zengen
2011-03-08 13:07:00 -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
2c79ab4962
mc1322x: increase the heap to 4K
2011-03-05 16:52:35 -05:00
Mariano Alvira
befbd4a479
mc1322x: handle board file differently if cygwin
2011-03-04 16:54:59 -05:00
Fredrik Osterlind
dd7cec737d
removed obsolete leds_[color]() functions, replaced by leds_{on,off}()
...
allow LEDS_[COLOR] to be configured by platform-conf
2011-03-03 17:48:32 +01:00
Mariano Alvira
f0c27340c6
mc1322x: increase the HEAP to 2048 bytes: needed for COAP server.
2011-02-25 16:10:08 -05:00
Mariano Alvira
bea643bc4a
mc1322x: flush the radio rx queue in the receive process
2011-02-23 15:19:45 -08:00
Mariano Alvira
c12ab0d484
mc1322x: get the tx status for a packet and return the proper response.
2011-02-23 15:19:44 -08:00
Mariano Alvira
535b9d35d7
mc1322x: disable broken maca calls for now.
...
maca_on, maca_off, and contiki_maca_init don't work correctly;
they mess up address filtering.
disable them for now and fix them later.
2011-02-23 15:19:44 -08:00
dak664
46297de770
Allocate variable only when mass storage is enabled
2011-02-23 14:06:06 -05:00
Mariano Alvira
c857e57d2f
msp430: fix "implicit declaration of function" warnings in clock.c, by including watchdog.h
2011-02-21 09:23:52 -08:00
Mariano Alvira
8f9cf50e55
set timestamp packet attribute
2011-02-18 12:46:34 -05:00
Mariano Alvira
a86a0fbe0e
set lqi packet attribute
2011-02-18 12:46:10 -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
Mariano Alvira
bfb471c782
add proper arm flags and remove Makefile.src as it's not used.
2011-02-08 09:55:50 -05:00
Mariano Alvira
b1dd3fc063
use the CS toolchain by default:
...
http://www.codesourcery.com/sgpp/lite/arm/portal/release642
2011-02-08 09:55:23 -05:00
Mariano Alvira
81552d1f6d
add a tutorial for rest-example
2011-02-08 09:08:05 -05:00
Mariano Alvira
5c3ef556d9
add a dummy io.h for mc13224v
2011-02-08 09:07:54 -05:00
Mariano Alvira
f5ba70cd20
add heap and _sbrk to mc13224v
2011-02-08 09:07:23 -05:00
Mariano Alvira
9572baa71b
fix mc13224v led driver to only touch gpio used for leds.
2011-02-08 09:07:11 -05:00
dak664
5c098993df
Add initial file
2011-02-07 20:30:47 -05:00
dak664
b41e8f384e
Add initial atmega128rfa1 file
2011-02-07 20:28:17 -05:00
dak664
f1f32c8e6a
Add combined MCU and radio ATmega128rfa1
2011-02-07 13:46:34 -05:00
Mariano Alvira
2a75a4a5df
this fixes a major problem with the maca_process
...
Before it didn't do process_poll like it should and would add events
out of turn and mess up the event processor --- that would cause the
button to stop working after the unhandled events exceeded a max
number
this fixes maca_process to do a process_poll as it should. now the
button works fine and so does the radio.
2011-02-03 18:09:51 -05:00
oliverschmidt
8c87f85a1d
Made cc65 build compatible with make.exe from GnuWin32 and cmd.exe. We just live without the phony targets when building with cmd.exe - the next cc65 release will make the whole sed thingy obsolete anyway :-)
2011-01-23 16:30:30 +00:00
joxe
801a7e1149
fixed bug with uart DMA
2011-01-19 20:44:20 +00:00
salvopitru
5fcae86be3
Now it is putchar that has to be redefined (instead of __io_putchar), like other platforms.
2011-01-19 09:13:06 +00:00
adamdunkels
8f283b3989
Bugfix
2011-01-19 07:30:31 +00:00
adamdunkels
6f076dbe1a
A set of compiler options that reduce the size of the final code size and RAM usage with ~10%. Courtesy of Simon Duquennoy.
2011-01-19 07:24:37 +00:00
maralvira
68180c0574
use network 230 --- 802.15.4 no-FCS
2011-01-18 16:58:18 +00:00
adamdunkels
bb2e3b25bd
Larger default DMA tx buffer size, to allow SLIP operation. Warn if DMA is enabled, since MSPsim does not yet support it.
2011-01-18 16:07:16 +00: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
40bb4b80dc
whitespace fixup to sync with libmc1322x
2011-01-17 15:48:39 +00:00
maralvira
6fb75263f9
fix parsing and pcap generation for packets with multiple output lines
...
(those that are > 16 bytes).
2011-01-17 15:47:23 +00:00
maralvira
d82b004154
fix parsing and pcap generation for packets with multiple output lines
...
(those that are > 16 bytes).
2011-01-17 15:47:08 +00:00
maralvira
d0227afbed
cycle channel on keypress.
2011-01-17 15:46:27 +00:00
maralvira
c78e1e345e
add stdint.h
2011-01-17 15:45:02 +00:00
maralvira
0445a4f78f
add cmdline options to set the intercharacter delays.
2011-01-17 15:44:18 +00:00
maralvira
fb8c08ca7c
only use these stubs with linux toolchains
2011-01-17 15:42:24 +00:00
salvopitru
9aa734936f
RANDOM_MAX changed to RANDOM_RAND_MAX.
2011-01-17 10:08:14 +00:00
salvopitru
fb75503624
'BTM' can be defined to flash devices already in bootloader mode.
...
COFFEE_FILES changed to COFFEE.
2011-01-17 09:41:47 +00:00
salvopitru
a9b1b37bec
Added definition of BAUD2UBR macro.
2011-01-17 09:22:24 +00:00
adamdunkels
f002563e60
Tx on interrupts occasionally misses characters on output. Therefore we turn it off by default.
2011-01-09 20:44:14 +00:00
ksb
eb24078ffb
Converted CRLF line endings to LF
2011-01-05 17:16:42 +00:00
joxe
5b7b3da99c
minor fixes of DMA uart code
2011-01-05 13:36:38 +00:00
joxe
565fda47aa
added initial uart1 DMA rx support and required LPM requirements api
2011-01-05 12:02:01 +00:00
dak664
90a6d768ea
Keep track of sleeptime and display on status web page.
2010-12-23 19:41:07 +00:00
dak664
662b0e064c
Revert Larsson patch, setting this to 0x3f truncated jackdaw Tx packets to 64 bytes.
2010-12-22 22:49:16 +00:00
dak664
95982b40ba
$make will show avr-size once and only once whether or not a build needs to occur.
2010-12-22 21:13:09 +00:00
dak664
5b8e62ef4f
Patches from R Larsson
2010-12-22 20:10:00 +00:00
dak664
013c3ac2f8
Remove contitional on clock updating, it should always be done after a sleep!
2010-12-22 17:09:03 +00:00
dak664
44a2e34005
Resolve TIMER2 conflict between sleep and possible clock usage.
2010-12-22 16:50:30 +00:00
dak664
e3e1e04948
Add FCS comments and text2pcap dump routines of Roger Larsson.
...
Don't send last two byte to xmit buffer since they will be overwritten by the checksum anyway.
2010-12-21 04:25:15 +00:00
dak664
e4b0b3dc8c
Disable watchdog software counter. Nested watchdog stop/starts will not work, but the low power protocols will.
2010-12-18 20:51:11 +00:00
dak664
5623ad827b
Enable radio off and sleep modes.
2010-12-18 20:49:00 +00:00
adamdunkels
f370b217a5
Turned up the rtimer resolution to 32678 Hz.
2010-12-16 22:50:21 +00:00
adamdunkels
1d090ea0f5
Made configuration of CC2420 SFD timestamps easier
2010-12-16 22:49:33 +00:00
adamdunkels
c0fedd7661
Store timestamps in the cc2420 module instead of the cc2420-arch-sfd module
2010-12-16 22:49:12 +00:00
dak664
570f6e705f
Move conditional needed by previous commit.
2010-12-15 19:32:49 +00:00
dak664
aa7ad8c807
Add rf230_listen_channel routine to force RX_ON state for sniffing and to read rssi for energy scan.
2010-12-15 16:50:44 +00:00
salvopitru
d0db3fc39a
Added a check for Coffee start address.
2010-12-15 15:01:00 +00:00
dak664
1cc336f188
Conditional code to use hardware multiply by default.
2010-12-15 14:11:06 +00:00
salvopitru
5fe80dd99d
Added elfloader machine dependent code for STM32W.
2010-12-15 11:10:20 +00:00
dak664
c784e8bc46
Enable RX_START interrupt and read rssi at end of preamble when not using energy detect register
2010-12-14 22:34:18 +00:00
dak664
9c9d7ec5e9
Return TRAC_STATUS register when tx autoretry is enabled.
2010-12-05 17:28:29 +00:00
dak664
35b2ce0cdb
Add status page link, show correct rssi, fix indexing off array in ipv4 builds
2010-12-04 21:32:35 +00:00
dak664
58b7a19803
Hardware/software radio HAL patch from Roger Larsson.
...
Use CHANNEL_802_15_4 define for RF channel on all AVR platforms, default 26.
Remove hopefully unnecessary interrupt disable wrapper on eeprom reads and writes.
2010-12-03 20:42:01 +00:00
dak664
21b10e8021
Convert obsolete MCU_MHZ to F_CPU and add 14745600MHz case using patch from Tobias Schfer
2010-12-03 18:16:56 +00:00
dak664
0ba9846abd
Add macros by Roger Larsson to select between hardware or software SPI transactions.
...
Minor speed optimizations.
2010-11-30 19:47:40 +00:00
nifi
7110afdad5
added missing include
2010-11-27 15:27:20 +00:00
dak664
dc028b3f85
Get rssi correctly in either rx mode, clean up radio driver debugging
2010-11-26 20:39:15 +00:00
adamdunkels
149f4e8d21
Enable the watchdog for rtimers too. Removed the disabling of the TACTL - it should not be needed, and interferes with the timing behaviour of stable rtimers
2010-11-25 09:22:56 +00:00
dak664
880233a451
RSSI read fix (use ED register in AACK mode), add reduced power configuration for miniature mesh testing.
2010-11-24 18:46:57 +00:00
adamdunkels
4fac3037e0
Fixed a bug found by Moritz Straube - writing to the internal flash would lock up contikimac. The problem was due to the IFG1 being reset to zero before writing to flash.
2010-11-15 21:52:54 +00:00
dak664
69ef9d57eb
sizeof(*) is sizeof first array element
2010-11-12 17:24:36 +00:00