Skip to content

Commit ff0a5fb

Browse files
committed
fix new bug
1 parent 710307a commit ff0a5fb

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

libraries/Dragino/examples/IoTServer/Cayenne and TTN/arduino-lmic/src/lmic/oslmic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ u2_t os_crc16 (xref2u1_t d, uint len);
227227
// progmem using pgm_read_xx, or accesses memory directly when the
228228
// index is a constant so gcc can optimize it away;
229229
#define TABLE_GETTER(postfix, type, pgm_type) \
230-
inline type table_get ## postfix(const type *table, size_t index) { \
230+
static inline type table_get ## postfix(const type *table, size_t index) { \
231231
if (__builtin_constant_p(table[index])) \
232232
return table[index]; \
233233
return pgm_read_ ## pgm_type(&table[index]); \

libraries/Dragino/examples/IoTServer/Cayenne and TTN/cayenne and ttn example/GPS_shield examples/GPS_shield_cayenne_and_ttn-abpClient/GPS_shield_cayenne_and_ttn-abpClient.ino

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -165,17 +165,17 @@ void GPSRead()
165165
flon == TinyGPS::GPS_INVALID_F_ANGLE ? 0.0 : flon, 6;//save six decimal places
166166
flat == TinyGPS::GPS_INVALID_F_ANGLE ? 0.0 : flat, 6;
167167
falt == TinyGPS::GPS_INVALID_F_ANGLE ? 0.0 : falt, 2;//save two decimal places
168-
// if((flon < 72.004 || flon > 137.8347)&&(flat < 0.8293 || flat >55.8271)) //out of China
169-
// {
168+
if((flon < 72.004 || flon > 137.8347)&&(flat < 0.8293 || flat >55.8271)) //out of China
169+
{
170170
longitude=flon;
171171
latitude=flat;
172172
// Serial.println("Out of China");
173-
// }
174-
// else
175-
// {
176-
// WGS2GCJTransform(flon,flat,longitude,latitude);
173+
}
174+
else
175+
{
176+
WGS2GCJTransform(flon,flat,longitude,latitude);
177177
// //Serial.println("In China");
178-
// }
178+
}
179179
int32_t lat = latitude * 10000;
180180
int32_t lon = longitude * 10000;
181181
int32_t alt = falt * 100;

libraries/Dragino/examples/IoTServer/Cayenne and TTN/cayenne and ttn example/lora_shield DHT11 and Relay examples/lora_shield_cayenne_and_ttn-abpClient/lora_shield_cayenne_and_ttn-abpClient.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ void setup() {
231231

232232
pinMode(ctl_pin,OUTPUT);
233233
pinMode(flame_pin,INPUT);
234-
attachInterrupt(1,fire,LOW);
234+
// attachInterrupt(1,fire,LOW); //no connect Flame sensor should commented this code
235235

236236
#ifdef VCC_ENABLE
237237
// For Pinoccio Scout boards

libraries/Dragino/examples/IoTServer/Cayenne and TTN/cayenne and ttn example/lora_shield DHT11 and Relay examples/lora_shield_cayenne_and_ttn-otaaClient/lora_shield_cayenne_and_ttn-otaaClient.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ void setup() {
234234

235235
pinMode(ctl_pin,OUTPUT);
236236
pinMode(flame_pin,INPUT);
237-
attachInterrupt(1,fire,LOW);
237+
// attachInterrupt(1,fire,LOW); //no connect Flame sensor should commented this code
238238

239239
#ifdef VCC_ENABLE
240240
// For Pinoccio Scout boards

0 commit comments

Comments
 (0)