Revision 64:234904f2d251, committed 2021-01-29

Comitter:

algrs

Date:

Fri Jan 29 09:37:45 2021 +0000

Parent:

63:cd8ab5860303

Commit message:

sku sku

Changed in this revision

diff -r cd8ab5860303 -r 234904f2d251 driver_mbed_TH02.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/driver_mbed_TH02.lib	Fri Jan 29 09:37:45 2021 +0000
@@ -0,0 +1,1 @@
+https://os.mbed.com/users/TaylorGy/code/driver_mbed_TH02/#89151affda00

diff -r cd8ab5860303 -r 234904f2d251 main.cpp
--- a/main.cpp	Tue Oct 20 13:21:32 2020 +0000
+++ b/main.cpp	Fri Jan 29 09:37:45 2021 +0000
@@ -20,6 +20,7 @@
 #include "lorawan/LoRaWANInterface.h"
 #include "lorawan/system/lorawan_data_structures.h"
 #include "events/EventQueue.h"
+#include "driver_mbed_TH02.h"
 
 // Application helpers
 #include "DummySensor.h"
@@ -191,16 +192,20 @@
     int32_t sensor_value, rh_value;
 
  MyTH02.startTempConv(true,true);
-    iTime= MyTH02.waitEndConversion();// wait until onversion  is done
+    iTime= MyTH02.waitEndConversion();
      fTemp= (float)MyTH02.getConversionValue()/10;
+     
+   fTemp=myTH02.ReadTemperature();
    
     printf ("\n\r temp value=%2.1f",fTemp);
   
  MyTH02.startRHConv(true,true);
-    iTime= MyTH02.waitEndConversion();// wait until onversion  is done
-     fRH= (float) MyTH02.getConversionValue()/10;
+    iTime= MyTH02.waitEndConversion();
+    fRH= (float) MyTH02.getConversionValue()/10;
    
-    printf ("\n\r humidity value=  %2.1f",fRH );
+    fRH=myTH02.ReadHumidity();
+    
+    printf ("\n\r humidity value=  %2.1f",fRH);
 
 /*
     if (ds1820.begin()) {

diff -r cd8ab5860303 -r 234904f2d251 mbed_app.json
--- a/mbed_app.json	Tue Oct 20 13:21:32 2020 +0000
+++ b/mbed_app.json	Fri Jan 29 09:37:45 2021 +0000
@@ -31,15 +31,16 @@
             "platform.stdio-convert-newlines": true,
             "platform.stdio-baud-rate": 115200,
             "platform.default-serial-baud-rate": 115200,
-            "lora.over-the-air-activation": false,
+            "lora.over-the-air-activation": true,
             "lora.duty-cycle-on": true,
             "lora.phy": "EU868",
           
-            "lora.device-eui": " {  0x00, 0x87, 0xCC, 0xEA, 0xD9, 0x44, 0xF5, 0x29 }",
-            "lora.application-eui": "{ 0x70, 0xB3, 0xD5, 0x7E, 0xD0, 0x02, 0x16, 0x8E }",
-            "lora.application-key": "{ 0x77, 0x8A, 0x26, 0xDF, 0x9D, 0x70, 0xDB, 0xEF, 0x43, 0x03, 0x0F, 0xD2, 0x5F, 0x47, 0x1D, 0x00 }",
-            "lora.appskey": "{ 0x9A, 0x9D, 0xA0, 0x2C, 0xC3, 0xC4, 0xB2, 0xD6, 0xA0, 0x42, 0xEC, 0xE3, 0xBF, 0x4A, 0x53, 0xFF }",
-            "lora.nwkskey": "{ 0xDE, 0x09, 0x34, 0xE3, 0x1F, 0x60, 0xEB, 0x9E, 0x30, 0xB2, 0x13, 0x1F, 0xE6, 0x53, 0xBA, 0xBC }",
+            "lora.device-eui": " { 0x00, 0xE8, 0xB7, 0x54, 0x9F, 0x08, 0x48, 0xDB }",
+            "lora.application-eui": "{ 0x70, 0xB3, 0xD5, 0x7E, 0xD0, 0x03, 0xC2, 0x17 }", 
+            "lora.application-key": "{ 0x78, 0x53, 0xF3, 0x85, 0x64, 0x3A, 0x09, 0xD3, 0x93, 0x27, 0x02, 0x50, 0xD2, 0xA5, 0xC5, 0x51 }",
+            
+            "lora.appskey": "{ 0x9A, 0x9D, 0xA0, 0x2C, 0xC3, 0xC4, 0xB2, 0xD6, 0xA0, 0x42, 0xEC, 0xE3, 0xBF, 0x4A, 0x53, 0xFF }", 
+            "lora.nwkskey": "{ 0xDE, 0x09, 0x34, 0xE3, 0x1F, 0x60, 0xEB, 0x9E, 0x30, 0xB2, 0x13, 0x1F, 0xE6, 0x53, 0xBA, 0xBC }", 
             "lora.device-address": " 0x26013AC5"
             
         },