Fix product type and featureset detection

Update copyright year to 2018 Add LICENSE file
Sensirion · Mar 21, 2018 · 864517c · 864517c
1 parent 2e4972a
commit 864517c
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 17 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017, Sensirion AG
+Copyright (c) 2018, Sensirion AG
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/embedded-common b/embedded-common
diff --git a/sgp-common/sgp_featureset.h b/sgp-common/sgp_featureset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Sensirion AG
+ * Copyright (c) 2018, Sensirion AG
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/sgp30/sgp30.c b/sgp30/sgp30.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Sensirion AG
+ * Copyright (c) 2018, Sensirion AG
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -766,7 +766,7 @@ u8 sgp_get_configured_address() {
  */
 s16 sgp_get_feature_set_version(u16 *feature_set_version, u8 *product_type) {
     *feature_set_version = client_data.info.feature_set_version & 0x00FF;
-    *product_type = (u8)((client_data.info.feature_set_version & 0xC0000) >> 14);
+    *product_type = (u8)((client_data.info.feature_set_version & 0xF000) >> 12);
     return STATUS_OK;
 }
 

diff --git a/sgp30/sgp30.h b/sgp30/sgp30.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Sensirion AG
+ * Copyright (c) 2018, Sensirion AG
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/sgp30/sgp30_example_usage.c b/sgp30/sgp30_example_usage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Sensirion AG
+ * Copyright (c) 2018, Sensirion AG
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/sgp30/sgp30_featureset.c b/sgp30/sgp30_featureset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Sensirion AG
+ * Copyright (c) 2018, Sensirion AG
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/sgpc3/sgpc3.c b/sgpc3/sgpc3.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Sensirion AG
+ * Copyright (c) 2018, Sensirion AG
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -341,7 +341,6 @@ static u16 sgp_fill_cmd_send_buf(u8 *buf, const sgp_command *cmd,
  */
 static s16 sgp_detect_featureset_version(u16 *featureset) {
     s16 i, j;
-    s16 ret = STATUS_FAIL;
     u16 feature_set_version = be16_to_cpu(*featureset);
     const struct sgp_otp_featureset *sgp_featureset;
 
@@ -353,12 +352,11 @@ static s16 sgp_detect_featureset_version(u16 *featureset) {
             if (SGP_FS_COMPAT(feature_set_version,
                               sgp_featureset->supported_featureset_versions[j])) {
                 client_data.otp_features = sgp_featureset;
-                ret = STATUS_OK;
-                break;
+                return STATUS_OK;
             }
         }
     }
-    return ret;
+    return STATUS_FAIL;
 }
 
 
@@ -852,7 +850,7 @@ u8 sgp_get_configured_address() {
  */
 s16 sgp_get_feature_set_version(u16 *feature_set_version, u8 *product_type) {
     *feature_set_version = client_data.info.feature_set_version & 0x00FF;
-    *product_type = (u8)((client_data.info.feature_set_version & 0xC0000) >> 14);
+    *product_type = (u8)((client_data.info.feature_set_version & 0xF000) >> 12);
     return STATUS_OK;
 }
 

diff --git a/sgpc3/sgpc3.h b/sgpc3/sgpc3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Sensirion AG
+ * Copyright (c) 2018, Sensirion AG
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/sgpc3/sgpc3_example_usage.c b/sgpc3/sgpc3_example_usage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Sensirion AG
+ * Copyright (c) 2018, Sensirion AG
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/sgpc3/sgpc3_featureset.c b/sgpc3/sgpc3_featureset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Sensirion AG
+ * Copyright (c) 2018, Sensirion AG
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without