headers
Mariano Alvira | 2 Aug 2011 01:51
Picon

SF.net Git: contiki branch master updated. 2b9f4e8fed8532b5c43749f8f4491e794fb876bb

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 branch, master has been updated
       via  2b9f4e8fed8532b5c43749f8f4491e794fb876bb (commit)
       via  3034ac429dad667eb81d8ebb529bc5b2ecbe51fb (commit)
       via  659be7cbcc4e248d96f09e841e1456e1a58f27ce (commit)
       via  17e7827d439ca5ec0759419a64eb7d05adc97eb2 (commit)
      from  df70b21c7031f75915e4d493fc75a675a51705eb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2b9f4e8fed8532b5c43749f8f4491e794fb876bb
Merge: df70b21 3034ac4
Author: Mariano Alvira <mar@...>
Date:   Mon Aug 1 19:50:46 2011 -0400

    Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x

diff --cc cpu/mc1322x/lib/maca.c
index 932cf2c,0000000..8a02f89
mode 100644,000000..100644
--- a/cpu/mc1322x/lib/maca.c
+++ b/cpu/mc1322x/lib/maca.c
 <at>  <at>  <at>  -1,1304 -1,0 +1,1306  <at>  <at>  <at> 
 +/*
(Continue reading)

Permalink | Reply | 0 comments |
headers
dak664 | 3 Aug 2011 17:20
Picon

SF.net Git: contiki branch master updated. e2ad2acde47b85bad8973d2c0392290afe563881

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 branch, master has been updated
       via  e2ad2acde47b85bad8973d2c0392290afe563881 (commit)
      from  e953b66f7814bb4330f887296c312aa2f7638163 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e2ad2acde47b85bad8973d2c0392290afe563881
Author: David Kopf <dak664@...>
Date:   Wed Aug 3 11:18:55 2011 -0400

    Add stk500 platform and changes suggested by Daniel Willmann

diff --git a/apps/webserver-nano/httpd.h b/apps/webserver-nano/httpd.h
index d810597..6715102 100644
--- a/apps/webserver-nano/httpd.h
+++ b/apps/webserver-nano/httpd.h
 <at>  <at>  -44,7 +44,7  <at>  <at> 
  * The RAM needed for each entry depends on script enabling and buffer sizes; see struct httpd_state below.
  * Typical range is 100 - 200 bytes per connection
  */
-#if CONTIKI_TARGET_SKY
+#if CONTIKI_TARGET_SKY || CONTIKI_TARGET_STK500
 #define WEBSERVER_CONF_CONNS     2
(Continue reading)

Permalink | Reply | 0 comments |
headers
dak664 | 3 Aug 2011 17:45
Picon

SF.net Git: contiki branch master updated. 6ae3e2bcb22ca248e5e69eed85c280126bb93ea0

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 branch, master has been updated
       via  6ae3e2bcb22ca248e5e69eed85c280126bb93ea0 (commit)
      from  e2ad2acde47b85bad8973d2c0392290afe563881 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6ae3e2bcb22ca248e5e69eed85c280126bb93ea0
Author: David Kopf <dak664@...>
Date:   Wed Aug 3 11:44:22 2011 -0400

    Restore micaz/dev/clock.c, mysteriously renamed to iris/dev/sensors/battery-sensor.c

diff --git a/platform/micaz/dev/clock.c b/platform/micaz/dev/clock.c
new file mode 100644
index 0000000..d69b7a8
--- /dev/null
+++ b/platform/micaz/dev/clock.c
 <at>  <at>  -0,0 +1,160  <at>  <at> 
+/*
+ * Copyright (c) 2009, University of Colombo School of Computing
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
(Continue reading)

Permalink | Reply | 0 comments |
headers
dak664 | 3 Aug 2011 18:31
Picon

SF.net Git: contiki branch master updated. 96c3c1093a980501521a314b7cb40d1731d6ab9c

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 branch, master has been updated
       via  96c3c1093a980501521a314b7cb40d1731d6ab9c (commit)
      from  6ae3e2bcb22ca248e5e69eed85c280126bb93ea0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 96c3c1093a980501521a314b7cb40d1731d6ab9c
Author: David Kopf <dak664@...>
Date:   Wed Aug 3 12:30:20 2011 -0400

    Assign aaaa:: prefix if HARD_CODED_ADDRESS not defined

diff --git a/platform/minimal-net/contiki-main.c b/platform/minimal-net/contiki-main.c
index 4944ab4..b310919 100644
--- a/platform/minimal-net/contiki-main.c
+++ b/platform/minimal-net/contiki-main.c
 <at>  <at>  -235,9 +235,12  <at>  <at>  main(void)
 #else /* UIP_CONF_IPV6 */

 #if !UIP_CONF_IPV6_RPL
-#ifdef HARD_CODED_ADDRESS
   uip_ipaddr_t ipaddr;
+#ifdef HARD_CODED_ADDRESS
(Continue reading)

Permalink | Reply | 0 comments |
headers
dak664 | 5 Aug 2011 21:15
Picon

SF.net Git: contiki branch master updated. c9b19ce6550757fe4f50d3e338a541e5adb38015

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 branch, master has been updated
       via  c9b19ce6550757fe4f50d3e338a541e5adb38015 (commit)
       via  bfbc3234eaf3e149c5713918991f355be7f4db81 (commit)
      from  96c3c1093a980501521a314b7cb40d1731d6ab9c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c9b19ce6550757fe4f50d3e338a541e5adb38015
Author: David Kopf <dak664@...>
Date:   Fri Aug 5 15:14:35 2011 -0400

    Change timer setups for arbitrary CLOCK_CONF_SECOND
    Change raven to 128 ticks and enable 32KHz crystal as default.

diff --git a/cpu/avr/dev/clock-avr.h b/cpu/avr/dev/clock-avr.h
index 460e3d8..95bcfbc 100644
--- a/cpu/avr/dev/clock-avr.h
+++ b/cpu/avr/dev/clock-avr.h
 <at>  <at>  -14,11 +14,11  <at>  <at> 
 \
   /*						  \
    * Set comparison register: \
-   * Crystal freq. is 16000000,\
(Continue reading)

Permalink | Reply | 0 comments |
headers
dak664 | 5 Aug 2011 23:34
Picon

SF.net Git: contiki branch master updated. b70d2b3163a64c1c0c61356498ee0aecadc27044

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 branch, master has been updated
       via  b70d2b3163a64c1c0c61356498ee0aecadc27044 (commit)
      from  c9b19ce6550757fe4f50d3e338a541e5adb38015 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b70d2b3163a64c1c0c61356498ee0aecadc27044
Author: David Kopf <dak664@...>
Date:   Fri Aug 5 17:34:38 2011 -0400

    Remove duplicate code block

diff --git a/cpu/avr/dev/rs232.c b/cpu/avr/dev/rs232.c
index 22ebb66..ecf5a44 100644
--- a/cpu/avr/dev/rs232.c
+++ b/cpu/avr/dev/rs232.c
 <at>  <at>  -224,19 +224,9  <at>  <at>  ISR(USART_RX_vect)
     rs232_ports[RS232_PORT_0].input_handler(c);
   }
 }
+
 #elif defined (__AVR_AT90USB1287__)
-static rs232_t rs232_ports[1] = {
(Continue reading)

Permalink | Reply | 0 comments |
headers
dak664 | 6 Aug 2011 19:49
Picon

SF.net Git: contiki branch master updated. cdcb2c47445809616136b49a8a988322f1bfd12f

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 branch, master has been updated
       via  cdcb2c47445809616136b49a8a988322f1bfd12f (commit)
      from  b70d2b3163a64c1c0c61356498ee0aecadc27044 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cdcb2c47445809616136b49a8a988322f1bfd12f
Author: David Kopf <dak664@...>
Date:   Sat Aug 6 13:48:52 2011 -0400

    CCA measurement was always returning busy

diff --git a/cpu/avr/radio/rf230bb/rf230bb.c b/cpu/avr/radio/rf230bb/rf230bb.c
index 887d905..b4f2923 100644
--- a/cpu/avr/radio/rf230bb/rf230bb.c
+++ b/cpu/avr/radio/rf230bb/rf230bb.c
 <at>  <at>  -566,7 +566,7  <at>  <at>  set_txpower(uint8_t power)
 void
 calibrate_rc_osc_32k(void)
 {
-#if 1
+#if 0
(Continue reading)

Permalink | Reply | 0 comments |
headers
David Kopf | 6 Aug 2011 23:16
Gravatar

Re: SF.net Git: contiki branch master updated.cdcb2c47445809616136b49a8a988322f1bfd12f

Well that was a brain fart. (cca & 0x70) should be (cca & 0x40) to test just 
the cca bit.
As it stands it tests a couple of extra bits which are probably zero. I'll 
fix it the next go-around.

-----Original Message----- 
From: dak664
Sent: Saturday, August 06, 2011 1:49 PM
To: contiki-commits@...
Subject: [Contiki-commits] SF.net Git: contiki branch master 
updated.cdcb2c47445809616136b49a8a988322f1bfd12f

commit cdcb2c47445809616136b49a8a988322f1bfd12f
Author: David Kopf <dak664@...>
Date:   Sat Aug 6 13:48:52 2011 -0400

    CCA measurement was always returning busy

diff --git a/cpu/avr/radio/rf230bb/rf230bb.c 
b/cpu/avr/radio/rf230bb/rf230bb.c
index 887d905..b4f2923 100644
--- a/cpu/avr/radio/rf230bb/rf230bb.c
+++ b/cpu/avr/radio/rf230bb/rf230bb.c
 <at>  <at>  -566,7 +566,7  <at>  <at>  set_txpower(uint8_t power)
-  return cca;
+
+   if (cca & 0x70) return 1; else return 0;
} 

------------------------------------------------------------------------------
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Dunkels | 8 Aug 2011 22:33
Picon

SF.net Git: contiki branch master updated. 3b7666956f413ae15b12ca91d3c5fe5f32265420

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 branch, master has been updated
       via  3b7666956f413ae15b12ca91d3c5fe5f32265420 (commit)
      from  cdcb2c47445809616136b49a8a988322f1bfd12f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3b7666956f413ae15b12ca91d3c5fe5f32265420
Author: Adam Dunkels <adam@...>
Date:   Mon Aug 8 22:26:44 2011 +0200

    Bugfix: removed extreanous asterix character

diff --git a/apps/serial-shell/serial-shell.c b/apps/serial-shell/serial-shell.c
index b5a7515..a59c000 100644
--- a/apps/serial-shell/serial-shell.c
+++ b/apps/serial-shell/serial-shell.c
 <at>  <at>  -72,7 +72,7  <at>  <at>  shell_default_output(const char *text1, int len1, const char *text2, int len2)
 #if defined (__AVR__)
   printf("%s%s\r\n", text1, text2);
 #else
-  *printf("%.*s%.*s\r\n", len1, text1, len2, text2);
+  printf("%.*s%.*s\r\n", len1, text1, len2, text2);
 #endif
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Dunkels | 9 Aug 2011 09:35
Picon

SF.net Git: contiki branch master updated. 40bf585af8f5f50c95dcd9776912346ac1f7edd2

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 branch, master has been updated
       via  40bf585af8f5f50c95dcd9776912346ac1f7edd2 (commit)
      from  3b7666956f413ae15b12ca91d3c5fe5f32265420 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 40bf585af8f5f50c95dcd9776912346ac1f7edd2
Author: Adam Dunkels <adam@...>
Date:   Mon Aug 8 22:46:30 2011 +0200

    The Z1 platform has LEDs

diff --git a/platform/z1/platform-conf.h b/platform/z1/platform-conf.h
index aeec90a..d91e49f 100644
--- a/platform/z1/platform-conf.h
+++ b/platform/z1/platform-conf.h
 <at>  <at>  -45,6 +45,8  <at>  <at> 
  */
 #define ZOLERTIA_Z1 1  /* Enric */

+#define PLATFORM_HAS_LEDS   1
+
 #ifdef __IAR_SYSTEMS_ICC__
(Continue reading)

Permalink | Reply | 0 comments |

Gmane