[chronojump] Updated r-scripts licences
- From: Xavier Padullés <xpadulles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Updated r-scripts licences
- Date: Wed, 29 Apr 2020 10:10:56 +0000 (UTC)
commit 2aa5bc5b6c075a122640b8eb0d51a4e1a27c91e3
Author: Xavier Padullés <testing chronojump org>
Date: Wed Apr 29 12:09:37 2020 +0200
Updated r-scripts licences
r-scripts/forcePosition.R | 20 ++++++++++++++++++++
r-scripts/maximumIsometricForce.R | 1 +
r-scripts/scripts-util.R | 20 ++++++++++++++++++++
r-scripts/sprintRadar.R | 2 +-
src/json/json.cs | 2 +-
5 files changed, 43 insertions(+), 2 deletions(-)
---
diff --git a/r-scripts/forcePosition.R b/r-scripts/forcePosition.R
index 6efdab11..3986a256 100644
--- a/r-scripts/forcePosition.R
+++ b/r-scripts/forcePosition.R
@@ -1,3 +1,23 @@
+#
+# This file is part of ChronoJump
+#
+# ChronoJump is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# ChronoJump is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Copyright (C) 2017-2020 Xavier Padullés <x padulles gmail com>
+# Copyright (C) 2017-2020 Xavier de Blas <xaviblas gmail com>
+
#F = sqrt( (cos(angle) * (ForceSensor + Mass * accel))^2 + #Horizontal component
# (sin(angle) * (ForceSensor + Mass * accel) + Mass * 9.81)^2) #Vertical component
diff --git a/r-scripts/maximumIsometricForce.R b/r-scripts/maximumIsometricForce.R
index 4063026d..41b43c5e 100644
--- a/r-scripts/maximumIsometricForce.R
+++ b/r-scripts/maximumIsometricForce.R
@@ -16,6 +16,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Copyright (C) 2017-2020 Xavier Padullés <x padulles gmail com>
+# Copyright (C) 2017-2020 Xavier de Blas <xaviblas gmail com>
#call from Chronojump or:
diff --git a/r-scripts/scripts-util.R b/r-scripts/scripts-util.R
index 0ca864ce..36dc77db 100644
--- a/r-scripts/scripts-util.R
+++ b/r-scripts/scripts-util.R
@@ -1,3 +1,23 @@
+#
+# This file is part of ChronoJump
+#
+# ChronoJump is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# ChronoJump is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Copyright (C) 2017-2020 Xavier Padullés <x padulles gmail com>
+# Copyright (C) 2017-2020 Xavier de Blas <xaviblas gmail com>
+
fixTitleAndOtherStrings <- function(str)
{
print(c("1 fixTitle=", str))
diff --git a/r-scripts/sprintRadar.R b/r-scripts/sprintRadar.R
index bbbfca47..38f7a828 100644
--- a/r-scripts/sprintRadar.R
+++ b/r-scripts/sprintRadar.R
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Copyright (C) 2017 Xavier Padullés <x padulles gmail com>
+# Copyright (C) 2017-2019 Xavier Padullés <x padulles gmail com>
# Copyright (C) 2017 Xavier de Blas <xaviblas gmail com>
#This code uses splitTimes: accumulated time (not lap time)
diff --git a/src/json/json.cs b/src/json/json.cs
index 0cb5cfed..d5173a40 100644
--- a/src/json/json.cs
+++ b/src/json/json.cs
@@ -35,7 +35,7 @@ public class Json
protected bool connected; //know if server is connected. Do it when there's a change on RFID (pulse)
protected WebRequest request; //generic request (for all methods except ping)
- protected static string serverUrl = "http://api.chronojump.org:8080";
+ protected static string serverUrl = "http://chronojump.org:8080";
//string serverUrl = "http://192.168.200.1:8080";
public static void ChangeServerUrl(string url)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]