Lukas Matena
97b9de47b4
Merge branch 'master' into dev
2020-03-24 21:51:05 +01:00
bubnikv
ad5ae50933
Fix of Crash when trying to set up non-existent flashair ( #3899 )
...
fixed a typo in formatting text, throwing an exception.
2020-03-24 10:04:41 +01:00
Lukas Matena
eb3b65d8af
Fixing build against wxWidgets 3.0
...
The wxString saga continues. wxWidgets 3.0 don't have the wxString::FromUTF8(const std::string&) overload, we must use the GUI::from_u8 helper
Also wxWidgets 3.0 don't allow to disable wxString->const char* conversion, so calling show_info(wxWindow*, wxString, const char*) was ambiguous
Several includes moved around
2020-03-04 10:34:59 +01:00
Lukas Matena
7589e4ebfc
Fixed some more warnings
2020-03-03 15:53:26 +01:00
Lukas Matena
f2b98bddee
Fixing wxString::Format encoding mismatches (part 3)
2020-03-03 10:54:17 +01:00
vintagepc
9f65b6bc96
Removed stray comment
2020-01-20 11:07:23 -05:00
vintagepc
290bc4f516
Added directory support to FlashAir upload
2020-01-20 11:07:23 -05:00
bubnikv
791f487c76
Clean-up of the "Upload to" code (AstroBox, Duet, FlashAir, OctoPrint)
2020-01-06 10:59:57 +01:00
Enrico Turri
f5bef3707f
Added missing include
2019-11-04 14:28:18 +01:00
Stephan
c37cdb6585
* fix compile error and removed json includes
2019-11-04 12:53:48 +01:00
Stephan Reichhelm
3321ae7f13
+ add FlashAir support for host upload
2019-11-04 12:53:48 +01:00