|
95 | 95 | volatile int mems_event = 0;
|
96 | 96 |
|
97 | 97 | volatile uint8_t AccGyroMag_Enable = 0;
|
98 |
| -volatile uint8_t Enviroment_Enable = 0; |
| 98 | +volatile uint8_t Environment_Enable = 0; |
99 | 99 | volatile uint8_t Distance_Enable = 0;
|
100 | 100 | volatile uint8_t Gestures_Enable = 0;
|
101 | 101 |
|
@@ -360,7 +360,7 @@ fail:
|
360 | 360 | return 0;
|
361 | 361 | }
|
362 | 362 |
|
363 |
| - /*Update enviromental data (press*/ |
| 363 | + /*Update environmental data (press*/ |
364 | 364 | tBleStatus Environmental_Update(int32_t Press,uint16_t Hum,int16_t Temp)
|
365 | 365 | {
|
366 | 366 | tBleStatus ret;
|
@@ -656,12 +656,12 @@ fail:
|
656 | 656 | uint8_t EnvironmentalCharSize=2; /* Size for Environmental BLE characteristic */
|
657 | 657 | uint8_t manuf_data[30] =
|
658 | 658 | {
|
659 |
| - 2 /* lenght*/,0x0A,0x00 /* 0 dBm */, // Trasmission Power |
660 |
| - 8 /* lenght*/,0x09,NAME_FLIGHT1, // Complete Name |
661 |
| - 13 /* lenght*/ ,0xFF,0x01,/*SKD version */ |
| 659 | + 2 /* length*/,0x0A,0x00 /* 0 dBm */, // Transmission Power |
| 660 | + 8 /* length*/,0x09,NAME_FLIGHT1, // Complete Name |
| 661 | + 13 /* length*/ ,0xFF,0x01,/*SKD version */ |
662 | 662 | 0x80, /* NUCLEO-Board */
|
663 | 663 | 0x02, /* Prox */
|
664 |
| - 0xE0, /* ACC+Gyro+Mag+Pres+Hum+Temp */ |
| 664 | + 0xE0, /* ACC+Gyro+Mag+Press+Hum+Temp */ |
665 | 665 | 0x00, /* SensorFusionShort */
|
666 | 666 | 0x00, /* SensorFusionFloat */
|
667 | 667 | 0x00, /* BLE MAC start */
|
@@ -921,13 +921,13 @@ void Attribute_Modified_CB(uint16_t attr_handle, uint8_t * att_data, uint8_t dat
|
921 | 921 | {
|
922 | 922 | if (att_data[0] == 01)
|
923 | 923 | {
|
924 |
| - Enviroment_Enable = 1; |
925 |
| - FLIGHT1_PRINTF("Enviroment enabled\n"); |
| 924 | + Environment_Enable = 1; |
| 925 | + FLIGHT1_PRINTF("Environment enabled\n"); |
926 | 926 | }
|
927 | 927 | else if (att_data[0] == 0)
|
928 | 928 | {
|
929 |
| - Enviroment_Enable = 0; |
930 |
| - FLIGHT1_PRINTF("Enviroment disabled\n"); |
| 929 | + Environment_Enable = 0; |
| 930 | + FLIGHT1_PRINTF("Environment disabled\n"); |
931 | 931 | }
|
932 | 932 | }
|
933 | 933 | else if(attr_handle == GestureDetCharHandle + 2)
|
@@ -1169,9 +1169,9 @@ void loop()
|
1169 | 1169 | BTLE.update();
|
1170 | 1170 | if(Flight1.connected)
|
1171 | 1171 | {
|
1172 |
| - //Get enviroment data |
| 1172 | + //Get environment data |
1173 | 1173 | float humidity, temperature, pressure;
|
1174 |
| - if (Enviroment_Enable) |
| 1174 | + if (Environment_Enable) |
1175 | 1175 | {
|
1176 | 1176 | HumTemp.GetHumidity(&humidity);
|
1177 | 1177 | #ifdef USE_IKS01A3
|
@@ -1452,7 +1452,7 @@ void loop()
|
1452 | 1452 | }
|
1453 | 1453 |
|
1454 | 1454 | //Send all mems sensors data
|
1455 |
| - if (Enviroment_Enable) |
| 1455 | + if (Environment_Enable) |
1456 | 1456 | {
|
1457 | 1457 | Flight1.Environmental_Update(PressToSend, HumToSend, TempToSend);
|
1458 | 1458 | delay(30);
|
|
0 commit comments