GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-12 18:29:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ESP32 compilation failures

Browse Source 
Fix Travis not sending email -TBC
This commit is contained in:
Luc 2020-12-18 07:00:19 +01:00
parent 21002cf62a
commit 0101f0a4fe
7 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -63,5 +63,7 @@ script:
notifications: notifications:
email: email:
recipients:
- luc@tech-hunters.com
on_success: always on_success: always
on_failure: always on_failure: always

2
esp3d/configuration.h
View File

@ -40,7 +40,7 @@
//COMMUNICATION_PROTOCOL: to communicate with printer or TFT //COMMUNICATION_PROTOCOL: to communicate with printer or TFT
//RAW_SERIAL standard serial //RAW_SERIAL standard serial
//MKS_SERIAL Mks protocol //MKS_SERIAL Mks protocol
#define COMMUNICATION_PROTOCOL MKS_SERIAL #define COMMUNICATION_PROTOCOL RAW_SERIAL
//AUTHENTICATION_FEATURE: protect pages by login password //AUTHENTICATION_FEATURE: protect pages by login password
//#define AUTHENTICATION_FEATURE //#define AUTHENTICATION_FEATURE

BIN
esp3d/esp3d.ino.generic.bin
View File

Binary file not shown.

2
esp3d/src/include/version.h
View File

@ -22,7 +22,7 @@
#define _VERSION_ESP3D_H #define _VERSION_ESP3D_H
//version and sources location //version and sources location
#define FW_VERSION "3.0.0.a76" #define FW_VERSION "3.0.0.a77"
#define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
#endif //_VERSION_ESP3D_H #endif //_VERSION_ESP3D_H

2
esp3d/src/modules/network/netconfig.cpp
View File

@ -113,7 +113,7 @@ bool NetConfig::isHostnameValid (const char * hostname)
*/ */
IPAddress NetConfig::localIPAddress() IPAddress NetConfig::localIPAddress()
{ {
IPAddress current_ip = 0; IPAddress current_ip = IPAddress(0,0,0,0);
#if defined( WIFI_FEATURE) #if defined( WIFI_FEATURE)
if (WiFi.getMode() == WIFI_STA) { if (WiFi.getMode() == WIFI_STA) {
current_ip = WiFi.localIP(); current_ip = WiFi.localIP();

4
esp3d/src/modules/network/netservices.cpp
View File

@ -265,9 +265,7 @@ bool NetServices::begin()
if(WiFi.getMode() != WIFI_AP) { if(WiFi.getMode() != WIFI_AP) {
// Add service to MDNS-SD // Add service to MDNS-SD
log_esp3d("Add mdns service http / tcp port %d", HTTP_Server::port()); log_esp3d("Add mdns service http / tcp port %d", HTTP_Server::port());
if (!MDNS.addService("http", "tcp", HTTP_Server::port())) { MDNS.addService("http", "tcp", HTTP_Server::port());
log_esp3d("failed");
}
//Add TXT records //Add TXT records
MDNS.addServiceTxt("http", "tcp", "ESP3D", FW_VERSION); MDNS.addServiceTxt("http", "tcp", "ESP3D", FW_VERSION);
} }

14
esp3d/src/modules/notifications/notifications_service.cpp
View File

@ -56,6 +56,9 @@ typedef WiFiClientSecure TSecureClient;
typedef WiFiClientSecure TSecureClient; typedef WiFiClientSecure TSecureClient;
#include <WiFi.h> #include <WiFi.h>
#include <HTTPClient.h> #include <HTTPClient.h>
extern "C" {
#include "libb64/cdecode.h"
}
#endif //ARDUINO_ARCH_ESP32 #endif //ARDUINO_ARCH_ESP32
#include <base64.h> #include <base64.h>
@ -472,15 +475,10 @@ bool NotificationsService::getEmailFromSettings()
bool NotificationsService::decode64(const char* encodedURL, char *decodedURL) bool NotificationsService::decode64(const char* encodedURL, char *decodedURL)
{ {
size_t out_len = 0; size_t out_len = 0;
#if defined( ARDUINO_ARCH_ESP8266)
out_len = base64_decode_chars(encodedURL, strlen(encodedURL), decodedURL); out_len = base64_decode_chars(encodedURL, strlen(encodedURL), decodedURL);
#endif //ARDUINO_ARCH_ESP8266 log_esp3d("URLE: %s", encodedURL);
#if defined( ARDUINO_ARCH_ESP32) log_esp3d("URLD: %s", decodedURL);
strcpy(base64_decode(encodedURL, strlen(encodedURL),&out_len); return (out_len>0);
#endif //ARDUINO_ARCH_ESP32
log_esp3d("URLE: %s", encodedURL);
log_esp3d("URLD: %s", decodedURL);
return (out_len>0);
} }
bool NotificationsService::GET(const char * URL64) bool NotificationsService::GET(const char * URL64)