Skip to content

Commit 877f9f5

Browse files
wangxiangwangeusewangxiangwangeuse
committed
Fixed some bugs
1 parent def57db commit 877f9f5

37 files changed

+100
-4
lines changed

‎src/ESP32_LoRaWan_102.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if !defined(HT_DE01)||!defined(WIFI_Kit_32)||!defined(WIFI_Kit_32_V3)
12
#ifndef __LORAWAN_102_H__
23
#define __LORAWAN_102_H__
34

@@ -6,3 +7,5 @@
67
#include "loramac/region/Region.h"
78

89
#endif
10+
11+
#endif

‎src/ESP32_Mcu.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2+
#if defined(HT_DE01)||defined(WIFI_Kit_32)||defined(WIFI_Kit_32_V3)
3+
#else
4+
15
#ifndef McuSet_H
26
#define McuSet_H
37

@@ -81,3 +85,4 @@ extern DioIrqHandler *DioIrq[];
8185

8286
extern McuClass Mcu;
8387
#endif
88+
#endif

‎src/LoRaWan_APP.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#if defined(WIFI_LORA_32_V3)||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+
14
#include <LoRaWan_APP.h>
25
#include <Arduino.h>
36

@@ -891,3 +894,4 @@ void check_input_license()
891894

892895
LoRaWanClass LoRaWAN;
893896

897+
#endif

‎src/LoRaWan_APP.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
3+
14
#ifndef LoRaWan_APP_H
25
#define LoRaWan_APP_H
36

‎src/driver/board-config.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
*
3131
* \author Johannes Bruder ( STACKFORCE )
3232
*/
33+
34+
#if defined(WIFI_LORA_32_V3)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
35+
3336
#ifndef __BOARD_CONFIG_H__
3437
#define __BOARD_CONFIG_H__
3538

@@ -95,3 +98,4 @@
9598

9699

97100
#endif // __BOARD_CONFIG_H__
101+
#endif

‎src/driver/board.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
1212
1313
Maintainer: Miguel Luis and Gregory Cristian
1414
*/
15+
16+
17+
18+
#if defined(WIFI_LORA_32_V3)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
19+
1520
#include "../driver/board.h"
1621
#include "Arduino.h"
1722

@@ -230,12 +235,12 @@ uint32_t HexToString(/*IN*/ const char * pHex,
230235
if(((pHex[i]&0xf0)>>4)>=0 && ((pHex[i]&0xf0)>>4)<=9)
231236
pByteString[2*i]=((pHex[i]&0xf0)>>4)+0x30;
232237
else if(((pHex[i]&0xf0)>>4)>=10 && ((pHex[i]&0xf0)>>4)<=16)
233-
pByteString[2*i]=((pHex[i]&0xf0)>>4)+0x37; // Сд£º0x37 ¸ÄΪ 0x57
238+
pByteString[2*i]=((pHex[i]&0xf0)>>4)+0x37; // 小写：0x37 改为 0x57
234239

235240
if((pHex[i]&0x0f)>=0 && (pHex[i]&0x0f)<=9)
236241
pByteString[2*i+1]=(pHex[i]&0x0f)+0x30;
237242
else if((pHex[i]&0x0f)>=10 && (pHex[i]&0x0f)<=16)
238-
pByteString[2*i+1]=(pHex[i]&0x0f)+0x37; // Сд£º0x37 ¸ÄΪ 0x57
243+
pByteString[2*i+1]=(pHex[i]&0x0f)+0x37; // 小写：0x37 改为 0x57
239244
}
240245
return 0;
241246
}
@@ -261,3 +266,4 @@ void assert_failed( uint8_t* file, uint32_t line )
261266
}
262267
}
263268
#endif
269+
#endif

‎src/driver/board.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
*
2121
* \author Gregory Cristian ( Semtech )
2222
*/
23+
24+
#if !defined(HT_DE01)||defined(WIFI_Kit_32)||defined(WIFI_Kit_32_V3)
2325
#ifndef __BOARD_H__
2426
#define __BOARD_H__
2527

@@ -148,3 +150,4 @@ BoardVersion_t BoardGetVersion( void );
148150
#endif
149151

150152
#endif // __BOARD_H__
153+
#endif

‎src/driver/gpio-board.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
*
2121
* \author Gregory Cristian ( Semtech )
2222
*/
23+
#if defined(WIFI_LORA_32_V3)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
24+
25+
2326
#include "../loramac/utilities.h"
2427
#include "../driver/rtc-board.h"
2528
#include "../driver/gpio-board.h"
@@ -68,3 +71,5 @@ uint32_t GpioMcuRead( Gpio_t *obj )
6871
{
6972
return digitalRead(obj->pin);
7073
}
74+
75+
#endif

‎src/driver/gpio-board.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
*
2121
* \author Gregory Cristian ( Semtech )
2222
*/
23+
24+
25+
2326
#ifndef __GPIO_BOARD_H__
2427
#define __GPIO_BOARD_H__
2528

@@ -81,4 +84,4 @@ void GpioMcuToggle( Gpio_t *obj );
8184
*/
8285
uint32_t GpioMcuRead( Gpio_t *obj );
8386

84-
#endif // __GPIO_BOARD_H__
87+
#endif //#

‎src/driver/gpio.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
*
2525
* \author Gregory Cristian ( Semtech )
2626
*/
27+
#if defined(WIFI_LORA_32_V3)||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
28+
2729
#include "../driver/gpio-board.h"
2830

2931
void GpioInit( Gpio_t *obj, uint8_t pin, uint8_t mode, PinConfigs config, PinTypes type, uint32_t value )
@@ -55,3 +57,4 @@ uint32_t GpioRead( Gpio_t *obj )
5557
{
5658
return GpioMcuRead( obj );
5759
}
60+
#endif

0 commit comments

Comments
 (0)