mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2025-12-26 15:03:53 +01:00
Merge pull request #3030 from gebart/pr/tab-fixes2
Tab indentation fixes
This commit is contained in:
Oleg Hahm
commit
8cb0e59283
12
boards/pba-d-01-kw2x/dist/mkw22d512.cfg
vendored
12
boards/pba-d-01-kw2x/dist/mkw22d512.cfg
vendored
@ -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 {
|
||||
|
||||
44
boards/pba-d-01-kw2x/dist/pll_freq.m
vendored
44
boards/pba-d-01-kw2x/dist/pll_freq.m
vendored
@ -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");
|
||||
|
||||
@ -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*/
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
</body>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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>
|
||||
*
|
||||
* @}
|
||||
*/
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
#include "uECC.h"
|
||||
#include "periph/random.h"
|
||||
|
||||
#define TESTROUNDS 16
|
||||
#define TESTROUNDS 16
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user