From 42002c4afd12939ced892c1f5266d25ed306dafc Mon Sep 17 00:00:00 2001 From: Iztok Jeras Date: Fri, 28 Aug 2015 16:02:27 +0200 Subject: [PATCH 1/6] Red Pitaya: reordered functions, and added some comments, no functional changes --- src/wiring/red-pitaya.c | 46 +++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/src/wiring/red-pitaya.c b/src/wiring/red-pitaya.c index c08f1f3..8658546 100644 --- a/src/wiring/red-pitaya.c +++ b/src/wiring/red-pitaya.c @@ -39,6 +39,7 @@ rp_apin_t aout[] = {RP_AOUT0, RP_AOUT1, RP_AOUT2, RP_AOUT3}; #define AREAD_MAX_VALUE 1023 #define RP_AWRITE_MAX_VALUE 156 #define RP_AREAD_MAX_VALUE 2047 + /************************************************************************************************** * 1.General *************************************************************************************************/ @@ -57,7 +58,9 @@ void pinReset (int pin) printf("%s function not implemented\n",__func__); } - +/************************************************************************************************** + * Digital pins + *************************************************************************************************/ void pinMode(int pin, int mode) { @@ -100,6 +103,10 @@ int digitalRead (int pin) return -1; } +/************************************************************************************************** + * Analog pins + *************************************************************************************************/ + void analogWrite (int pin, int value) { //Scale values from 0-1023 to 0-2047 @@ -114,21 +121,6 @@ void analogWrite (int pin, int value) printf("Pin %d is not analog output\n",pin); } -int analogReadRaw (int pin) -{ - if(pin Date: Fri, 28 Aug 2015 17:34:09 +0200 Subject: [PATCH 2/6] Red Pitaya: updated scaling of analog Read/Write --- src/wiring/red-pitaya.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/wiring/red-pitaya.c b/src/wiring/red-pitaya.c index 8658546..6f18d01 100644 --- a/src/wiring/red-pitaya.c +++ b/src/wiring/red-pitaya.c @@ -35,10 +35,10 @@ rp_apin_t aout[] = {RP_AOUT0, RP_AOUT1, RP_AOUT2, RP_AOUT3}; #define GPIO 24 #define AIN 4 #define AOUT 4 -#define AWRITE_MAX_VALUE 255 -#define AREAD_MAX_VALUE 1023 +#define AWRITE_MAX_VALUE 0xFF +#define AREAD_MAX_VALUE 0x3FF #define RP_AWRITE_MAX_VALUE 156 -#define RP_AREAD_MAX_VALUE 2047 +#define RP_AREAD_MAX_VALUE 0xFFF /************************************************************************************************** * 1.General @@ -109,7 +109,6 @@ int digitalRead (int pin) void analogWrite (int pin, int value) { - //Scale values from 0-1023 to 0-2047 int scaled_value = value*RP_AWRITE_MAX_VALUE/AWRITE_MAX_VALUE; if(pin Date: Fri, 4 Sep 2015 17:13:46 +0200 Subject: [PATCH 3/6] Wyliodrin: attempt to fix Analog input range on shield (10V instead of 7V) --- src/wiring/red-pitaya.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/wiring/red-pitaya.c b/src/wiring/red-pitaya.c index 6f18d01..8cf2217 100644 --- a/src/wiring/red-pitaya.c +++ b/src/wiring/red-pitaya.c @@ -146,14 +146,13 @@ void analogWriteVoltage (int pin, float value) int analogRead (int pin) { - int scaled_value; if(pin Date: Thu, 10 Sep 2015 16:58:44 +0200 Subject: [PATCH 4/6] added node.js includes to CMake --- CMakeLists.txt | 4 ++++ cmake/modules/FindNodeJS.cmake | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100644 cmake/modules/FindNodeJS.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e8741d..e69f6dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,10 @@ endif () find_package (PkgConfig REQUIRED) +find_package(NodeJS REQUIRED) +include_directories(${NODEJS_INCLUDE_DIR}) +include_directories(${NODEJS_UV_INCLUDE_DIR}) + find_package(Hiredis REQUIRED) include_directories(${HIREDIS_INCLUDE_DIR}) diff --git a/cmake/modules/FindNodeJS.cmake b/cmake/modules/FindNodeJS.cmake new file mode 100644 index 0000000..6a6f048 --- /dev/null +++ b/cmake/modules/FindNodeJS.cmake @@ -0,0 +1,8 @@ +find_path(NODEJS_INCLUDE_DIR node.h + PATHS + /usr/include/nodejs/src + ) +find_path(NODEJS_UV_INCLUDE_DIR uv.h + PATHS + /usr/include/nodejs/deps/uv/include/ + ) From 831f7beda354a2aa24d2540759a522ea8fd666c0 Mon Sep 17 00:00:00 2001 From: Iztok Jeras Date: Thu, 24 Sep 2015 19:00:41 +0200 Subject: [PATCH 5/6] Revert "added node.js includes to CMake" This reverts commit ab7748ceea490f6b41db0c79ef56871167ecad2f. --- CMakeLists.txt | 4 ---- cmake/modules/FindNodeJS.cmake | 8 -------- 2 files changed, 12 deletions(-) delete mode 100644 cmake/modules/FindNodeJS.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index e69f6dd..7e8741d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,10 +16,6 @@ endif () find_package (PkgConfig REQUIRED) -find_package(NodeJS REQUIRED) -include_directories(${NODEJS_INCLUDE_DIR}) -include_directories(${NODEJS_UV_INCLUDE_DIR}) - find_package(Hiredis REQUIRED) include_directories(${HIREDIS_INCLUDE_DIR}) diff --git a/cmake/modules/FindNodeJS.cmake b/cmake/modules/FindNodeJS.cmake deleted file mode 100644 index 6a6f048..0000000 --- a/cmake/modules/FindNodeJS.cmake +++ /dev/null @@ -1,8 +0,0 @@ -find_path(NODEJS_INCLUDE_DIR node.h - PATHS - /usr/include/nodejs/src - ) -find_path(NODEJS_UV_INCLUDE_DIR uv.h - PATHS - /usr/include/nodejs/deps/uv/include/ - ) From 51fa72d7dcfe84839ec5e769478d2491c799293d Mon Sep 17 00:00:00 2001 From: Iztok Jeras Date: Mon, 12 Oct 2015 14:56:38 +0200 Subject: [PATCH 6/6] Red Pitaya: changed extension board analog input range from 10V to 7V --- src/wiring/red-pitaya.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wiring/red-pitaya.c b/src/wiring/red-pitaya.c index 8cf2217..ed0ef77 100644 --- a/src/wiring/red-pitaya.c +++ b/src/wiring/red-pitaya.c @@ -186,7 +186,7 @@ float analogReadVoltage (int pin) int rc = rp_ApinGetValueRaw(ain[pin], &value); if(rc == RP_OK) { - scaled_value = (float) value * 10.0/RP_AREAD_MAX_VALUE; + scaled_value = (float) value * 7.0/RP_AREAD_MAX_VALUE; return scaled_value; } printf("%s\n", rp_GetError(rc));