From: Adam D. <ada...@us...> - 2012-07-16 20:25:54
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "contiki". The annotated tag, 2.6 has been created at b8dd4672f5a7b78bb84852ee8479a2b8126728ba (tag) tagging a3e56371a59e27f49464b41cdebc30c5e0ef00c1 (commit) tagged by Adam Dunkels on Mon Jul 16 22:25:15 2012 +0200 - Log ----------------------------------------------------------------- Version 2.6 Adam Dunkels (142): Test commit test commit testing commit testing commit Yet another test commit Testing another commit Set default number of retries to 8 to make the netperf command more robust Merge branch 'master' of github.com:adamdunkels/contiki-2.x Added the low-power streaming mode where frequent channel checks are performed when streaming is on. Enabling this will (by setting WITH_STREAMING to 1), however, significantly slow down Cooja/MSPsim simulations. Added a PACKETBUF_ATTR_STREAM_END packet flag Explicitly turn LEDs off if the command is interrupted Set the end-of-stream flag on the TCP FIN packet Scripts for manipulating and calculating statistics from .csc files Rewrote the parent selection to favour parents with a low ETX and a good rank. The old parent selection would always favour parents with a lower rank, regardless of their ETX, which in some cases lead to suboptimal parent selections. Also, the old code was buggy in that it would always pick the worst parent (the one with the highest ETX). Changed the variable name local_confidence to etx to better reflect what it was used for Added a hysteresis when choosing a new parent: don't switch parent unless the ETX is significantly better (1.5 ETX better). Slight code complexity reduction Don't remove all parents that have a worse rank than an incoming DIO: we may inadvertently remove our preferred parent. Instead, remove parents with a rank that is worse than our preferred parent. If we are lucky, this will give us enough space for the new parent. Don't add neighbor as a potential parent if its rank is too high. Use DAG_RANK() macro to compute rank Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix. Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix. Changed the name of macros defined in neighbor-info.h to have the NEIGHBOR_INFO prefix. Make sure we don't remove the preferred parent Made the number of MAC sequence numbers to remember configurable Made the number of MAC sequence numbers to remember configurable; fixed bug with power attribution to the idle state. Moved the backyard/ directory to contikiprojects Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Added the computation of average loss rate Fixed bugs in the types to the printf arguments Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Bugfix: print out the correct total idle transmit and listen time Flush before computing accumulative power Bugfix: idle power consumption was sometimes misestimated for transmissions, when a duty cycle rtimer fired in the middle of a transmission Bugfix: energy consumption for retransmissions was miscounted Rime sniffers must be called for all transmissions, even if they failed, to get energy attribution right. This means that rime output sniffers now also must take the MAC transmission status as an argument. Made ContikiMAC/8 default on z1 platform; enabled power profiling by default Added a motelist target that is the same on both sky and z1 Collect view for z1 Bugfix: IPv6 address to Rime address traslation did not appear correctly in the Collect-View GUI. Bugfix: removed extreanous asterix character The Z1 platform has LEDs A significantly simpler API for sending UDP packets A significantly simpler API for sending UDP packets Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Example code for the simple UDP API Simulation file for the broadcast example Simulation file for the unicast example Made the simple UDP examples simpler To avoid ambiguity, address should be explicitly set by caller, not automatically by the module. Explicitly initialize module if it wasn't initialized before the first registration Update to new API Added some defensive programming Made the number of phase neighbors configurable Copyright headers Updated for git (intermediate commit - not sure this works yet!) Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Include stdlib.h for the NULL macro Copy the string first, since shell_output_str() does not ensure constness of the first string Don't include the deprecated netsim platform Fixed includes Fixed previously erroneously fixed include Print out sender IPv6 address when receiving data. When sending data, include a counter in the message. Removed the deprecated netsim platform. Added z1 and redbee. bugfix Minor code style fixes Made the ContikiMAC header configurable from contiki-conf.h Added a SICSLOWPAN_CONF_COMPRESSION_THRESHOLD that can be used to set a threshold under which header compression should not be used. Below this threshold, headers are not compressed but sent as full IPv6 packets. This is useful for RDC layers, such as ContikiMAC, which set a lower bound for packet size. Small spelling bugfix Use the SICSLOWPAN_CONF_COMPRESSION_THRESHOLD to avoid compressing IPv6 packets smaller than 60 bytes. This allows us to use ContikiMAC without its header, making it 802.15.4 compliant again. Cleanup of the ContikiMAC code; removed the old an unused announcement code Cleanup of the ContikiMAC code; removed the old an unused announcement code Include string header Be a little more conservative in terms of what headers not to compress Fix names of avr-raven platform Made the sky and z1 platform handling of PROJECT_CONF_H the same as the other platforms: the makefile should define PROJECT_CONF_H to be the name of the header file to include. This header file should #undef everything it #defines, as it is included after all the other configuration options in contiki-conf.h Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Remove debug output to save space Added a safeguard to fragmentation reassembly: if there are additional bytes in the final fragment, we shave them off in the spirit of being 'liberal in what we accept' Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) Set default RDC wakeup rate to 8 hz Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki If no MAC is defined, create one from the node ID Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Updated to use latest Rime APIs Compile with SMALL=1 to make binary fit in memory Compile with SMALL=1 to make binary fit in memory Added SMALL=1 to make code fit on Tmote Sky Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Bugfix: PROCESS_PAUSE() must explicitly check the event type, otherwise we may cause the process event queue to fill up if we repeatedly call PROCESS_PAUSE() while other (broadcast) events are posted as well, such as timer events. style fix; added fas check for cycle_time being a power of two or not. Removed obsolete platforms Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Disable phase shift correction by default Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Made collect retransmissions and broadcast announcements timers depend on the rdc wakeup rate Update to the newest RPL API Default to SMALL unless otherwise specified, to get size of binaries smaller so that Contiki with RPL/IPv6 fits on the Tmote Sky again. Reduce size of the neighbor table entries to make RPL fit into the Tmote Sky RAM. Contiki port to the TI EXP5438 MSP430x5438a experimenters board MSPsim with support for the MSP430x architecture Removed erroneous character from first line of file. Increased wait time between main loop polls; cleaned up the code to Contiki code style standards; moved process autostart code to after network setup simple-udp should be included in the IPv4 build as well. small code style fixes; removed left-over function call Set executable flag on binaries Set CCA threshold before starting, to make ContikiMAC more efficient. Fix compilation problem with non-IPv6 compiles. Various style fixes. Bugfix in clock_wait() declaration. Various style fixes. Refactored window title that was duplicated in multiple places General cleanup and fixes of texts and labels General cleanup and fixes of texts and labels Renamed simulation visualizers to simulation visualizers, from simulation visualizer skins Updated control panel quickhelp Ping slower to allow routes to settle Set default look and feel on Linux to Nimbus. If Nimbus is not available, Added an isRunnable() method that returns true if the simulation can be run. Updated menu item name to indicate that a window is opened when selecting it. Placed the radio medium selection in the Advanced settings frame. Close window when clicking the Save button. Fixed menu item name to be consistent with others Reimplementation of the context menu, which was difficult for newcomers to find, Set Notes window to open by default. Reimplemented the context menu, which was difficult for newcomers to find, Rewrote the context menu and the custom left pane as menus, to make the Rewrote the script editor to use real menus instead of the custom buttons Removed traffic counters from the main canvas. Rewrote the code to use real menus instead of relying on context menus for top-level operaions. Updated menu item name to indicate that a window is opened. Updated menu item name to indicate that a window is opened. Updated imports The __delay_cycles() function in the latest mspgcc takes an unsigned long argument but does not allow it to be larger than 65536. Bugfix: viewers were not correctly ticked off in the menu when a simulation was loaded from file. The current fix feels like a hack through. Rewrote the traffic history visualization with blue arrows that fade Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Updated file permissions Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Bumped version number Updated README with new website and shorter text Bumped version number Antonio Lignan (3): Squeeze websense example Add disable function to I2C driver Zolertia's light sensor ziglet David Kopf (129): Test git commit Merge branch 'master' of https://github.com/adamdunkels/contiki-2.x Test TortoiseGit commit from Vista laptop Update description of make process. Implement SRAM routine of Georg von Zengen Add RPL nodes and border router to minimal-net platform (cygwin only) Allow ipv6 builds on win32 platform. (webserver6 builds with cygwin, needs changes for VC++ compiler) Restore lines that were excluded for VC++ test build Include status cgi's with explicit define Change ctimer startup order, add multihop to wpcap and minimal-net platform. Add higher baud rates, fix occasional buffer overflow Add template for AUTOSTART_PROCESS Tag version commits and override CONTIKI_VERSION_STRING with git describe Replace WEBSERVER by AVR_WEBSERVER Clock seconds since startup on minimal-net Add WITH_WEBSERVER=<webserver> options Add /apps/webserver-nano Add file needed for rpl border router Raven-webserver needs raven-lcd-interface Fix avr progmem string accesses, add DEBUGLOGIC, configure sky defaults Add explicit RADIOSTATS to platform contiki-conf.h gcc 4.4.1 - 4.6.0 compiler bug workaround. Add Iris port of Shinta Hatatani Use PROCESS_NAME_STRING macro to handle NO_PROCESS_NAMES avr-libc %.*s workaround Add stk500 platform and changes suggested by Daniel Willmann Restore micaz/dev/clock.c, mysteriously renamed to iris/dev/sensors/battery-sensor.c Assign aaaa:: prefix if HARD_CODED_ADDRESS not defined Add gitclean and distclean options to /tools/Makefile Change timer setups for arbitrary CLOCK_CONF_SECOND Remove duplicate code block CCA measurement was always returning busy Get random seed from noisy ADC conversion at startup. Option for nested rtimer interrupts Update to proper webserver define Add changes needed for contikimac Let RPL examples enable platform RPL Free rtimer for contikimac, add print-stats option Use 128rfa1 interrupts instead of timing. Free internal webserver from dependency on /apps/webserver. [Forget to add to previous commit] Minor tweaks based on maniacbug commits. Add CONTIKI_PROJECT to the makefile, enabling make upload. Remove inclusion of preprocessor directive in macro expansion. Some gcc's do not like that. Calculate best prescaler based on F_CPU and CLOCK_CONF_SECONDS. Inspired by patch from Ivan Delamer. Apply patch of Ivan Delamer for atmega1281 @ 4 MHz Account for 16 bit rtimer wraparound, else ENERGEST way underreports AVR times. Use correct prescale factor Make comparison endian-safe, thanks Ivan. 128rfa1 cca fix, NETSTACK_RADIO.off now returns 0/1 if radio off/on More reliable webserver-nano build Add periodic prints and stack monitor Add warning about slip overrun Add timestamp option, print strings after CR Move LEDONPORTE1 define to contiki-conf.h, fixing typo. Correct typo Trap CR in framed debug string Allow selection of slip port makefsdata must be run with HTTPD_STRING_ADDR Fix typos and file endings Implement WITH_RPL option in makefile Add serial logging tool. Add settings manager with program flash defaults, random routine, periodic prints with ENERGEST, node-id. Use enumerated tx return values Refactor with params.c, h Print elf size if ELF_SIZE is defined output buffer unused at present, save some RAM This fixes commit 9a1ce7 for spaces instead of .... flash led on tcp get, fix pingbacks on rpl build, patch web data for params Adjust sleep time by ticks instead of seconds, proposed by Ivan Delamer Drop unneded null byte at end of httpd-fsdata files. Revert rules to rebuild httpd-fs.c and httpd-fsdata.c Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki Add ENERGEST, RIMESTATS, COMPOWER to status page Better formatting of webserver-nano status page Add missing includes, remove unimplemented function declaration. Fix sd6 typo Use fixed font for neighbors and routes Avoid infinite loop when printing garbled packets Add streaming ajax page with csv text buffer Condense js file and hopefully convert to unix line endings. Move r.abort to stop button so IE9 can stop ajax streaming. atmega128rfa1 ajax power and sensor reporting, longint calculation bugfixes. atmega128rfa1 cca fixes, energest and rimestat macros. Reverse node_id bytes, patch from Geog von Zengen Add rtimer_arch_sleep function, enabled with RDC_CONF_MCU_SLEEP Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Add general unsupported interrupt vector suggested by Daniel Willmann Add Raven battery display to status page Improve rf23x cca procesing Get better random seed on startup Add params.c to Raven and sync with 128rfa1 contiki-conf.h Add RDC_CONF_HARDWARE_CSMA, RDC_CONF_HARDWARE_ACK, RDC_CONF_MCU_SLEEP, CONTIKIMAC_CONF_SHORTEST_PACKET_SIZE for use with hardware having those modes. Better fix for hardware FCS error on JTAG reset Bugfix: use 16 bit tick count to adjust clock after sleep Add optional correction for phase drift of receiver. Add 921600 baud to slip options, fix compiler warnings Add wpcap for cygwin/Windows native border router Add F_CPU=0x800000 option with phase lock to external 32768 Hz crystal Adjust cycle starts when RTIMER_ARCH_SECOND not a power of two. Access uart registers directly instead of through intermediate addresses in a RAM struct. Merge branch 'master' of github.com:contiki/contiki-mirror Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki Remove unused SPI initializer flag from AVR. Comment out in the msp-430 template. Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki rf230bb updates: involves setting the 801.15.4 pending bit, Make static buffer the default, add comments. Webserver-nano: Add page load times, remove workaround code for bug in arm strformat.c, correct the double count of leading zeros there. Fix minimal-net webserver6, broken after native border router changes. Turn off RDC before SLIP prefix interchange. Disable SIN/SUT prints, leave off-route prints. Move address initialization to after proce_init. Something in that now wiping the address array. PROGMEM changes needed for newer avr-gcc compiler Add missing mtarch_stop function Several bugfixes Add PAGETITLE option to webserver-nano, compress status page white space. Eliminate unused variable warnings. Dummy test of PT_YIELD_FLAG does not change program size. Add higher baud rates, option for link-local address assignment Redo html output, more options, httpd state variables to allow neighbors and routes to span tcp segments. Add display options to border router web page, default now uses stack instead of static buffer. Add variable update time for Ajax display. Update status.shtml with <pre> tag now used by cgi. Fix wrong register addresses. Restart ajax on changed update time, remove unused variable. RPL is now default. Change Huginn and Muninn for params.c storage Add clock_delay_us and clock_set_seconds to clock.h. Modify clock_wait to use clock_time_t. Reorder includes to prefer platform routines. Remove redundant RPL define. Ensure MAXDADNS is defined in uip-ds6.h Enable check on received length to prevent buffer overflow. Thank you Cooja! Prefer UART0 for stdout; move DEBUFGLOW macro below definition of uint8_t Patch from Landon Fuller adds const to PROGMEM, required for newer avr-gcc Enric (1): updated .gitignore with _del/ and tools/ Enric M. Calvo (47): Corrected some typos in the PORT1 ISR function. Updated *-sensor.c files from the sky platform. Merge commit 'upstreamsf/master' Added MAC overwriting/burning capability to the Z1 Updated *-sensor.c files from the sky platform. Added MAC overwriting/burning capability to the Z1 Merge branch 'master' of gi...@gi...:enricmcalvo/contiki-2.x Added Potentiometer sensor in Z1 Platform .gitignore file added Definition of Z1 Starter Platform in contiki/platforms + LEDs + Potentiometer Removed unwanted files modified .gitignore Added a quick sht11 sensor driver support for Z1 Fixed radio and contiki conf to get RIME working corrected adxl345, ISR was not disabled, now it is. optional lines in Makefile.common Set QUEUEBUF_CONF_NUM to 4 to avoid .data overflow XXX Interrupts by cc2420 & adxl345 compatible now Corrected contiki-conf.h to include project-conf.h Sky-websense compiles for Z1 (testing) Added dummy light driver. Now skywebsense likes Z1 examples/sky-shell now runs out-of-the-box on Z1 Modified contiki-conf.h and added sensys-scanner. Correceted cc2420 function calls+modified makefile Added ViewRSSI3D example. Merge branch '500-rime-examples' Cleaned up rssi-scanner example directory added example unicast with temperature added makefile added example-unicast2.c Modified Makefile and test-potent.c for ICTPWSN added mV test-battery file added example-unicast2 and 3 for ictp Merge branch 'master' of gi...@gi...:enricmcalvo/contiki-2.x M Makefile.common to add tmp102 sensor by default ICTP: lowered radio power + print unicast data added temperature-sensor to Makefile.common Added IPv6 z1-websense demo w/MSP batt&temp sensor Meaningful units for msp temp&batt sensors ictp:z1-websense with battery in mV minor tweaks to z1-websense and .gitignore modified gitignore Cleaned up z1-websense.c file Cleaned up some files, moved z1-websense example Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki into master_cleanup removed modif. to sky files cleaned up main François Revol (1): Fix some typos. Fredrik Osterlind (184): LEDS_ALL configurable fixed line endings Merge branch 'refs/heads/master' of https://fro...@gi.../adamdunkels/contiki-2.x.git into HEAD example of adding cooja-platform mote interface manually support for tinyos style node ids, to simplify testbed experiments using memory breakpoints instead of polling memory region during prerequisites download info fixed line endings removed debugging output disabled tos mode for serial output (appears to be broken) + log fixed line endings only show error dialog when visualized Merge branch 'refs/heads/master' of https://fro...@gi.../adamdunkels/contiki-2.x.git into HEAD removed CVS-specific ignore files noise radio, to be observed by radio mediums doc tracked components shown in tooltip capture effect (3dB) + noise source radio support removed debugging output moved radio interface visualizer code to shared abstract radio replacing unterminated binary data with warning log message moved radio interface visualizer code to shared abstract radio implementing noise source radio include source radio when noise level changes moved radio interface visualizer code to this abstract radio handle pending simulation thread events before simulation starts, just bug fix: signal strenghts may not be registered organized imports towards importing testbed profiles into dgrm removed execute flag of source files (avoids diff problems with egit) removed obsolete leds_[color]() functions, replaced by leds_{on,off}() added simple example demonstrating user-defined timeout function get[Started]Plugin method returns plugins that end with argument + added sim and gui variables accessible from test scripts bugfix in writing tinyos addresses added clean button to compile dialog, added compilation tip tab for msp motes unregistering visualizer skin removed incorrect visualizer skin registration simplified mote selection in visualizer skins enables sharing mote-specific properties minor fix on locating config file improved api read .gz files example code for manually configuring sky motes MAC addresses added writeFile method to be used from scripts quick hack for reloading script from disk when script is activated help class that simplifies implementing serial forwarders * bugfixed and rewrote MRM to improve configurability example directional antenna try to restore edges loaded from old simulation configuration improved capture effect support in mrm: capture effect is effective if the latter transmission is stronger and no later than half the preamble updated doc append to file static method for compressing ipv6 addresses new cooja plugin for monitoring memory areas, similar to the log listener. Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki no newline added by echo command using dma by default hex conversion and crc shell commands added cooja mote type using mspsim's msp430x platforms (ti's exp5438) Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki activated exp5438 platform in cooja help method for converting from hex string to binary make clean method public public clean method, and broke out add log messages method updated to mspsims new watchpoint api new watchpoint api, and method that allows for manipulating simulation time without affecting the method that returns the next wakeup time save command history with configs method for emptying simulation event queue minor bug fix to avoid need for updating filesystem twice initially bleeding edge mspsim.jar new mspsim.jar with msp430x fix: test failed since shell echo no longer appends a newline bug fix: rpl was not included correctly more informative error messages at simulation error improved source info, added optional stack trace tooltip possibility to disable individual columns from auto-resize added stack trace method stub improved mspsim-connected regarding command handlers and context, implemented stack track method using new mspsim cli api new mspsim.jar, supporting the recent changes in bufferlistener bugfixed stacktrace tooltip avoid awt thread floods from mspsim cli output minor bugfix: side panel height was wrong when plugin started removed unnecessary overrided methods bugfix: mspsim may not have pc information, causing exception in buffer listener Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki capturing exceptions from radio logger - some packet analyzers seems to be buggy improved code: uses log mote interfaces observers directly, instead of going via the sim event central added mote interface method to be called when add mote interfaces have been added. useful if the mote interfaces want to observe each Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki all mote memories now support symbol addresses added support for mapping Cooja motes' and Contiki's address using memory monitor instead of previously used time events added objcopy external tools configuration implemented memory monitor support (moved previous functionality from MspMote to MspMoteMemory) added memory monitor stubs to avr memory added target to force running cooja in 64-bit mode simulating 1 ms turnaround time (before transmissions) by default, and no transmissions on channel busy updated contiki mote compiler tests to again reflect contiki-cooja-main.c and the updated ContikiMoteType added support for readonly memory sections rewrote code completely: radio medium bugfix: a combination of changing channels while radio is off and with a nearby ongoing transmission, and added missing objcopy external paths config send empty packet if node reboots during transmission removed debugging output, code style added jsyntaxpane library, to be used by MspCodeWatcher and the Contiki Test Editor plugins simplified usage of Watchpoint and WatchpointMote interfaces mspsim motes now implements new WatchpointMote interface, simplified code reworked MspCodeWatcher plugin: using jsyntaxpane to display Contiki code, using tabs instead of splitpanes, easier to using jsyntaxpane as javascript editor, added ui controls to link test scripts to a file on disk ensure mouse-triggered event popups are not outside screen, updated to use new watchpoint interface quickfix to allow running in headless mode some bugfixes regarding timeouts in test scripts, with simplified code removed debugging output code style documenting potential bug supporting multiple path substituion rules in mspcodewatcher bugfixed parsing of files read from mspsim added temporary workaround that removes file duplicates, removed warning message disable editor when no source code is showing added powertracker plugin as default cooja plugin. the powertracker plugin was previously available via contiki projects. example script demonstrating how to interface powertracker plugin added possibility to save default visualizer skins avoid exception when cooja runs in testmode bugfixed race condition removed debugging output bugfix: breakpoints should only trigger once Added new annonation with which Cooja components (e.g. mote plugins) can be activated minor bugfix: did not compile with PROCESS_CONF_NO_PROCESS_NAMES=1 Demo simulation and nightly test of rpl border router and coap rest server, based on the simulation example in resizable dialog improved debugging output default compiler set to mingw32-gcc (verified to work on version 4.5.2/4.6.2), removed obsolete -mno-cygwin flags when compiling under cygwin new experimental feature: possibility to change mote types when loading a simulation disallowed starting plugins/visualizer skins for non-compatible motes/simulations disable plugin menu items if not supported cleaned up some unnecessary methods: empty mote constructors (created from mote type), setInterfaces/setMoteType methods reverted previous patch that broke compiling on Instant Contiki bugfix in fragmentation test mode: avoid reading from outside buffer placed on stack added radio logger with 6lowpan filter cleaned up the mote type visualizer code cleaned up more mote type visualizer code using loopback as default network interface bugfix: transfer did not terminate correctly when last packet was full updated test: shell command echo no longer includes a newline -> updated expected final file size, improved debugging output increased inter-rucb-transfer delay to avoid problems in lossy networks compiling with SMALL=0 to avoid problems with Contiki's elf loader removed io.h include, now handled by Contiki to support more compilers bugfix: ptr must be preserved until psock has finished bugfix: slip must be initialized after ctimer, as it uses ctimers set loopback to default network interface, improved simulation layout updated to use the renamed examples under /examples/er-rest-example, bugfix: gui-dependency caused nullpointer exception in test mode using example-specific connect-router-cooja target, to automatically build dependencies (e.g. tunslip6) avoid gcc optimization bug by extracting struct values bugfix: control messages were lost due to lack of buffers; wait for buffer before sending added getting started quickhelp menu item, made quick help sticky simplified the external tools configuration with a single common file that is always loaded extracted quick help interface to a separate file, moved plugin-specific quick help from quickhelp.txt to the plugins themselves verify that visualizer skin is compatible with the current simulation before starting it, fixed Tools menu mnemonic (P->T) minor window title fix simplified and bugfixed Cooja's IP address interface, added two save simulation before exit renamed radio method isReceiverOn() to isRadioOn() replaced Simulation's setDelayTime(ms) method with more intuitive setSpeedLimit(ratio) bugfix: use new setSpeedLimit(ratio) method in simulation instead of old setDelayTime() Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki added hello world simulation tests for exp5438, z1, and wismote. removed unused code including simulation observers, making the code cleaner and more efficient simplified skin menu implementation, removed unused skin button code removed unnecessary warning fixed menu bug that caused menu items to be enabled although script was active improved repaint efficiency and fixed concurrent modification bug improved workaround to disable the code editor pane's built in run functionality: remove keyboard shortcut instead of implemented zoom menu and added keyboard shortcuts added support for mote interface requirements in SupportedArguments annotation minor bugfix: start/stop simulation keyboard shortcut was not enabled correctly removed obsolete exit cooja keyboard shortcut from quick help rewrote tools menu code to allow access to mote tools directly from the main menu simplified SerialUI implementation: code was both complex, buggy and contained unused broken functionality (slip, tos mode) reverted previous plugin name changes, instead build displayed names when menu is created removed unused ipdistributor code: was previously used to assign IP addresses to simulated motes, George Oikonomou (56): Fix compile errors with SDCC sicslowpan doesn't need to remember the mac driver Reincarnate the sensinode/cc2430 port New platform: TI cc2530 Development Kit Fixed the stub-rdc driver used by various cc2x30 examples Turn off printf for sensinode examples which will otherwise not fit our flash Fixed mis-formatted printfs Some uN_t had crept back in cc2530dk and sensinode. Adjusted check to determine if we are being built with SDCC Changes to the ping part of the cc2530 and Sensinode udp-ipv6 examples Wrapped cc2x30 SOFT_RESET() macro inside do {...} while(0) We've not been using the cc2430 converter for a while now Deleted the old Sensinode 'read mac from flash' routine. Solved a text encoding issue For cc2x30, moved CLOCK_CONF_SENCOND to the cpu dir. Renamed sensinode-debug to debug Removed obsolete #if config from cc2530dk's main Renamed a config define to better match contiki's naming philosophy cc2x3x clock driver cleanup Deleted obsolete macros. Minor formatting Stack-friendly cc243x clock ISR enabled by default Comment rewording and formatting Ported the stack-friendly clock ISR code over from cc243x to cc253x The cc2530 UART driver was sending a 0 down the line on init Added an ASM(foo) macro for cc243x cc2x3x clock_delay(len) now delays for approx. len usecs Improved cc2x30 timer test examples Fixed a documentation typo Simplified the cc2530dk STARTUP_CONF_VERBOSE spaghetti and made it project-configurable The cc253x Makefile specifies SoC flavor Added support for reading MAC from the cc253x flash We can now use SDCC's __nonbanked feature The cc2530dk Makefile was adding a source twice cc2531 LED support cc2531 B1 support. B2 to come Redefined LEDS_ALL for cc2531s The cc2530dk blink-hello example now makes sense for cc2531 Platform cc2530dk now uses models.h to configure differences between the SmartRF and the 2531 USB stick cc2531 Button 2 driver cc2530dk example comment fix Offload some bytes off the cc2x3x stack for the sensinode & cc2530dk udp server example Fixed a typo which was preventing the cc253x watchdog from starting cc2530 watchdog improvements and cleanup The cc2530 button driver would fail to compile if the user disabled button support Easily configure B2 on the cc2531 USB stick as a General-Purpose or Reset button cc2530dk and Sensinode example udp server code cleanup Adjust cc2x3x ports to the new clock API Minor Sensinode build cleanup cc2x3x RPL/non-RPL handling: Fixed an SDCC compile error when UIP_CONF_ROUTER is 0. UIP_CONF_ROUTER can be configured in project-conf.h Bugfixed the cc253x UART0 init (Thanks, Deng Jian) Fixed the cc2530 RSSI adjustment Renamed a cc253x SFRX to stop namespace conflicts Bugfixed the cc2530 LOW_POWER_RX configuration Added channel_get() to the cc2x3x RF drivers Improved handling of cc2x3x rf_flags HATATANI Shinta (11): create iris directory IRIS port is working with uIPv6 Now iris port works with tunslip6 (Thanks to Suhas K) create iris directory IRIS port is working with uIPv6 Now iris port works with tunslip6 (Thanks to Suhas K) some trivial change Merge branch 'master' of https://github.com/shinta-h/contiki-iris merge iris and micaz change some examples for iris some fix Ilya Dmitrichenko (9): Simplified host OS platform detection in Makefiles Missed `ifeq ...` Added TODO note regarding flavours of Windows. Fixed TARGET=native compilation issues on Darwin. Fixed baudrate issue on Darwin. Fixed ifconfig for Darwin Use `__APPLE__` instead of `__MACH__`. Avoid deprecated error on Darwin. Fixed TARGET=minimal-net compilation issues on Darwin. Ivan Delamer (12): Fixes small bug in uip-nd6.c: when a packet is sent before DAD is Bug fix: do not overwrite NS or RA messages otherwise generated in the Compress UDP header when UIP_CONF_UDP is disabled but we are routing Improved rf230bb.c synchronization/locking. Removed unnecessary locks Do not remove infinite default routers when PROBE fails. Ignore 6LowPAN fragments which won't fit in UIP_BUFSIZE (in case Separated processed_ip_len into processed_ip_in_len and 6LowPAN: check tx result, if fail then do not send subsequent remove unnecessary stimer call in tcpip_ipv6_output() Simplified reachability detections by sending probes only in PROBE Remove compiler warning for remove_ext_header(). ATmega128RFA1 bug fix: no interrupt pin used (embedded radio). Jim Paris (38): Allow parent makefile to override these variables Use "rm -f" in clean rules to ignore errors Add script to invoke kermit with a particular port and speed Add missing type for TMR0_COMP2 Makefile cleanup. Add structure-based timer register definitions Add structure-based GPIO register definitions Fix typo -- no ROMVARS for normal targets. Remove old config.mk Pretty-print the output by default. Fix typo, used wrong name for TARGETS_WITH_ROM_VARS. Handle empty board.a (no COBJS defined) Put main dir on include path Fix #ifdefs in board files Add pin definitions for each timer, they're fixed Move startup code into its own section so the linker can place it first Remove unused code Add macro to help compute TMR.ENBL values (useful when using #defined Force linker to treat "_start" as undefined, so it pulls it in from src.a. Add structure-based CRM definitions Add cal_isr() support REF_OSC is a 32-bit number, not 64-bit number Add structure-based ITC access Register definitions: get rid of some macro magic that doesn't help much Add some useful timer macros Add rule to disassemble .o files Add TMR_ADDR helper Another rule to disassemble board objects Support hardcoded dependencies, for generated files Use a variable for all target objects Fix a makefile dependency with libraries Clear BSS at startup Move stack near BSS so it doesn't take up space in the .bin Add the disable_int({}) macro Provide a function to change timer interrrupt handlers Name the GPIO structure so we can set multiple bits at once Add gpio_set and gpio_reset Always make directories before building files in OBJDIR Joakim Eriksson (78): made rank calculation depend on selected parent when joining DAG fixed bug in coojas iphc packet analyzer added more verbose data on RPL-DIO messages fixed so that minhoprankinc is configurable fixed of0 to respect min hop rank increase added annotate when setting root and joining dag made DIO parameters configurable Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki fixed format of transit subopt 16-bit addr compression fix minor cleanup of 16-bit compressable macro and comment reverted to byte-based iid check Merge branch '6lowpan-16bit-fix' fixed the prefix query fixed RPL statistics bug and added parent switch stats Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki fixed so that the specified interface mac address is used when adding neighbors fixed parsing of address to handle [<addr>] Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki fixed so that ] is accepted as end of IPv6 address added psock function for reading specified number of bytes fixed bug in 6lowpan compression when compressing fixed support for IAR compiler Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki set expected reception sequence no to zero - to get initial connection to avoid having ack-number other than zero changed ext to link_metric fixed cpu/msp430 for compilation with IAR compiler fixed for compilation with IAR compiler Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki fixed RPL to handle inifinite rank better Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki fixed IAR compilation paths fixed the z1 platform and generic code used by z1 to work with IAR compiler added debug to sht11 driver and made it more configurable Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki added delays in CC2420 to avoid risk of configuring before CC2420 is powered on improved support for IAR compiler for z1 added line to parse when receiving UDP packets fixed bug in UDP packet handling Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki added analyzer for raw IPv6 Send DAOs if dtsn differs instead of only when larger than last dtsn in DIO Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki fixed bug in analyzers that caused looping analyzers and exceptions fixed Sky platform for IAR compiler some fixes to cut some extension headers before TCP processing moved io and signal and IAR-GCC checks from driver files into contiki include file added static on the list send functions to get less compiler errors with IAR compiler added powertrace to IPv6 including an example fixed so that rpl avoids sending no-path DAOs when changing parent when in NO_DOWNWARD mode of operation Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki fixed powertrace attribution for 6lowpan traffic added debug callbacks made linkable with IAR linker - avoiding multiple defs of rime_sniffer, etc Changed FRAMER to return negative values for error to allow 0 size headers. Added api for reading out tmp100 x100 temps Fixed uiplib to stop parsing IPv6 address when at length part Made native main loop sleep a bit more fixed so that it works for non IPv6 applications added parsing of frame to get receiver address, etc changed so that ext hdr len code checks against buffer size instead of link mtu added timestamp to neighbor info fixed loop detection bug in RPL fixed extension header handling increase uip buffer size for native border router fixed lollipop counter Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki tuned RPL parameters and improved calculation of path etx Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki always send DAO to refresh routes fixed compilation error replaced inet6 with inet for linux to get tunbridge working. Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki added sub resource macro added config for serializing attributes quick fix for enabling native-border router to run under windows - need to cleanup the arguments * Simple JSON parser and generator. Laurent Deru (3): Sky motelist support for MacOS X Fix for baudrate and ifconfig on MacOS X Reactivate flash protection after maca init Lionel Debroux (1): Several compiler warning fixes: Mariano Alvira (561): initial commit. new makefile should let me have multiple targets changed name over to test-blink.c checkpoint... working on multiple test objects. multiple tests work now. this works, but there are unexplained things like why it can't print comment noting what I set mod and inc to. looks like the bootload needs a character delay to work reliably --- working test loopback. Baudrate value is still unexplained. baudrate mystery was my bad code. starting a rftest rx test. This will put it in the continuous receive checkpoint lots of code. Still doesn't work though. maybe the modem syn. needs to be set right. updated other tests with startup section make system is not really right... added maca files that got missed. found some magic data. best guess so far. fill with the magic data... going to try this in place of their radio next debugging steps addes a disassembly of something that works. doesn't work. best guess so far. moved ws.dis to a safer place (away from distclean) initial qemu support. initial qemu support. update with gdb instructions. update with gdb instructions. added a image of the mc13224v test to make a rom image correct memory locations -mtdblock loads an image into the ROM section. added a way to load the rom image remove debug print I need to allocate some mem for the cpu regs. note about how I'm loading in the images load memory with images directly. emulation runs correctly now. progress.. need to make distclean not delete stuff in doc ready to give this a shot. I think that does what they do except for ram_fill_init and more compact. checkpoint working on a replacment radioinit using their calls. correction my interpretaion of the get_ctov/radio_buffer_init loop was Lots of progress! working on initfromflash 9a000 is the RF_BASE, evidently. found what I need to dump, just need the addr. notes. I think that is set_power that's how you set the channel removed old table added missing semicolon found problems and fixed them. didn't actually do the last step. fixed. set channel is good. Ha! I make you work! rftest-rx is done for now. it prints out each received packet with a fixed term cmdline option this is working well Merge branch 'untested' rename ws.dis to ws-dis so distclean stops killing it. Merge branch 'untested' note about performance and suspicion that InitFromFlash is a factory notes about initfromflash. verified that there is important init in template for new nvm-read test removed dump_regs --- can add it back later if we need it. turn on thumb. untested. thumb code starts up properly now. This makefile seems to do better. ok. I think this is right. I think this dis. output is better. startup code startup with rom reserved vars and patch tables performs rom_data_init nvm read works now. full dis of init exec entry. ready to implement this now. Merge branch 'untested' initial try at init entry execution flash init --- makes them work much better. added my info to the copyright. blink blue but with the timer. initial interrupt stuff nvm source file modified at91 interrupt code from contiki to use the mc1322x registers added function sections and long-calls preliminary interrupts. looks like it is entering the isr but isn't initial isr. has problems. tmr imts works. I'm not thrilled with how the interrupts and modes are only go into usermode in the interrupt test... still sorting out the enabling thumb only enter user mode in tmr-ints. Merge branch 'untested' changed tmr test to blink purple Merge branch 'untested' better way to do irqs using weak links for individual isrs Merge branch 'untested' slight timer cleanup fixed typo --- everything still works. address for nvm write. send big packets. nvm write test this version of nvm-write works because it erases the sector first cleanup change write address to be the same as what I'm using as my RIME flash and burn first try at dual stage loading. fixed syntax errors. first try at dual stage loading. finish merge of fast with repeat with second stage loading this version of flasher works. Merge branch 'untested' of git://git.devl.org/git/malvira/mc1322x-tests into untested this version of mc1322x can flash code with flasher. Merge branch 'untested' of ssh://git.devl.org/home/malvira/git-pub/mc1322x-tests into untested flashing needs a little more time. catch the aux. send. Merge branch 'untested' of git://git.devl.org/git/malvira/mc1322x-tests into untested send aux data on the command line after writing the files. Merge branch 'untested' of ssh://git.devl.org/home/malvira/git-pub/mc1322x-tests into untested changed the test condition to match the end of the captured string. terminate extra data string with a comma for flasher.c add support for extra write data string. print appended , to the extra data clean up debug. Merge branch 'untested' of git://git.devl.org/git/malvira/mc1322x-tests into untested Merge branch 'untested' of ssh://git.devl.org/home/malvira/git-pub/mc1322x-tests into untested clean up and flash type workaround. Merge branch 'untested' of git://git.devl.org/git/malvira/mc1322x-tests into untested don't hose the cpu by using read instead of input Merge branch 'untested' of ssh://git.devl.org/home/malvira/git-pub/mc1322x-tests into untested reverting this file back to dumping the calibration section. Merge branch 'untested' of git://git.devl.org/git/malvira/mc1322x-tests into untested Merge branch 'untested' only send the aux string if there is one to send Merge branch 'untested' of ssh://git.devl.org/home/malvira/git-pub/mc1322x-tests into untested send aux string only when there is one to send Merge branch 'untested' add radio_on and radio_off. sleep tests. this test demonstrates sleeping in both hibernate and doze. added a few comments corrected comments about ram retention added crm.h from contiki Sleep works now. Make sure to turn the radio off first. longer delay when flashing seems necessary. Merge branch 'master' of git://git.devl.org/git/malvira/mc1322x-tests added a tool to enter mesh data from a RIME collect sink into rrd's update after creating a new rrd added a script that creates a webpage of all the collected data. check if $count is defined. cause TX_ON to flash when transmitting Merge branch 'master' of git://git.devl.org/git/malvira/mc1322x-tests this code starts up the 32kHZ clock more current data with hobby board. 32kHZ mode doesn't seem to use moved crm addresses to crm.h generate ctov properly. almost working. Merge branch 'master' of git://git.devl.org/git/malvira/mc1322x-tests there was an extra byte, proably because of a newline or something. offset by one for now. Works much better now. Needs more testing. updated to use the leds on the RedBee hardware and made it a little more general. Merge branch 'master' of git://git.devl.org/git/malvira/mc1322x-tests added output of rrdtool lastupdate final rftest2pcap script localtime instead of gmtime put rftests back to channel 11 Merge branch 'master' of git://git.devl.org/git/malvira/mc1322x-tests removing the old hardcoded type stuff from flasher. added error messages for file not found. Merge branch 'master' of git://git.devl.org/git/malvira/mc1322x-tests adding a test that blinks all the GPIO --- good for testing soldering Not all pins default to GPIO. Setting func_sel to 3 enables GPIO for added TODO item for XTAL_CNTL newer kernels need $ob->rts_active(1); invesitgated how OpenOCD flashing should work. a few little cleanups to the makefile clean up starting libmc1322x.a checkpoint -- reorganizing and fixing errors checkpoint Hi Mar. getting there... this is working kind of correctly. add new base makefile fix linker flags put object files in OBJDIR clean up more for now you must define BOARD. don't need entry _start set the default goal to be 'all' build libmc1322x.a clean up gpio and leds fix blink-red board.h works now led and gpio cleanup better variable defs. update blinks cleanup main makefile now running just 'make' builds all the targets for all the boards. finish blink tests force links removed extra line cleaned up uart1-loopback uart1.h need a way to run board specific lowlevel inits makefile hints clean up default_vreg_init working on nvm-read. turn on more warnings fix warnings update nvm-write update build system for board specific code that's 'local' to the place all the config into config.h config is in config.h now add romimg add flasher tmr tmr-ints sleep. cleaned up rftest-rx a little forgot to add these fix broken build system (since I moved put) cleaned up rftest-tx. overall cleanup clean the current directory also (incase mc1322x is a submodule) Add a readme to explain how to use this new build system and how to small clarifications to the README. add ref. crystal trimming. add econotag and usb boards econotag and usb boards need to fix deps and board.h link generation Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x removed bad touch auto-gen dependencies initial printf build lib with thumb add jim's map2dot tool add -Werror back it and fix all the errors. It would be nice to not unecessarily use rom data vars. better name renamed libmc1322x to lib Now you can build targets with or without the reserved ROM var space. Added ROM_VAR targets fix these for the putchr and putstr name changes updated todo list link objects in as archives so only what we need gets linked. add uart1_init to loopback test better start file correctly order the libs use printf instead of put removed old include directory. changed maca.c over to printf pulled put out of lib add command line option to set flow control mode remove put from lib convert to printf status is 16-bit fix board message add bitfield macros fill out MACA_CONTROL fields change rf_tests over to using new MACA_CONTROL fields. initial packet error rate test skeleton general header updates isr updates disable thumb for now (gdb isn't working with thumb) progress on maca overhaul more TODO items forgot to add packet.h added locking and interrupt disables. this does 127 B packets as fast as possible (with these settings). lots of fixes. this receive works add timestamps someday commented the data indication printf this receive seems to work well. this is pretty close to working together. update rftest-rx to use new maca. LEDs now indicate bit position (instead of (1 << pos)) which is more rftest-tx and refine post_tx for fast transmission condense print_packet output add an offset to packet_t to compensate for the added length byte on add the 4 byte preamble get the newlines straight in packet_print fix print_packet so that it doesn't break everything transmit at max power sort out the length details. enabled softclk timeouts post_receive still needs to timeout if it can't find any free add starting maca_isr call. first byte can't be anything you want it to be. add maca_init() use thumb again. Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x don't send ack's in rftest-tx add dir set and reset turn on tx_on handle case when buffers are full and we need to transmit. change the receive timeout to be 32 large packets implement rx callback rx callback surpress warning. faster transmit delay set the third bit to avoid acks. did something sensible to the leds removed some stale comments added interrupt based uarts. trim values for the production econotags make an empty board.a remove unused variable turn on -Werror fix radio_off for interrupts debug PRINTF fixes clear the offset when freeing a packet fix how board.a is created and linked add a way to disable FCS checking. handle empty COBJS make it work when COBJS is defined. add the submodule init. We don't need it, but people are suppose to new Makefile with errorchecks for make version number and checks that Workaround DEFAULT_GOAL so that you can use older versions of make. add PHONYs TODO: set radio modes Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x many warning cleanups. fix board.a creation: only the first COBJ would get built and added to add ftditools and Bit-Bang-MC. Right now bbmc can toggle reset on the update usage for flow control switch update usage for flow control switch finish up print and prompt device selection. fix up long types in printfs add a way to switch layouts init_phy was doing phy initialization and maca reset. maca_reset was protect set_chann... [truncated message content] |