diff options
| author | David Sidrane <david_s5@nscdg.com> | 2015-04-20 05:04:45 -1000 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-04-20 05:04:45 -1000 |
| commit | 98ac8800b6f6c04f45948cbf41dc13ad562f0617 (patch) | |
| tree | 72edda34ebd8690408f6cf55f0b3867e784b79f6 | |
| parent | 914cba60c4688d2c6056b1d00aa0ee2e1326d718 (diff) | |
| parent | 4b5ede957729c65ef5854c65d81b1fd1f2325ae7 (diff) | |
| download | px4-firmware-98ac8800b6f6c04f45948cbf41dc13ad562f0617.tar.gz px4-firmware-98ac8800b6f6c04f45948cbf41dc13ad562f0617.tar.bz2 px4-firmware-98ac8800b6f6c04f45948cbf41dc13ad562f0617.zip | |
Merge pull request #2047 from PX4/nuttx_next_7-9_rand
Updated to Nuttx 7.9 (plus) Includes fix for RAND_MAX
| m--------- | NuttX | 0 | ||||
| -rwxr-xr-x | nuttx-patches/Fixed-Shadow-wanings.patch | 8 | ||||
| -rw-r--r-- | src/lib/px4_eigen.h | 1 | ||||
| -rw-r--r-- | src/modules/controllib/blocks.hpp | 6 |
4 files changed, 7 insertions, 8 deletions
diff --git a/NuttX b/NuttX -Subproject 66a5658034ad8cb36a834ebb9eb4bf741560eb4 +Subproject 4127e317213457fb9d3e41d0c1f4ead6f0d46d6 diff --git a/nuttx-patches/Fixed-Shadow-wanings.patch b/nuttx-patches/Fixed-Shadow-wanings.patch index 3c0ab5f7c..1b3a01fe7 100755 --- a/nuttx-patches/Fixed-Shadow-wanings.patch +++ b/nuttx-patches/Fixed-Shadow-wanings.patch @@ -1,8 +1,8 @@ diff --git NuttX/nuttx/include/signal.h NuttX/nuttx/include/signal.h -index ffb77e0..cca6a15 100644 +index 8ef4d5f..f970a49 100644 --- NuttX/nuttx/include/signal.h +++ NuttX/nuttx/include/signal.h -@@ -260,8 +260,11 @@ int sigfillset(FAR sigset_t *set); +@@ -271,8 +271,11 @@ int sigfillset(FAR sigset_t *set); int sigaddset(FAR sigset_t *set, int signo); int sigdelset(FAR sigset_t *set, int signo); int sigismember(FAR const sigset_t *set, int signo); @@ -11,9 +11,9 @@ index ffb77e0..cca6a15 100644 int sigaction(int sig, FAR const struct sigaction *act, FAR struct sigaction *oact); +#pragma GCC diagnostic pop + void (*sigset(int signo, void (*disp)(int)))(int); + int sigignore(int signo); int sigprocmask(int how, FAR const sigset_t *set, FAR sigset_t *oset); - int sigpending(FAR sigset_t *set); - int sigsuspend(FAR const sigset_t *sigmask); diff --git NuttX/nuttx/include/stdio.h NuttX/nuttx/include/stdio.h index cb16366..6ff12bb 100644 --- NuttX/nuttx/include/stdio.h diff --git a/src/lib/px4_eigen.h b/src/lib/px4_eigen.h index 2cd98e59a..f125bcbbf 100644 --- a/src/lib/px4_eigen.h +++ b/src/lib/px4_eigen.h @@ -41,7 +41,6 @@ #pragma once #pragma GCC diagnostic push -#define RAND_MAX __RAND_MAX #pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wfloat-equal" #define _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC 1 diff --git a/src/modules/controllib/blocks.hpp b/src/modules/controllib/blocks.hpp index 65600190b..b4859dc4f 100644 --- a/src/modules/controllib/blocks.hpp +++ b/src/modules/controllib/blocks.hpp @@ -446,7 +446,7 @@ public: }; virtual ~BlockRandUniform() {}; float update() { - static float rand_max = MAX_RAND; + static float rand_max = RAND_MAX; float rand_val = rand(); float bounds = getMax() - getMin(); return getMin() + (rand_val * bounds) / rand_max; @@ -483,8 +483,8 @@ public: if (phase == 0) { do { - float U1 = (float)rand() / MAX_RAND; - float U2 = (float)rand() / MAX_RAND; + float U1 = (float)rand() / RAND_MAX; + float U2 = (float)rand() / RAND_MAX; V1 = 2 * U1 - 1; V2 = 2 * U2 - 1; S = V1 * V1 + V2 * V2; |