FabLab LoRa
hhh
Dependencies: HC_SR04_Ultrasonic_Library X_NUCLEO_IKS01A2 mbed LoRaWAN-lib SX1272Lib
Fork of
LoRaWANdemoUnina
by 
Salvatore Gulfo
Revision 9:85c85c65299a, committed 2017-11-17
- Comitter:
- salvatoregulfo
- Date:
- Fri Nov 17 12:29:00 2017 +0000
- Parent:
- 8:346c55cb6033
- Commit message:
- to FabLab LoRa with love
Changed in this revision
diff -r 346c55cb6033 -r 85c85c65299a HC_SR04_Ultrasonic_Library.lib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/HC_SR04_Ultrasonic_Library.lib Fri Nov 17 12:29:00 2017 +0000 @@ -0,0 +1,1 @@ +http://os.mbed.com/users/ejteb/code/HC_SR04_Ultrasonic_Library/#e0f9c9fb4cf3
diff -r 346c55cb6033 -r 85c85c65299a app/Commissioning.h
--- a/app/Commissioning.h Tue Oct 03 13:11:33 2017 +0000
+++ b/app/Commissioning.h Fri Nov 17 12:29:00 2017 +0000
@@ -35,7 +35,7 @@
/*!
* Mote device IEEE EUI (big endian)
*/
-#define LORAWAN_DEVICE_EUI { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88 }
+#define LORAWAN_DEVICE_EUI { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x13 }
/*!
* Application IEEE EUI (big endian)
@@ -55,21 +55,27 @@
/*!
* Device address on the network (big endian)
*/
-#define LORAWAN_DEVICE_ADDRESS 0x00000002
+#define LORAWAN_DEVICE_ADDRESS 0x00000006
/*!
* AES encryption/decryption cipher network session key
*/
-#define LORAWAN_NWKSKEY { 0x2A, 0x91, 0xD4, 0xE6, 0x6B, 0x55, 0x4A, 0x40, 0x1A, 0xE7, 0xD3, 0x7D, 0x47, 0x95, 0xD2, 0x37 }
+#define LORAWAN_NWKSKEY { 0xA2, 0x5D, 0x17, 0x57, 0xF9, 0x9C, 0xC1, 0x95, 0xE6, 0xD3, 0xD8, 0xD7, 0xF1, 0xAE, 0x9B, 0xF0 }
/*!
* AES encryption/decryption cipher application session key
*/
-#define LORAWAN_APPSKEY { 0x6D, 0x31, 0xDF, 0x5B, 0x8B, 0x8E, 0x87, 0x00, 0x20, 0xBC, 0x1C, 0x2F, 0x89, 0xA6, 0xAD, 0x9D }
+#define LORAWAN_APPSKEY { 0xFC, 0x43, 0x3B, 0x31, 0x8E, 0x17, 0x7C, 0x78, 0x44, 0xFF, 0x5B, 0x4D, 0x0B, 0x3A, 0xDD, 0x56 }
#endif // __LORA_COMMISSIONING_H__
//99 0x65, 0x6A, 0x43, 0x5E, 0x15, 0x3E, 0x5F, 0x23, 0xCF, 0x0C, 0x11, 0x77, 0x30, 0x83, 0xA3, 0x5D
// 0x3C, 0xC4, 0xFE, 0xAD, 0x9B, 0xC7, 0x7D, 0x9F, 0xCF, 0x9D, 0x0A, 0xE0, 0x96, 0x2F, 0xF1, 0xFD
// 88 0x2A, 0x91, 0xD4, 0xE6, 0x6B, 0x55, 0x4A, 0x40, 0x1A, 0xE7, 0xD3, 0x7D, 0x47, 0x95, 0xD2, 0x37
-// 0x6D, 0x31, 0xDF, 0x5B, 0x8B, 0x8E, 0x87, 0x00, 0x20, 0xBC, 0x1C, 0x2F, 0x89, 0xA6, 0xAD, 0x9D
\ No newline at end of file
+// 0x6D, 0x31, 0xDF, 0x5B, 0x8B, 0x8E, 0x87, 0x00, 0x20, 0xBC, 0x1C, 0x2F, 0x89, 0xA6, 0xAD, 0x9D
+//11 0x4F, 0x8C, 0xC4, 0x5D, 0xCF, 0xFF, 0xE0, 0xD4, 0x8B, 0xCF, 0xB7, 0xED, 0x73, 0x56, 0x12, 0x79
+// 0xB4, 0x38, 0x85, 0xD5, 0x0B, 0x0A, 0xA1, 0x29, 0x25, 0xAF, 0x39, 0x01, 0xC5, 0x10, 0x3C, 0xD0
+//12 0xE7, 0xB2, 0x82, 0x2C, 0xFD, 0x0E, 0x33, 0x4B, 0x35, 0xF3, 0x24, 0xC9, 0x10, 0x4E, 0x26, 0x46
+// 0x80, 0x76, 0xBC, 0x93, 0xE0, 0xDF, 0x28, 0xDA, 0x16, 0xA5, 0xC1, 0x82, 0x1C, 0x4B, 0x06, 0xE7
+//13 0xA2, 0x5D, 0x17, 0x57, 0xF9, 0x9C, 0xC1, 0x95, 0xE6, 0xD3, 0xD8, 0xD7, 0xF1, 0xAE, 0x9B, 0xF0
+// 0xFC, 0x43, 0x3B, 0x31, 0x8E, 0x17, 0x7C, 0x78, 0x44, 0xFF, 0x5B, 0x4D, 0x0B, 0x3A, 0xDD, 0x56
\ No newline at end of file
diff -r 346c55cb6033 -r 85c85c65299a app/main.cpp
--- a/app/main.cpp Tue Oct 03 13:11:33 2017 +0000
+++ b/app/main.cpp Fri Nov 17 12:29:00 2017 +0000
@@ -21,15 +21,18 @@
#include "SerialDisplay.h"
#include "XNucleoIKS01A2.h"
#include "string.h"
+#include "ultrasonic.h"
/* Instantiate the expansion board */
static XNucleoIKS01A2 *mems_expansion_board = XNucleoIKS01A2::instance(D14, D15, D4, D5);
+ultrasonic usensor(D8, D9, .1, 1);
+//static HCSR04 *myUS = ultrasonic::ultrasonic(D8,D9,.1,1) //set the trigger pin to D8 and the Echo pin to D9
/* Retrieve the composing elements of the expansion board */
-static HTS221Sensor *hum_temp = mems_expansion_board->ht_sensor;
+//static HTS221Sensor *hum_temp = mems_expansion_board->ht_sensor;
//static LSM303AGRAccSensor *accelerometer = mems_expansion_board->accelerometer;
//static LSM6DSLSensor *acc_gyro = mems_expansion_board->acc_gyro;
-
+//static LPS22HBSensor *press_temp = mems_expansion_board->pt_sensor;
/*!
* Defines the application data transmission duty cycle. 5s, value in [ms].
*/
@@ -56,7 +59,7 @@
*
* \remark Please note that when ADR is enabled the end-device should be static
*/
-#define LORAWAN_ADR_ON 1
+#define LORAWAN_ADR_ON 0
#if defined( USE_BAND_868 )
@@ -334,13 +337,15 @@
*/
float value1, value2;
char buffer1[32];
+ long dist1;
// int16_t Myaxes_int[3];
// float Myaxes[3];
// float sensitivity;
// int32_t axes[3];
- // char Cont[64];
- uint32_t Cont[64];
- // InterruptIn BlueButton(USER_BUTTON);
+ char Cont[64];
+ // uint32_t Cont[64];
+ // InterruptIn BlueButton(USER_BUTTON);
+
static void PrepareTxFrame( uint8_t port )
{
@@ -349,9 +354,13 @@
case 13:
- hum_temp->get_temperature(&value1);
- hum_temp->get_humidity(&value2);
- strcpy((char*)Cont, (char*) print_double(buffer1,value2) );
+
+ // hum_temp->get_temperature(&value1);
+ // hum_temp->get_humidity(&value2);
+ // press_temp->get_pressure(&value1);
+ dist1 = usensor.getCurrentDistance();
+ // usensor->getCurrentDistance(&dist1);
+ strcpy((char*)Cont, (char*) print_double(buffer1,dist1) );
// strcat((char*)Cont, " " );
// strcat((char*)Cont, print_double(buffer1,value2) );
// strcat((char*)Cont, " ");
@@ -389,16 +398,18 @@
strcat(Cont, " ");
strcat(Cont, (char*) print_double(buffer1, value2)); */
- // while(1) {
- AppDataSize = sprintf ((char*)AppData,(char*)Cont);
- /* if (BlueButton)
+ /* while(1) {
+ // AppDataSize = sprintf ((char*)AppData,(char*)Cont);
+ if (BlueButton)
{ AppDataSize = sprintf((char*)AppData, "0");
- break; }
+ break;
+ }
else
{ AppDataSize = sprintf((char*)AppData, "1");
- break; }
- // AppDataSize = sprintf((char*)AppData, "69");
- //} */
+ break;
+ } */
+ AppDataSize = sprintf((char*)AppData, (char*)Cont);
+ // }
break;
case 15:
@@ -881,10 +892,11 @@
//enable sensors
// accelerometer -> enable();
- hum_temp -> enable();
+ // hum_temp -> enable();
+ // press_temp -> enable();
// acc_gyro->enable_x();
// acc_gyro->enable_g();
-
+ usensor.startUpdates();
BoardInit( );
SerialDisplayInit( );
@@ -1041,7 +1053,7 @@
IsNetworkJoinedStatusUpdate = true;
break;
}
- case DEVICE_STATE_SEND:
+ case DEVICE_STATE_SEND: //send frame
{
if( NextTx == true )
{