From c14e55fd597fefde245bea31507043cdd3ec6ed1 Mon Sep 17 00:00:00 2001 From: Javier Guerra Melgares Date: Mon, 21 Oct 2019 17:14:58 +0200 Subject: [PATCH 1/3] Load the resources of the device when OTGC receives an empty introspection file --- .../openconnectivity/otgc/view/client/ClientView.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/openconnectivity/otgc/view/client/ClientView.java b/src/main/java/org/openconnectivity/otgc/view/client/ClientView.java index aaa2ee1..95963dc 100644 --- a/src/main/java/org/openconnectivity/otgc/view/client/ClientView.java +++ b/src/main/java/org/openconnectivity/otgc/view/client/ClientView.java @@ -169,9 +169,14 @@ private void processIntrospectResponse(ObservableValue Date: Mon, 21 Oct 2019 17:15:38 +0200 Subject: [PATCH 2/3] Fix to remove the flag for the maintenance resource --- README.md | 1 + extlibs/patchs/fix_config.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 extlibs/patchs/fix_config.patch diff --git a/README.md b/README.md index 7f40a4e..b58c8d4 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ git checkout swig 2. Apply all patchs of the OTGC in IoTivity-lite ``` git apply /extlibs/patchs/remove_cred_by_credid.patch +git apply /extlibs/patchs/fix_config.patch ``` 3. Go to the linux directory. ``` diff --git a/extlibs/patchs/fix_config.patch b/extlibs/patchs/fix_config.patch new file mode 100644 index 0000000..10a5fba --- /dev/null +++ b/extlibs/patchs/fix_config.patch @@ -0,0 +1,13 @@ +diff --git a/port/linux/oc_config.h b/port/linux/oc_config.h +index 8e801156..7c8fbd78 100644 +--- a/port/linux/oc_config.h ++++ b/port/linux/oc_config.h +@@ -34,7 +34,7 @@ typedef uint64_t oc_clock_time_t; + /* Add support for the oic.if.create interface in Collections */ + #define OC_COLLECTIONS_IF_CREATE + /* Add support for the maintenance resource */ +-#define OC_MNT ++//#define OC_MNT + /* If we selected support for dynamic memory allocation */ + #ifdef OC_DYNAMIC_ALLOCATION + #define OC_COLLECTIONS From 09b84320ab86319eb406fce2cb4cce49c55f6fad Mon Sep 17 00:00:00 2001 From: Javier Guerra Melgares Date: Mon, 21 Oct 2019 17:16:09 +0200 Subject: [PATCH 3/3] Update version to 2.4.0 --- build/debian/otgc_native.sh | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/debian/otgc_native.sh b/build/debian/otgc_native.sh index f6e2a35..bccc5a5 100755 --- a/build/debian/otgc_native.sh +++ b/build/debian/otgc_native.sh @@ -11,7 +11,7 @@ # Constants PROJECT_NAME="otgc" -VERSION="2.3.0" +VERSION="2.4.0" program=$0 diff --git a/pom.xml b/pom.xml index 8045c07..d217ef4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ otgc otgc - 2.3.0 + 2.4.0 UTF-8