Browse Source

Merge branch 'master' into dev

i18n
Xose Pérez 6 years ago
parent
commit
9b751b0540
4 changed files with 3 additions and 5 deletions
  1. +1
    -1
      README.md
  2. +1
    -1
      code/espurna/config/all.h
  3. +0
    -2
      code/espurna/libs/WebSocketIncommingBuffer.h
  4. +1
    -1
      code/html/index.html

+ 1
- 1
README.md View File

@ -6,7 +6,7 @@ It uses the Arduino Core for ESP8266 framework and a number of 3rd party librari
**Current Release Version is 1.12.1** **Current Release Version is 1.12.1**
Read the [changes log](https://bitbucket.org/xoseperez/espurna/src/master/CHANGELOG.md).
Read the [changes log](https://github.com/xoseperez/espurna/blob/master/CHANGELOG.md).
--- ---


+ 1
- 1
code/espurna/config/all.h View File

@ -3,7 +3,7 @@
the repo files you can either define USE_CUSTOM_H or remove the the repo files you can either define USE_CUSTOM_H or remove the
"#ifdef USE_CUSTOM_H" & "#endif" lines and add a "custom.h" "#ifdef USE_CUSTOM_H" & "#endif" lines and add a "custom.h"
file to this same folder. file to this same folder.
Check https://bitbucket.org/xoseperez/espurna/issues/104/general_customh
Check https://github.com/xoseperez/espurna/issues/104
for an example on how to use this file. for an example on how to use this file.
(Define USE_CUSTOM_H on commandline for platformio: (Define USE_CUSTOM_H on commandline for platformio:
export PLATFORMIO_BUILD_FLAGS="'-DUSE_CUSTOM_H'" ) export PLATFORMIO_BUILD_FLAGS="'-DUSE_CUSTOM_H'" )


+ 0
- 2
code/espurna/libs/WebSocketIncommingBuffer.h View File

@ -5,8 +5,6 @@ WebSocketIncommingBuffer
Code by Hermann Kraus (https://bitbucket.org/hermr2d2/) Code by Hermann Kraus (https://bitbucket.org/hermr2d2/)
and slightly modified. and slightly modified.
https://bitbucket.org/xoseperez/espurna/pull-requests/30/safer-buffer-handling-for-websocket-data
*/ */
#pragma once #pragma once


+ 1
- 1
code/html/index.html View File

@ -146,7 +146,7 @@
&copy; 2016-2018<br /> &copy; 2016-2018<br />
Xose Pérez<br/> Xose Pérez<br/>
<a href="http://tinkerman.cat" target="_blank">http://tinkerman.cat</a><br/> <a href="http://tinkerman.cat" target="_blank">http://tinkerman.cat</a><br/>
<a href="https://bitbucket.org/xoseperez/espurna" target="_blank">ESPurna @ Bitbucket</a><br/>
<a href="https://github.com/xoseperez/espurna" target="_blank">ESPurna @ GitHub</a><br/>
GPLv3 license<br/> GPLv3 license<br/>
</div> </div>


Loading…
Cancel
Save