Skip to content

Commit b45ff2e

Browse files
committed
Update library files and sketches
1 parent acf82b4 commit b45ff2e

File tree

36 files changed

+218
-105
lines changed

36 files changed

+218
-105
lines changed

libraries/00_DNS/src/ESPmDNS.cpp

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,16 @@ mdns_result_t * MDNSResponder::_getResult(int idx){
245245
return result;
246246
}
247247

248+
mdns_txt_item_t * MDNSResponder::_getResultTxt(int idx, int txtIdx){
249+
mdns_result_t * result = _getResult(idx);
250+
if(!result){
251+
log_e("Result %d not found", idx);
252+
return NULL;
253+
}
254+
if (txtIdx >= result->txt_count) return NULL;
255+
return &result->txt[txtIdx];
256+
}
257+
248258
String MDNSResponder::hostname(int idx) {
249259
mdns_result_t * result = _getResult(idx);
250260
if(!result){
@@ -333,13 +343,17 @@ String MDNSResponder::txt(int idx, const char * key) {
333343
}
334344

335345
String MDNSResponder::txt(int idx, int txtIdx) {
336-
mdns_result_t * result = _getResult(idx);
337-
if(!result){
338-
log_e("Result %d not found", idx);
339-
return "";
340-
}
341-
if (txtIdx >= result->txt_count) return "";
342-
return result->txt[txtIdx].value;
346+
mdns_txt_item_t * resultTxt = _getResultTxt(idx, txtIdx);
347+
return !resultTxt
348+
? ""
349+
: resultTxt->value;
350+
}
351+
352+
String MDNSResponder::txtKey(int idx, int txtIdx) {
353+
mdns_txt_item_t * resultTxt = _getResultTxt(idx, txtIdx);
354+
return !resultTxt
355+
? ""
356+
: resultTxt->key;
343357
}
344358

345359
MDNSResponder MDNS;

libraries/00_DNS/src/ESPmDNS.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,13 @@ class MDNSResponder {
111111
bool hasTxt(int idx, const char * key);
112112
String txt(int idx, const char * key);
113113
String txt(int idx, int txtIdx);
114+
String txtKey(int idx, int txtIdx);
114115

115116
private:
116117
String _hostname;
117118
mdns_result_t * results;
118119
mdns_result_t * _getResult(int idx);
120+
mdns_txt_item_t * _getResultTxt(int idx, int txtIdx);
119121
};
120122

121123
extern MDNSResponder MDNS;

libraries/00_IMU/src/lsm6dsm.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@ April 25, 2020
2626
status_t LSM6DSMCore::beginCore(void)
2727
{
2828
status_t returnError = IMU_SUCCESS;
29-
29+
#if DENEYAP_KART
3030
Wire.begin(IMUSD, IMUSC, 0);
31+
#elif DENEYAP_KART
32+
Wire.begin(SD, SC, 0);
33+
#endif
3134

3235
// Spin for a few ms
3336
volatile uint8_t temp = 0;

libraries/00_MiniProjeler/examples/BulutLedKontrol/BulutLedKontrol.ino

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Adafruit IO kullanarak IoT tabanli uzaktan led kontrol uygulamasi
22

3-
#include <Arduino.h>
4-
#include "deneyap.h"
53
#include "WiFi.h"
64
#include <Adafruit_MQTT.h>
75
#include <Adafruit_MQTT_Client.h>

libraries/00_MiniProjeler/examples/BulutSicaklikGozlem/BulutSicaklikGozlem.ino

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Adafruit IO kullanarak IoT tabanli sicaklik gozlem uygulamasi
22

3-
#include <Arduino.h>
4-
#include "deneyap.h"
53
#include "lsm6dsm.h"
64
#include "WiFi.h"
75
#include <Adafruit_MQTT.h>

libraries/00_MiniProjeler/examples/MobilRobotKontrolAkselerometre/MobilRobotKontrolAkselerometre.ino

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Iki farkli Deneyap Kart'in esp-now protokolunu kulanarak birbirleriyle haberlesmesi (akselerometre tarafi)
22

3-
#include <Arduino.h>
4-
#include "deneyap.h"
53
#include "lsm6dsm.h"
64
#include "WiFi.h"
75
#include "esp_now.h"

libraries/00_MiniProjeler/examples/MobilRobotKontrolSurucu/MobilRobotKontrolSurucu.ino

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Iki farkli Deneyap Kart'in esp-now protokolunu kulanarak birbirleriyle haberlesmesi (motor surcu tarafi)
22

3-
#include <Arduino.h>
4-
#include "deneyap.h"
53
#include "WiFi.h"
64
#include "esp_now.h"
75

libraries/00_MiniProjeler/examples/SaksiSulama/SaksiSulama.ino

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// Basit saksi sulayan su pompasi calistirma uygulamasi
22

3-
#include <Arduino.h>
4-
#include "deneyap.h"
5-
63
#define NEM_SENSORU A0
74
#define SU_POMPASI D0
85
#define SULAMA_ESIGI 450

libraries/00_OutOfBox/examples/CameraStream/CameraStream.ino

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#include <Arduino.h>
2-
#include "deneyap.h"
1+
#if DENEYAP_KART
32
#include <WiFi.h>
43

54
// ---------->>>>>>>>>> YUKLEME YAPILAMDAN DIKKAT EDILMESI GEREKEN HUSUS <<<<<<<<<<----------
@@ -33,4 +32,7 @@ void setup() {
3332

3433
void loop() {
3534
delay(10000);
36-
}
35+
}
36+
#else
37+
#error Bu uygulama kamera baglantisi olmadigi icin Deneyap Mini ile gerceklesitirilemez!
38+
#endif

libraries/00_SD/src/SD.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ bool SDFS::writeRAW(uint8_t* buffer, uint32_t sector)
114114
}
115115

116116

117-
SDFS SD = SDFS(FSImplPtr(new VFSImpl()));
117+
SDFS SDCard = SDFS(FSImplPtr(new VFSImpl()));

0 commit comments

Comments
 (0)