archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

merge tve/master into tve/fix-sockets

Browse Source
This commit is contained in:
Thorsten von Eicken 2015-12-06 17:27:21 -08:00
commit 77b740a81f
4 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/ESP8266_BOARD.py
View File

@ -18,7 +18,7 @@ info = {
'name' : "ESP8266",
'espruino_page_link' : 'EspruinoESP8266',
'default_console' : "EV_SERIAL1",
'default_console_baudrate' : "230400",
'default_console_baudrate' : "115200",
'variables' : 1023,
'binary_name' : 'espruino_%v_esp8266',
};

6
src/jsinteractive.c
View File

@ -36,12 +36,6 @@ extern void jshPrintBanner(void); // prints a debugging banner while we're in be
extern void jshSoftInit(void); // re-inits wifi after a soft-reset
#endif
#ifdef FLASH_STR // debugging...
#define os_printf os_printf_plus
extern void os_printf_plus(char *fmt, ...);
#endif
// ----------------------------------------------------------------------------
typedef enum {
IS_NONE,

6
src/jsutils.c
View File

@ -19,12 +19,6 @@
#include "jswrap_error.h"
#include "jswrap_json.h"
#ifdef FLASH_STR
// debugging...
#define os_printf os_printf_plus
extern void os_printf_plus(char *fmt, ...);
#endif
/** Error flags for things that we don't really want to report on the console,
* but which are good to know about */
JsErrorFlags jsErrorFlags;

4
src/jsvar.c
View File

@ -536,10 +536,6 @@ static NO_INLINE void jsvUnLockFreeIfNeeded(JsVar *var) {
/// Unlock this variable - this is SAFE for null variables
ALWAYS_INLINE void jsvUnLock(JsVar *var) {
if (!var) return;
if (jsvGetLocks(var) <= 0) {
jsiConsolePrintf("ASSERT FAIL: unlocking unlocked variable: %q %j (%t)\n", var, var, var);
jsvTrace(var, 2);
}
assert(jsvGetLocks(var)>0);
var->flags -= JSV_LOCK_ONE;
// Now see if we can properly free the data