diff --git a/boards/pba-d-01-kw2x/dist/mkw22d512.cfg b/boards/pba-d-01-kw2x/dist/mkw22d512.cfg
index aff04552982f8ef17202b23b98f9ba09ba1710f7..806b323bb571dcd2085b5c154f320de877aebb2b 100644
--- a/boards/pba-d-01-kw2x/dist/mkw22d512.cfg
+++ b/boards/pba-d-01-kw2x/dist/mkw22d512.cfg
@@ -18,9 +18,9 @@ if { [info exists CHIPNAME] } {
set WORKAREASIZE 0x4000
if { [info exists WORKAREASIZE] } {
- set _WORKAREASIZE $WORKAREASIZE
+ set _WORKAREASIZE $WORKAREASIZE
} else {
- set _WORKAREASIZE 0x1000
+ set _WORKAREASIZE 0x1000
}
if { [info exists ENDIAN] } {
@@ -49,7 +49,7 @@ $_CHIPNAME.cpu configure -event examine-start { puts "START..." ; }
# causes "kinetis mdm check_security" to fail the first time openocd
# calls it when it tries to connect after the CPU has been power-cycled.
$_CHIPNAME.cpu configure -event examine-end {
- kinetis mdm check_security
+ kinetis mdm check_security
}
$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
@@ -61,9 +61,9 @@ flash bank $_FLASHNAME kinetis 0 0 0 0 $_TARGETNAME
adapter_khz 1000
if {![using_hla]} {
- # if srst is not fitted use SYSRESETREQ to
- # perform a soft reset
- cortex_m reset_config sysresetreq
+ # if srst is not fitted use SYSRESETREQ to
+ # perform a soft reset
+ cortex_m reset_config sysresetreq
}
$_TARGETNAME configure -event reset-init {
diff --git a/boards/pba-d-01-kw2x/dist/pll_freq.m b/boards/pba-d-01-kw2x/dist/pll_freq.m
index ae8a2ec101751217f04fed720cfdfa6a43f02536..ac2223d682f3e06271e287b06cd38e34f8a3de62 100644
--- a/boards/pba-d-01-kw2x/dist/pll_freq.m
+++ b/boards/pba-d-01-kw2x/dist/pll_freq.m
@@ -9,14 +9,14 @@ tmp_frac = 0;
tmp_int = 11;
while (i <= length(F))
- tmp_frac = (F(i)./32 - tmp_int - 64).*65536;
- if tmp_frac >= 65536
- tmp_int++;
- else
- PLL_FRAC0 = [PLL_FRAC0 tmp_frac];
- PLL_INT0 = [PLL_INT0 tmp_int];
- i++;
- endif
+ tmp_frac = (F(i)./32 - tmp_int - 64).*65536;
+ if tmp_frac >= 65536
+ tmp_int++;
+ else
+ PLL_FRAC0 = [PLL_FRAC0 tmp_frac];
+ PLL_INT0 = [PLL_INT0 tmp_int];
+ i++;
+ endif
endwhile
%F
@@ -26,17 +26,17 @@ endwhile
printf("static const uint8_t pll_int_lt[%d] = {\n", length(F));
for i = 1:4:length(F)
- printf(" ");
- printf("%d,", PLL_INT0(i:1:i+3));
- printf("\n");
+ printf(" ");
+ printf("%d,", PLL_INT0(i:1:i+3));
+ printf("\n");
endfor
printf("};\n");
printf("\n");
printf("static const uint16_t pll_frac_lt[%d] = {\n", length(F));
for i = 1:4:length(F)
- printf(" ");
- printf("%d,", PLL_FRAC0(i:1:i+3));
- printf("\n");
+ printf(" ");
+ printf("%d,", PLL_FRAC0(i:1:i+3));
+ printf("\n");
endfor
printf("};\n\n");
@@ -53,10 +53,10 @@ pow_lt = round(i .* (RANGE_MAX - RANGE_MIN) ./ length(i) + RANGE_MIN);
printf("static const uint8_t pow_lt[%d] = {", length(pow_lt));
printf(" ");
for i = 0:1:length(pow_lt)-1
- if (rem(i,4) == 0)
- printf("\n ");
- endif
- printf("%d,", pow_lt(i+1));
+ if (rem(i,4) == 0)
+ printf("\n ");
+ endif
+ printf("%d,", pow_lt(i+1));
endfor
printf("\n};\n\n");
@@ -66,9 +66,9 @@ length(level_lt)
printf("static const int level_lt[%d] = {", length(level_lt));
for i = 0:1:length(level_lt)-1
- if (rem(i,4) == 0)
- printf("\n ");
- endif
- printf("%d,", level_lt(i+1));
+ if (rem(i,4) == 0)
+ printf("\n ");
+ endif
+ printf("%d,", level_lt(i+1));
endfor
printf("\n};\n\n");
diff --git a/boards/pba-d-01-kw2x/include/board.h b/boards/pba-d-01-kw2x/include/board.h
index a75a97f0ae91f5efd5dea5eedc4b7b4798481d27..2ac7a07cc1d4f7be56d4de7e03fd77302f58fd6f 100644
--- a/boards/pba-d-01-kw2x/include/board.h
+++ b/boards/pba-d-01-kw2x/include/board.h
@@ -57,9 +57,9 @@ extern "C"
#define LED_G_GPIO GPIOD /**< GPIO-Device for Green LED*/
#define LED_B_PORT PORTA /**< PORT for Blue LED*/
#define LED_B_GPIO GPIOA /**< GPIO-Device for Blue LED*/
-#define LED_R_PIN 6 /**< Red LED connected to PINx*/
-#define LED_G_PIN 4 /**< Green LED connected to PINx*/
-#define LED_B_PIN 4 /**< Blue LED connected to PINx*/
+#define LED_R_PIN 6 /**< Red LED connected to PINx*/
+#define LED_G_PIN 4 /**< Green LED connected to PINx*/
+#define LED_B_PIN 4 /**< Blue LED connected to PINx*/
/** @} */
/**
diff --git a/boards/pttu/tools/openocd-pttu.sh b/boards/pttu/tools/openocd-pttu.sh
index 95f11fa14818e62fde70a3c5d78c9ff601224817..6a7da2196d05b96a93a0b405def9ce8ab2083622 100755
--- a/boards/pttu/tools/openocd-pttu.sh
+++ b/boards/pttu/tools/openocd-pttu.sh
@@ -1,30 +1,30 @@
#/bin/bash
if [ $# -le 0 ]; then
- echo "usage: $0 [openocd interface name] [openocd args]" >&2
- echo " common interfaces: olimex-arm-usb-ocd olimex-jtag-tiny olimex-jtag-tiny-a"
- echo ""
- echo "using default olimex-jtag-tiny-a"
- INTERFACE=olimex-jtag-tiny-a
+ echo "usage: $0 [openocd interface name] [openocd args]" >&2
+ echo " common interfaces: olimex-arm-usb-ocd olimex-jtag-tiny olimex-jtag-tiny-a"
+ echo ""
+ echo "using default olimex-jtag-tiny-a"
+ INTERFACE=olimex-jtag-tiny-a
else
- INTERFACE=$1
- shift
+ INTERFACE=$1
+ shift
fi
if [ $# -ge 1 ]; then
- COMMAND=$@
+ COMMAND=$@
else
- COMMAND="debug_level 1"
+ COMMAND="debug_level 1"
fi
if [ "${OS}" = "Windows_NT" ]; then
- WINDOWS=1
+ WINDOWS=1
fi
if [ "x${WINDOWS}x" = "xx" ]; then
- xterm -e "openocd -s ../../.. -f interface/${INTERFACE}.cfg -f board/pttu/tools/openocd-pttu.cfg -c \"${COMMAND}\"|| read" &
+ xterm -e "openocd -s ../../.. -f interface/${INTERFACE}.cfg -f board/pttu/tools/openocd-pttu.cfg -c \"${COMMAND}\"|| read" &
else
- echo ${COMMAND}
- #cmd /C start "OpenOCD PTTU using ${INTERFACE}"
- openocd-ftd2xx.exe -s ../../.. -f interface/${INTERFACE}.cfg -f board/pttu/tools/openocd-pttu.cfg -c "${COMMAND}"
+ echo ${COMMAND}
+ #cmd /C start "OpenOCD PTTU using ${INTERFACE}"
+ openocd-ftd2xx.exe -s ../../.. -f interface/${INTERFACE}.cfg -f board/pttu/tools/openocd-pttu.cfg -c "${COMMAND}"
fi
diff --git a/boards/redbee-econotag/tools/mc1322x-load.pl b/boards/redbee-econotag/tools/mc1322x-load.pl
index 81d8c2c839153534245ccd102510eeb2329f6fcc..ad7d79e7b08281ec1705db2264af89dd7b995e57 100755
--- a/boards/redbee-econotag/tools/mc1322x-load.pl
+++ b/boards/redbee-econotag/tools/mc1322x-load.pl
@@ -20,16 +20,16 @@ my $do_exit;
my $zerolen;
GetOptions ('file=s' => \$filename,
- 'secondfile=s' => \$second,
- 'zerolen' => \$zerolen,
- 'terminal=s' => \$term,
- 'verbose' => \$verbose,
- 'u|baud=s' => \$baud,
- 'rts=s' => \$rts,
- 'command=s' => \$command,
- 'a=s' => \$first_delay,
- 'b=s' => \$second_delay,
- 'exit' => \$do_exit,
+ 'secondfile=s' => \$second,
+ 'zerolen' => \$zerolen,
+ 'terminal=s' => \$term,
+ 'verbose' => \$verbose,
+ 'u|baud=s' => \$baud,
+ 'rts=s' => \$rts,
+ 'command=s' => \$command,
+ 'a=s' => \$first_delay,
+ 'b=s' => \$second_delay,
+ 'exit' => \$do_exit,
) or die 'bad options';
$| = 1;
@@ -87,58 +87,58 @@ while(1) {
if(($command ne '') &&
($reset eq 0)) {
- $reset++;
- system($command);
+ $reset++;
+ system($command);
}
if($s == 1) {
- $test = 'ready';
+ $test = 'ready';
} else {
- $test = 'CONNECT';
+ $test = 'CONNECT';
}
until($ret =~ /$test$/) {
- ($count,$c) = $ob->read(1);
- if ($count == 0) {
- print '.';
- $ob->write(pack('C','0'));
- next;
- }
- $ret .= $c;
+ ($count,$c) = $ob->read(1);
+ if ($count == 0) {
+ print '.';
+ $ob->write(pack('C','0'));
+ next;
+ }
+ $ret .= $c;
}
print $ret . "\n";
if (-e $filename || (defined($zerolen) && ($s == 1))) {
- if(defined($zerolen) && ($s == 1)) {
- $size = 0;
- } else {
- $size = -s $filename;
- }
+ if(defined($zerolen) && ($s == 1)) {
+ $size = 0;
+ } else {
+ $size = -s $filename;
+ }
- print ("Size: $size bytes\n");
- $ob->write(pack('V',$size));
+ print ("Size: $size bytes\n");
+ $ob->write(pack('V',$size));
- if(($s == 0) ||
- ((!defined($zerolen)) && ($s == 1))) {
- open(FILE, $filename) or die($!);
- print "Sending $filename\n";
+ if(($s == 0) ||
+ ((!defined($zerolen)) && ($s == 1))) {
+ open(FILE, $filename) or die($!);
+ print "Sending $filename\n";
- my $i = 1;
- while(read(FILE, $c, 1)) {
- $i++;
+ my $i = 1;
+ while(read(FILE, $c, 1)) {
+ $i++;
usleep($first_delay) if ( $s == 0 ) && ($first_delay != 0);
usleep($second_delay) if ( $s == 1 ) && ($second_delay != 0);
- $ob->write($c);
- }
- }
+ $ob->write($c);
+ }
+ }
}
last if ($s==1);
if((-e $second) || defined($zerolen)) {
- $s=1; $filename = $second;
+ $s=1; $filename = $second;
} else {
- last;
+ last;
}
}
diff --git a/cpu/stm32f0/include/stm32f091xc.h b/cpu/stm32f0/include/stm32f091xc.h
index 7e61681afb6d57f85930e7ad67a080c265ce1952..8131dc606139c6632ca7ccfa0a97db5b40e82c9d 100644
--- a/cpu/stm32f0/include/stm32f091xc.h
+++ b/cpu/stm32f0/include/stm32f091xc.h
@@ -402,7 +402,7 @@ typedef struct
uint32_t RESERVED; /*!< Reserved, 0x04 */
__IO uint32_t EXTICR[4]; /*!< SYSCFG external interrupt configuration register, Address offset: 0x14-0x08 */
__IO uint32_t CFGR2; /*!< SYSCFG configuration register 2, Address offset: 0x18 */
- uint32_t RESERVED1[25]; /*!< Reserved + COMP, 0x1C */
+ uint32_t RESERVED1[25]; /*!< Reserved + COMP, 0x1C */
__IO uint32_t IT_LINE_SR[32]; /*!< SYSCFG configuration IT_LINE register, Address offset: 0x80 */
}SYSCFG_TypeDef;
diff --git a/doc/doxygen/src/riot-footer.html b/doc/doxygen/src/riot-footer.html
index 7fb2bd61bf20fdc022eeaaff4aa91f4763fd9df2..308b1d01b6ca1e7ab1b1fa896e6a8497bbcd1a37 100644
--- a/doc/doxygen/src/riot-footer.html
+++ b/doc/doxygen/src/riot-footer.html
@@ -1,2 +1,2 @@
- </body>
+</body>
</html>
diff --git a/examples/rpl_udp/README.md b/examples/rpl_udp/README.md
index 7d2d461d59944adf3d092a3cd5fcb2a191f9f18f..b2190406a44151ada17149fe68d83e7d45358188 100644
--- a/examples/rpl_udp/README.md
+++ b/examples/rpl_udp/README.md
@@ -1,7 +1,7 @@
# Setup the build
First switch to this application directory:
- cd RIOT/examples/rpl_udp
+ cd RIOT/examples/rpl_udp
The build system provides three specific parameters for the RPL module.
These parameters are:
@@ -14,23 +14,23 @@ These RPL build parameters and their according _default_ values are used in the
#### Compiling the executable
**example for `RPL_MOP_STORING_MODE_MC`:**
- make RPL_MOP=RPL_MOP_STORING_MODE_MC
+ make RPL_MOP=RPL_MOP_STORING_MODE_MC
builds the project and creates `128` entries for the RPL routing table by default.
- make RPL_MOP=RPL_MOP_STORING_MODE_MC RPL_MAX_ROUTING_ENTRIES=103
+ make RPL_MOP=RPL_MOP_STORING_MODE_MC RPL_MAX_ROUTING_ENTRIES=103
builds the project and creates `103` entries for the RPL routing table **overwriting** the default value.
**example for `RPL_MOP_NON_STORING_MODE`:**
- make RPL_MOP=RPL_MOP_NON_STORING_MODE RPL_MAX_ROUTING_ENTRIES=103 RPL_NODE_IS_ROOT=1
+ make RPL_MOP=RPL_MOP_NON_STORING_MODE RPL_MAX_ROUTING_ENTRIES=103 RPL_NODE_IS_ROOT=1
builds the project and creates `103` entries for the RPL routing table for the root node.
#### _[native only]_ Set up a bridge for *two* tap devices for communication
- ../../cpu/native/tapsetup.sh create 2
+ ../../cpu/native/tapsetup.sh create 2
The `2` corresponds to the number of _virtual_ nodes to be started.
The tap devices are bound to the _virtual_ native node on starting the created executable `rpl_udp.elf`.
@@ -38,14 +38,14 @@ The tap devices are bound to the _virtual_ native node on starting the created e
#### _[native only]_ Starting _virtual_ nodes
Run the first node
- make term
+ make term
This starts the executable binding a _virtual_ node to the first tap device `tap0`.
**Further nodes must be bound to tap devices manually.**
For the second node it would be:
- make term PORT=tap1
+ make term PORT=tap1
# RPL init
@@ -53,74 +53,74 @@ Type ``help`` to see the commands available.
#### Command order:
- init (r|n|h)
- server
- send <node-id> <message>
+ init (r|n|h)
+ server
+ send <node-id> <message>
Init your RPL node either as root (`r`), as node router (`n`), or as non-routing node (host-mode) (`h`)
- > init r
- init r
- INFO: Initialize as root on address 1
- 6LoWPAN and RPL initialized.
- Channel set to 10
- Transport layer initialized
+ > init r
+ init r
+ INFO: Initialize as root on address 1
+ 6LoWPAN and RPL initialized.
+ Channel set to 10
+ Transport layer initialized
or
- > init n
- init n
- INFO: Initialize as node on address 2
- 6LoWPAN and RPL initialized.
- Channel set to 10
- Transport layer initialized
+ > init n
+ init n
+ INFO: Initialize as node on address 2
+ 6LoWPAN and RPL initialized.
+ Channel set to 10
+ Transport layer initialized
or
- > init h
- init h
- INFO: Initialize as non-routing node on address 3
- 6LoWPAN initialized.
- Channel set to 10
- Transport layer initialized
+ > init h
+ init h
+ INFO: Initialize as non-routing node on address 3
+ 6LoWPAN initialized.
+ Channel set to 10
+ Transport layer initialized
(It is advised to start all nodes before running the root node, because the interval for sending DIOs from the root increases over time)
A few seconds withing running, setting and initializing your second node, the nodes will automatically start to exchange control traffic. You should be seeing output similar to the following:
- 41 CC FC 34 12 36 12 00 FF FE 00 00 02 36 12 00 FF FE 00 00 01 7A 33 3A 9B 03 F9 90 00 00 04 00 00 80
- IPv6 datagram received (next header: 3A) from fe80:0000:0000:0000:3612:00ff:fe00:0001 ICMP type: 5A ICMP code: 08
- Received packet from ID 1
- Length: 34
- Src: 1
- Dst: 2
- LQI: 0
- RSSI: 0
+ 41 CC FC 34 12 36 12 00 FF FE 00 00 02 36 12 00 FF FE 00 00 01 7A 33 3A 9B 03 F9 90 00 00 04 00 00 80
+ IPv6 datagram received (next header: 3A) from fe80:0000:0000:0000:3612:00ff:fe00:0001 ICMP type: 5A ICMP code: 08
+ Received packet from ID 1
+ Length: 34
+ Src: 1
+ Dst: 2
+ LQI: 0
+ RSSI: 0
You can now use the ``dodag`` command to obtain information on the node's rank in the rpl dodag as well as their preferred parent
- > dodag
- dodag
- ---------------------------
- Part of Dodag:
- fe80:0000:0000:0000:3612:00ff:fe00:0001
- my rank: 512
- my preferred parent:
- fe80:0000:0000:0000:3612:00ff:fe00:0001
- ---------------------------
+ > dodag
+ dodag
+ ---------------------------
+ Part of Dodag:
+ fe80:0000:0000:0000:3612:00ff:fe00:0001
+ my rank: 512
+ my preferred parent:
+ fe80:0000:0000:0000:3612:00ff:fe00:0001
+ ---------------------------
#Sending via UDP
In order to be able to receive UDP messages from other nodes, we have to start `rpl_udp`'s UDP server:
- > server
- server
- UDP SERVER ON PORT 511 (THREAD PID: 17)
+ > server
+ server
+ UDP SERVER ON PORT 511 (THREAD PID: 17)
When rpl is running, you can send a message from any participating node to the node initialized as a server (in our case, node 1) using the ``send`` command
- > send 1 hi
- send 1 hi
- Successful deliverd 11 bytes over UDP to abcd:0000:0000:0000:3612:00ff:fe00:0001 to 6LoWPAN
+ > send 1 hi
+ send 1 hi
+ Successful deliverd 11 bytes over UDP to abcd:0000:0000:0000:3612:00ff:fe00:0001 to 6LoWPAN
In case of an error message, make sure that rpl is running and you've started the UDP server on the receiving node by running the ``server`` command.
diff --git a/tests/malloc/main.c b/tests/malloc/main.c
index 0af810345e5caebb20748dbbd8b7c2bdf4c47ba4..d91bf0030a7368cfb22f054bf70c85f0a06fe05d 100644
--- a/tests/malloc/main.c
+++ b/tests/malloc/main.c
@@ -11,10 +11,10 @@
* @{
*
* @file
- * @brief Simple malloc/free test
+ * @brief Simple malloc/free test
*
*
- * @author Benjamin Valentin <benpicco@zedat.fu-berlin.de>
+ * @author Benjamin Valentin <benpicco@zedat.fu-berlin.de>
*
* @}
*/
diff --git a/tests/pkg_micro-ecc/main.c b/tests/pkg_micro-ecc/main.c
index fe433a13f09de83c41f81693fce1c3f9e17bc85c..808586b2b60f247fe4d4d5d2fa8ed5c28f532f0c 100644
--- a/tests/pkg_micro-ecc/main.c
+++ b/tests/pkg_micro-ecc/main.c
@@ -39,7 +39,7 @@
#include "uECC.h"
#include "periph/random.h"
-#define TESTROUNDS 16
+#define TESTROUNDS 16
int main(void)
{