Skip to content

Commit f2a88d7

Browse files
Bei-Ji-QuanBei-Ji-Quan
committed
fix bug
1 parent 00b93fd commit f2a88d7

18 files changed

Lines changed: 9 additions & 43 deletions

‎src/LoRaWan_APP.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
2-
3-
41
#include <LoRaWan_APP.h>
52
#include <Arduino.h>
63

@@ -893,5 +890,3 @@ void check_input_license()
893890
}
894891

895892
LoRaWanClass LoRaWAN;
896-
897-
#endif

‎src/driver/board.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ Maintainer: Miguel Luis and Gregory Cristian
1515

1616

1717

18-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
1918

2019
#include "../driver/board.h"
2120
#include "Arduino.h"
@@ -235,12 +234,12 @@ uint32_t HexToString(/*IN*/ const char * pHex,
235234
if(((pHex[i]&0xf0)>>4)>=0 && ((pHex[i]&0xf0)>>4)<=9)
236235
pByteString[2*i]=((pHex[i]&0xf0)>>4)+0x30;
237236
else if(((pHex[i]&0xf0)>>4)>=10 && ((pHex[i]&0xf0)>>4)<=16)
238-
pByteString[2*i]=((pHex[i]&0xf0)>>4)+0x37; // 小写：0x37 改为 0x57
237+
pByteString[2*i]=((pHex[i]&0xf0)>>4)+0x37; // 小写�x37 改为 0x57
239238

240239
if((pHex[i]&0x0f)>=0 && (pHex[i]&0x0f)<=9)
241240
pByteString[2*i+1]=(pHex[i]&0x0f)+0x30;
242241
else if((pHex[i]&0x0f)>=10 && (pHex[i]&0x0f)<=16)
243-
pByteString[2*i+1]=(pHex[i]&0x0f)+0x37; // 小写：0x37 改为 0x57
242+
pByteString[2*i+1]=(pHex[i]&0x0f)+0x37; // 小写�x37 改为 0x57
244243
}
245244
return 0;
246245
}
@@ -266,4 +265,3 @@ void assert_failed( uint8_t* file, uint32_t line )
266265
}
267266
}
268267
#endif
269-
#endif

‎src/driver/gpio-board.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*
2121
* \author Gregory Cristian ( Semtech )
2222
*/
23-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
2423

2524

2625
#include "../loramac/utilities.h"
@@ -72,4 +71,3 @@ uint32_t GpioMcuRead( Gpio_t *obj )
7271
return digitalRead(obj->pin);
7372
}
7473

75-
#endif

‎src/driver/gpio.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*
2525
* \author Gregory Cristian ( Semtech )
2626
*/
27-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
2827

2928
#include "../driver/gpio-board.h"
3029

@@ -57,4 +56,3 @@ uint32_t GpioRead( Gpio_t *obj )
5756
{
5857
return GpioMcuRead( obj );
5958
}
60-
#endif

‎src/driver/timer.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@
3939
/* Includes ------------------------------------------------------------------*/
4040

4141
#include <stdbool.h>
42-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
43-
4442
#include "../loramac/utilities.h"
45-
#endif
43+
4644
/* Exported types ------------------------------------------------------------*/
4745

4846
/*!

‎src/loramac/LoRaMac.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
2222
Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
2323
*/
2424

25-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
2625

2726
#include <stdbool.h>
2827
#include <string.h>
@@ -4230,4 +4229,3 @@ static void SetPublicNetwork( bool enable )
42304229
}
42314230
}
42324231
#endif
4233-
#endif

‎src/loramac/LoRaMac.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@
6565
extern "C" {
6666
#endif
6767

68+
#ifndef LORAWAN_PREAMBLE_LENGTH
69+
#define LORAWAN_PREAMBLE_LENGTH 8
70+
#endif
71+
6872

6973
//#define CLASS_A_WOTA
7074

‎src/loramac/region/Region.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
2121
2222
Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
2323
*/
24-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
25-
26-
2724
#include <stdbool.h>
2825
#include <string.h>
2926
#include <stdint.h>
@@ -1086,4 +1083,3 @@ void RegionRxBeaconSetup( LoRaMacRegion_t region, RxBeaconSetup_t* rxBeaconSetup
10861083
}
10871084
}
10881085
}
1089-
#endif

‎src/loramac/region/RegionAS923.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
2121
2222
Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
2323
*/
24-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
2524

2625
#include <stdbool.h>
2726
#include <string.h>
@@ -1154,4 +1153,3 @@ void RegionAS923RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
11541153
// Store downlink datarate
11551154
*outDr = AS923_BEACON_CHANNEL_DR;
11561155
}
1157-
#endif

‎src/loramac/region/RegionAU915.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
2121
2222
Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jaeckle ( STACKFORCE )
2323
*/
24-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
2524
#include <stdbool.h>
2625
#include <string.h>
2726
#include <stdint.h>
@@ -912,4 +911,3 @@ void RegionAU915RxBeaconSetup( RxBeaconSetup_t* rxBeaconSetup, uint8_t* outDr )
912911
// Store downlink datarate
913912
*outDr = AU915_BEACON_CHANNEL_DR;
914913
}
915-
#endif

0 commit comments

Comments
 (0)