Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #54

Merged
merged 58 commits into from
Dec 26, 2021
Merged
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
0397154
try to make it smaler and work with WifiClient Reference
saak2820 Jan 20, 2021
30ea140
fix for Arduino
saak2820 Mar 25, 2021
4efc80b
Testet against 07.24-87448 BETA
saak2820 Apr 13, 2021
05bf415
fix return
saak2820 May 29, 2021
769eae2
Debug in Caller.ino
saak2820 May 29, 2021
c81ab19
stop overflowing serial output.
saak2820 Jun 1, 2021
8f81758
Revert "stop overflowing serial output."
saak2820 Jun 1, 2021
55f9dd3
stop overflowing serial output.
saak2820 Jun 1, 2021
386c5ff
working, Testet against 07.24-88406 BETA
saak2820 Jun 4, 2021
449f479
code beautify
saak2820 Jun 4, 2021
fba70ff
adding Stream to takeParam
saak2820 Jun 10, 2021
8e04382
dont need global
saak2820 Jun 10, 2021
e4363c2
token
saak2820 Jun 10, 2021
31b2c7a
service prefix
saak2820 Jun 10, 2021
30ea065
remove debug
saak2820 Jun 10, 2021
052bd69
Merge branch 'master' into development
saak2820 Jun 10, 2021
d245c55
image
saak2820 Jun 10, 2021
c67a117
image
saak2820 Jun 10, 2021
09a13d4
Testet against 07.24-88406 BETA
saak2820 Jun 14, 2021
4ef156b
DEBUG.md Picture
saak2820 Jun 14, 2021
54c9a12
ARDUINO_IDE_VERSION="1.8.13"
saak2820 Jun 14, 2021
97dda64
image
saak2820 Jun 10, 2021
43f4614
Squashed commit of the following:
saak2820 Jun 17, 2021
2bd1e8f
Merge branch 'development' of https://github.com/gsg2820/Arduino-TR-0…
saak2820 Jun 17, 2021
ad7620b
dont need to load Service Urls if you know what to call
saak2820 Jun 17, 2021
65d4221
dont need to load Service Urls if you know what to call
saak2820 Jun 17, 2021
930ddba
Merge pull request #50 from gsg2820/master
Aypac Jun 18, 2021
0973c47
Remove obsolete stuff
Aypac Jun 18, 2021
4246496
Make examples consistant
Aypac Jun 18, 2021
b7b4cf6
Formatting changes
Aypac Jun 18, 2021
5b245d4
Bump library version
Aypac Jun 18, 2021
89465e8
Clean up typo
Aypac Jun 18, 2021
2589505
Minor bug fixes
Aypac Jun 18, 2021
89bd3e2
change Stream reading and secrets
saak2820 Jun 17, 2021
ec5d091
no serial output on error
saak2820 Jun 24, 2021
82778e6
Merge branch 'develop' into development
saak2820 Jun 24, 2021
4215ee0
secret file for travis build
saak2820 Jun 24, 2021
fd2607a
no renaming example file anymore. should be save with gitignore
saak2820 Jun 24, 2021
fa4b513
Update .travis.yml
saak2820 Jun 24, 2021
046dae4
latest update
saak2820 Jun 24, 2021
dde229a
Update .travis.yml
saak2820 Jun 24, 2021
d6834ad
Update .travis.yml
saak2820 Jun 24, 2021
aeb34d3
Update .travis.yml
saak2820 Jun 24, 2021
bc0c7ce
Update
saak2820 Jun 24, 2021
2260a54
Setserver twice
saak2820 Jun 24, 2021
5f06f78
Not an int
saak2820 Jun 24, 2021
ffc39f7
tabs
saak2820 Jun 25, 2021
007b99a
secret files
saak2820 Jun 24, 2021
6f76cbe
added addons
saak2820 Jun 25, 2021
d344777
Update caller.ino
saak2820 Jun 25, 2021
bda00ff
Update caller.ino
saak2820 Jun 25, 2021
5d85f37
change Doxygen code documentation
saak2820 Jun 25, 2021
2e9ac17
Merge branch 'development' into travisCi
saak2820 Jun 25, 2021
429c47f
Merge pull request #4 from saak2820/travisCi
saak2820 Jun 25, 2021
1be8830
Merge pull request #52 from saak2820/development
Aypac Dec 26, 2021
1e1a5ae
Update README.md
Aypac Dec 26, 2021
d509d86
Update README.md
Aypac Dec 26, 2021
806a692
Merge branch 'master' into develop
Aypac Dec 26, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Testet against 07.24-87448 BETA
  • Loading branch information
saak2820 committed Apr 13, 2021
commit 4efc80b325075735235d704c271cf326f3e35c0b
60 changes: 35 additions & 25 deletions src/tr064.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,38 +101,48 @@ void TR064::initServiceURLs() {
if (httpCode == HTTP_CODE_OK) {
deb_println("[TR064] get the Stream ", DEBUG_INFO);
// get tcp _client
WiFiClient * stream = http.getStreamPtr();
//WiFiClient * stream = http.getStreamPtr();
// get tcp stream
WiFiClient * stream = &tr064client;
int i = 0;

// get lenght of document (is -1 when Server sends no Content-Length header)
int len = http.getSize();

deb_println("[TR064] sizeof Stream: "+ String(len), DEBUG_INFO);
int size = stream->available();
deb_println("[TR064] Stream available: "+ String(size), DEBUG_VERBOSE);
if(!stream->available())deb_println("[TR064] Stream notavailable: "+ String(size), DEBUG_VERBOSE);

while (stream->available()>0) {
if(!stream->find("<service>") && _state<0){
_state = TR064_NO_SERVICES;
deb_println("[TR064]<Error> Failed, DidNOT find Services ", DEBUG_ERROR);
return;
}else{

// read all data from server
while (http.connected() ) {

deb_println("[TR064]sizeof services: "+ String(i), DEBUG_VERBOSE);
if(stream->find("<serviceType>urn:dslforum-org:service:")){
++i;
const String servicename = stream->readStringUntil('<');
//String servicename = xmlTakeParam(serviceXML, "serviceType");
deb_println("[TR064]readServiceName: "+ servicename, DEBUG_VERBOSE);
_services[i][0] = servicename;
if(stream->find("<controlURL>")){
const String controlurl = stream->readStringUntil('<');
//String controlurl = xmlTakeParam(serviceXML, "controlURL");
deb_println("[TR064]readServiceUrl: "+ controlurl, DEBUG_VERBOSE);
_services[i][1] = controlurl;
_state = TR064_SERVICES_LOADED;

if(!stream->find("<service>") && _state<0){
_state = TR064_NO_SERVICES;
deb_println("[TR064]<Error> Failed, DidNOT find Services ", DEBUG_ERROR);
break;
}else{

deb_println("[TR064] sizeof services: "+ String(i), DEBUG_VERBOSE);
if(stream->find("<serviceType>urn:dslforum-org:service:")){
++i;
const String servicename = stream->readStringUntil('<');
//String servicename = xmlTakeParam(serviceXML, "serviceType");
deb_println("[TR064]readServiceName: "+ servicename, DEBUG_VERBOSE);
_services[i][0] = servicename;
if(stream->find("<controlURL>")){
const String controlurl = stream->readStringUntil('<');
//String controlurl = xmlTakeParam(serviceXML, "controlURL");
deb_println("[TR064] readServiceUrl: "+ controlurl, DEBUG_VERBOSE);
_services[i][1] = controlurl;
_state = TR064_SERVICES_LOADED;
}else{
deb_println("[TR064] somthing wrong on readServiceUrl: "+ String(i), DEBUG_VERBOSE);
break;
}
}
}
if(stream->available()<1){
break;
}
}
}

deb_println("[TR064] message: reading done", DEBUG_INFO);
Expand Down