[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-163-g60e1cb3
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, buildroot-update, updated. armadeus-6.0-163-g60e1cb3
|
From: Julien B a. A. <ar...@us...> - 2016-11-18 17:38:41
|
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 "armadeus".
The branch, buildroot-update has been updated
via 60e1cb3d98f105e6011a5524dc4d4a29a180c7d4 (commit)
via 43623fd8862e41717c174dda7bb24fd77d85ea69 (commit)
from 448bb9d3d975f1f8f1b4d6b45e1d808db7601cbe (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 60e1cb3d98f105e6011a5524dc4d4a29a180c7d4
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Nov 18 18:32:06 2016 +0100
[BUILDROOT] 2016.08: lora-forwarder: add possibility to choose server IP at runtime
commit 43623fd8862e41717c174dda7bb24fd77d85ea69
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Nov 18 17:43:37 2016 +0100
[BUILDROOT] 030-lmic-pi-add-package.patch -> 030-armadeus-lmic-pi-add-package.patch
-----------------------------------------------------------------------
Summary of changes:
.../029-armadeus-lora-forwarder-add-package.patch | 81 +++++++++++++++++++-
...atch => 030-armadeus-lmic-pi-add-package.patch} | 0
patches/buildroot/2016.08/cleanup_buildroot.sh | 1 +
3 files changed, 81 insertions(+), 1 deletions(-)
rename patches/buildroot/2016.08/{030-lmic-pi-add-package.patch => 030-armadeus-lmic-pi-add-package.patch} (100%)
diff --git a/patches/buildroot/2016.08/029-armadeus-lora-forwarder-add-package.patch b/patches/buildroot/2016.08/029-armadeus-lora-forwarder-add-package.patch
index 65600eb..da18eaf 100644
--- a/patches/buildroot/2016.08/029-armadeus-lora-forwarder-add-package.patch
+++ b/patches/buildroot/2016.08/029-armadeus-lora-forwarder-add-package.patch
@@ -48,7 +48,7 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -1524,6 +1524,7 @@ menu "Networking applications"
+@@ -1508,6 +1508,7 @@ menu "Networking applications"
source "package/linphone/Config.in"
source "package/linux-zigbee/Config.in"
source "package/lldpd/Config.in"
@@ -90,3 +90,82 @@ Index: buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
+- rm *.o single_chan_pkt_fwd
+\ Pas de fin de ligne à la fin du fichier
++ rm -f *.o single_chan_pkt_fwd
+Index: buildroot/package/lora-forwarder/0002-add-server-ip-runtime-option.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/lora-forwarder/0002-add-server-ip-runtime-option.patch
+@@ -0,0 +1,74 @@
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN lora-forwarder-a29921789bc5b63d6a7c51e46dd6314aca06b99e/main.cpp lora-forwarder-a29921789bc5b63d6a7c51e46dd6314aca06b99e.mod2/main.cpp
++--- lora-forwarder-a29921789bc5b63d6a7c51e46dd6314aca06b99e/main.cpp 2016-01-06 12:06:08.000000000 +0100
+++++ lora-forwarder-a29921789bc5b63d6a7c51e46dd6314aca06b99e.mod2/main.cpp 2016-11-09 18:10:38.599323414 +0100
++@@ -88,6 +88,8 @@
++ #define SERVER1 "54.72.145.119" // The Things Network: croft.thethings.girovito.nl
++ //#define SERVER2 "192.168.1.10" // local
++ #define PORT 1700 // The port on which to send data
+++static char *server_ip = SERVER1;
+++static int server_port = PORT;
++
++ // #############################################
++ // #############################################
++@@ -317,7 +319,7 @@
++
++ //send the update
++ #ifdef SERVER1
++- inet_aton(SERVER1 , &si_other.sin_addr);
+++ inet_aton(server_ip, &si_other.sin_addr);
++ if (sendto(s, (char *)msg, length, 0 , (struct sockaddr *) &si_other, slen)==-1)
++ {
++ die("sendto()");
++@@ -325,7 +327,7 @@
++ #endif
++
++ #ifdef SERVER2
++- inet_aton(SERVER2 , &si_other.sin_addr);
+++ inet_aton(server_ip, &si_other.sin_addr);
++ if (sendto(s, (char *)msg, length , 0 , (struct sockaddr *) &si_other, slen)==-1)
++ {
++ die("sendto()");
++@@ -531,10 +533,31 @@
++ } // dio0=1
++ }
++
++-int main () {
+++#include <unistd.h>
+++int main (int argc, char *argv[])
+++{
++
++ struct timeval nowtime;
++ uint32_t lasttime;
+++ int option = -1;
+++
+++ while ((option = getopt (argc, argv, "i:p:")) != -1)
+++ {
+++ switch (option)
+++ {
+++ case 'i':
+++ server_ip = strdup(optarg);
+++ break;
+++ case 'p':
+++ server_port = atoi(strdup(optarg));
+++ break;
+++ default:
+++ fprintf(stderr, "Usage: %s [-i addr] [-p port]\n",
+++ argv[0]);
+++ exit(EXIT_FAILURE);
+++ break;
+++ }
+++ }
++
++ wiringPiSetup () ;
++ pinMode(ssPin, OUTPUT);
++@@ -553,7 +576,7 @@
++ }
++ memset((char *) &si_other, 0, sizeof(si_other));
++ si_other.sin_family = AF_INET;
++- si_other.sin_port = htons(PORT);
+++ si_other.sin_port = htons(server_port);
++
++ ifr.ifr_addr.sa_family = AF_INET;
++ strncpy(ifr.ifr_name, "eth0", IFNAMSIZ-1); // can we rely on eth0?
diff --git a/patches/buildroot/2016.08/030-lmic-pi-add-package.patch b/patches/buildroot/2016.08/030-armadeus-lmic-pi-add-package.patch
similarity index 100%
rename from patches/buildroot/2016.08/030-lmic-pi-add-package.patch
rename to patches/buildroot/2016.08/030-armadeus-lmic-pi-add-package.patch
diff --git a/patches/buildroot/2016.08/cleanup_buildroot.sh b/patches/buildroot/2016.08/cleanup_buildroot.sh
index d5ae4a7..8c0fef8 100755
--- a/patches/buildroot/2016.08/cleanup_buildroot.sh
+++ b/patches/buildroot/2016.08/cleanup_buildroot.sh
@@ -67,6 +67,7 @@ rm -rf buildroot/package/linux-headers/2.6.35.3/368-redhat-types_h-define-__alig
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
rm -rf buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
+rm -rf buildroot/package/lora-forwarder/0002-add-server-ip-runtime-option.patch
rm -rf buildroot/package/lora-forwarder/Config.in
rm -rf buildroot/package/lora-forwarder/lora-forwarder.mk
rm -rf buildroot/package/ltrace/Config.in
hooks/post-receive
--
armadeus
|