Skip to content

Commit 549b403

Browse files
wangxiangwangeusewangxiangwangeuse
authored
Merge pull request #148 from wangxiangwangeuse/master
fixed some bugs
2 parents 3dd5262 + 97b88b7 commit 549b403

File tree

20 files changed

+26
-123
lines changed

20 files changed

+26
-123
lines changed

‎examples/Factory_Test/Wireless_Paper_V1.0_FactoryTest/Wireless_Paper_V1.0_FactoryTest.ino‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -349,28 +349,17 @@ void loop()
349349
VextOFF();
350350
Radio.Sleep();
351351
SPI.end();
352-
Serial.printf("1");
353352
pinMode(RADIO_DIO_1, ANALOG);
354353
digitalWrite(RADIO_NSS, HIGH);
355-
gpio_hold_en((gpio_num_t)RADIO_NSS);
356-
// pinMode(RADIO_NSS, ANALOG);
357-
// digitalWrite(RADIO_NSS, HIGH);
354+
// gpio_hold_en((gpio_num_t)RADIO_NSS);
355+
pinMode(RADIO_NSS, ANALOG);
356+
digitalWrite(RADIO_NSS, HIGH);
358357

359358
pinMode(RADIO_RESET, ANALOG);
360359
pinMode(RADIO_BUSY, ANALOG);
361360
pinMode(LORA_CLK, ANALOG);
362361
pinMode(LORA_MISO, ANALOG);
363362
pinMode(LORA_MOSI, ANALOG);
364-
// pinMode(2, ANALOG);
365-
// pinMode(3, ANALOG);
366-
// pinMode(4, ANALOG);
367-
// pinMode(5, ANALOG);
368-
// pinMode(6, ANALOG);
369-
// pinMode(7, ANALOG);
370-
// pinMode(43, ANALOG);
371-
// pinMode(44, ANALOG);
372-
// pinMode(47, ANALOG);
373-
// pinMode(48, ANALOG);
374363

375364
esp_sleep_enable_timer_wakeup(600 * 1000 * (uint64_t)1000);
376365
esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_OFF);

‎examples/Factory_Test/Wireless_Paper_V1.1_FactoryTest/Wireless_Paper_V1.1_FactoryTest.ino‎

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -166,29 +166,8 @@ int i=0;
166166
pix ^= 0x0F;
167167

168168
i++;
169-
/* Convert rgb color to gray scale
170-
memcpy(rgb_color, src, 3);
171-
src += 3;
172-
gs_clr = (GS_FACT_R * rgb_color[0]) + (GS_FACT_G * rgb_color[1]) + (GS_FACT_B * rgb_color[2]);
173-
if (gs_clr > 255) gs_clr = 255;
174-
// Use only 4 bits & invert
175-
//pix = ((uint8_t)gs_clr >> 4) ^ 0x0F;
176-
pix = (uint8_t)gs_clr;
177-
178-
// Using gray scale lookup table
179-
last_lvl = 0;
180-
i = 0;
181-
for (i=0; i<16; i++) {
182-
if ((pix > last_lvl) && (pix <= lvl_buf_jpg[i])) {
183-
pix = 15 - i;
184-
last_lvl = lvl_buf[i];
185-
break;
186-
}
187-
last_lvl = lvl_buf[i];
188-
}
189-
*/
169+
190170
get_buff[i] = pix;
191-
// gs_used_shades |= (1 << pix);
192171
}
193172
else src += 3; // skip
194173
}
@@ -406,28 +385,18 @@ void loop()
406385
VextOFF();
407386
Radio.Sleep();
408387
SPI.end();
409-
Serial.printf("1");
410388
pinMode(RADIO_DIO_1, ANALOG);
411389
digitalWrite(RADIO_NSS, HIGH);
412-
gpio_hold_en((gpio_num_t)RADIO_NSS);
413-
// pinMode(RADIO_NSS, ANALOG);
414-
// digitalWrite(RADIO_NSS, HIGH);
390+
// gpio_hold_en((gpio_num_t)RADIO_NSS);
391+
pinMode(RADIO_NSS, ANALOG);
392+
digitalWrite(RADIO_NSS, HIGH);
415393

416394
pinMode(RADIO_RESET, ANALOG);
417395
pinMode(RADIO_BUSY, ANALOG);
418396
pinMode(LORA_CLK, ANALOG);
419397
pinMode(LORA_MISO, ANALOG);
420398
pinMode(LORA_MOSI, ANALOG);
421-
// pinMode(2, ANALOG);
422-
// pinMode(3, ANALOG);
423-
// pinMode(4, ANALOG);
424-
// pinMode(5, ANALOG);
425-
// pinMode(6, ANALOG);
426-
// pinMode(7, ANALOG);
427-
// pinMode(43, ANALOG);
428-
// pinMode(44, ANALOG);
429-
// pinMode(47, ANALOG);
430-
// pinMode(48, ANALOG);
399+
431400

432401
esp_sleep_enable_timer_wakeup(600 * 1000 * (uint64_t)1000);
433402
esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_OFF);

‎src/LoRaWan_APP.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
2-
||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
3-
||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
4-
||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
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)
52

63

74
#include <LoRaWan_APP.h>

‎src/driver/board-config.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
* \author Johannes Bruder ( STACKFORCE )
3232
*/
3333

34-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
35-
||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
36-
||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
37-
||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
3834

3935
#ifndef __BOARD_CONFIG_H__
4036
#define __BOARD_CONFIG_H__
@@ -101,4 +97,3 @@
10197

10298

10399
#endif // __BOARD_CONFIG_H__
104-
#endif

‎src/driver/board.c‎

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

1616

1717

18-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
19-
||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
20-
||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
21-
||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
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)
2219

2320
#include "../driver/board.h"
2421
#include "Arduino.h"

‎src/driver/gpio-board.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
*
2121
* \author Gregory Cristian ( Semtech )
2222
*/
23-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
24-
||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
25-
||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
26-
||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
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)
2724

2825

2926
#include "../loramac/utilities.h"

‎src/driver/gpio.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424
*
2525
* \author Gregory Cristian ( Semtech )
2626
*/
27-
#if defined(WIFI_LORA_32_V3)||defined(WIFI_LORA_32_V2)||defined(WIFI_LORA_32)\
28-
||defined(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)\
29-
||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)||defined(WIRELESS_BRIDGE)\
30-
||defined(WIRELESS_MINI_SHELL)||defined(Wireless_Stick)
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)
3128

3229
#include "../driver/gpio-board.h"
3330

‎src/driver/timer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/* Includes ------------------------------------------------------------------*/
4040

4141
#include <stdbool.h>
42-
#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)
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)
4343

4444
#include "../loramac/utilities.h"
4545
#endif

‎src/loramac/LoRaMac.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ 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(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
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)
2626

2727
#include <stdbool.h>
2828
#include <string.h>

‎src/loramac/region/Region.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ 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(WIRELESS_TRACKER)||defined(WIRELESS_STICK_V3)||defined(WIRELESS_STICK_LITE_V3)||defined(WIRELESS_PAPER)||defined(CAPSULE_SENSOR_V3)||defined(WIRELESS_SHELL_V3)
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)
2525

2626

2727
#include <stdbool.h>

0 commit comments

Comments
 (0)