Skip to content

Add Debug menu for ESPresso Lite 1.0 & 2.0. #1821

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Mar 28, 2016
Merged

Add Debug menu for ESPresso Lite 1.0 & 2.0. #1821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3663359
Add Debug menu for ESPresso Lite 1.0 & 2.0.
nazt Mar 26, 2016
3136c61
Avoid multiple instances of INADDR_NONE
baruch Mar 24, 2016
cef5abd
Bootloader: don't touch RTC memory if it doesn't contain a valid comm…
igrr Mar 27, 2016
aded314
Clean build directory after each sketch
igrr Mar 27, 2016
b6920e8
Fix build board flag for ESP8266_ESPRESSO_LITE_V2.
nazt Mar 28, 2016
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
82 changes: 81 additions & 1 deletion boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,46 @@ espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
espresso_lite_v1.menu.ResetMethod.ck=ck
espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=ck

espresso_lite_v1.menu.Debug.Disabled=Disabled
espresso_lite_v1.menu.Debug.Disabled.build.debug_port=
espresso_lite_v1.menu.Debug.Serial=Serial
espresso_lite_v1.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
espresso_lite_v1.menu.Debug.Serial1=Serial1
espresso_lite_v1.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1

espresso_lite_v1.menu.DebugLevel.None____=None
espresso_lite_v1.menu.DebugLevel.None____.build.debug_level=
espresso_lite_v1.menu.DebugLevel.Core____=Core
espresso_lite_v1.menu.DebugLevel.Core____.build.debug_level=-DDEBUG_ESP_CORE
espresso_lite_v1.menu.DebugLevel.SSL_____=Core + SSL
espresso_lite_v1.menu.DebugLevel.SSL_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
espresso_lite_v1.menu.DebugLevel.SSL_MEM_=Core + SSL + TLS Mem
espresso_lite_v1.menu.DebugLevel.SSL_MEM_.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_TLS_MEM
espresso_lite_v1.menu.DebugLevel.WiFic___=Core + WiFi
espresso_lite_v1.menu.DebugLevel.WiFic___.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
espresso_lite_v1.menu.DebugLevel.WiFi____=WiFi
espresso_lite_v1.menu.DebugLevel.WiFi____.build.debug_level=-DDEBUG_ESP_WIFI
espresso_lite_v1.menu.DebugLevel.HTTPClient=HTTPClient
espresso_lite_v1.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
espresso_lite_v1.menu.DebugLevel.HTTPClient2=HTTPClient + SSL
espresso_lite_v1.menu.DebugLevel.HTTPClient2.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_SSL
espresso_lite_v1.menu.DebugLevel.HTTPUpdate=HTTPUpdate
espresso_lite_v1.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
espresso_lite_v1.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
espresso_lite_v1.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
espresso_lite_v1.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
espresso_lite_v1.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
espresso_lite_v1.menu.DebugLevel.HTTPServer=HTTPServer
espresso_lite_v1.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
espresso_lite_v1.menu.DebugLevel.UPDATER=Updater
espresso_lite_v1.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
espresso_lite_v1.menu.DebugLevel.OTA_____=OTA
espresso_lite_v1.menu.DebugLevel.OTA_____.build.debug_level=-DDEBUG_ESP_OTA
espresso_lite_v1.menu.DebugLevel.OTA2____=OTA + Updater
espresso_lite_v1.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
espresso_lite_v1.menu.DebugLevel.all_____=All
espresso_lite_v1.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM

espresso_lite_v1.build.debug_port=
espresso_lite_v1.build.debug_level=

Expand All @@ -418,7 +458,7 @@ espresso_lite_v2.upload.wait_for_upload_port=true

espresso_lite_v2.build.mcu=esp8266
espresso_lite_v2.build.f_cpu=80000000L
espresso_lite_v2.build.board=ESP8266_espresso_lite_v2
espresso_lite_v2.build.board=ESP8266_ESPRESSO_LITE_V2
espresso_lite_v2.build.core=esp8266
espresso_lite_v2.build.variant=espresso_lite_v2
espresso_lite_v2.build.flash_mode=dio
Expand Down Expand Up @@ -470,6 +510,46 @@ espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=ck
espresso_lite_v2.menu.ResetMethod.nodemcu=nodemcu
espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu

espresso_lite_v2.menu.Debug.Disabled=Disabled
espresso_lite_v2.menu.Debug.Disabled.build.debug_port=
espresso_lite_v2.menu.Debug.Serial=Serial
espresso_lite_v2.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
espresso_lite_v2.menu.Debug.Serial1=Serial1
espresso_lite_v2.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1

espresso_lite_v2.menu.DebugLevel.None____=None
espresso_lite_v2.menu.DebugLevel.None____.build.debug_level=
espresso_lite_v2.menu.DebugLevel.Core____=Core
espresso_lite_v2.menu.DebugLevel.Core____.build.debug_level=-DDEBUG_ESP_CORE
espresso_lite_v2.menu.DebugLevel.SSL_____=Core + SSL
espresso_lite_v2.menu.DebugLevel.SSL_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
espresso_lite_v2.menu.DebugLevel.SSL_MEM_=Core + SSL + TLS Mem
espresso_lite_v2.menu.DebugLevel.SSL_MEM_.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_TLS_MEM
espresso_lite_v2.menu.DebugLevel.WiFic___=Core + WiFi
espresso_lite_v2.menu.DebugLevel.WiFic___.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
espresso_lite_v2.menu.DebugLevel.WiFi____=WiFi
espresso_lite_v2.menu.DebugLevel.WiFi____.build.debug_level=-DDEBUG_ESP_WIFI
espresso_lite_v2.menu.DebugLevel.HTTPClient=HTTPClient
espresso_lite_v2.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
espresso_lite_v2.menu.DebugLevel.HTTPClient2=HTTPClient + SSL
espresso_lite_v2.menu.DebugLevel.HTTPClient2.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_SSL
espresso_lite_v2.menu.DebugLevel.HTTPUpdate=HTTPUpdate
espresso_lite_v2.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
espresso_lite_v2.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
espresso_lite_v2.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
espresso_lite_v2.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
espresso_lite_v2.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
espresso_lite_v2.menu.DebugLevel.HTTPServer=HTTPServer
espresso_lite_v2.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
espresso_lite_v2.menu.DebugLevel.UPDATER=Updater
espresso_lite_v2.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
espresso_lite_v2.menu.DebugLevel.OTA_____=OTA
espresso_lite_v2.menu.DebugLevel.OTA_____.build.debug_level=-DDEBUG_ESP_OTA
espresso_lite_v2.menu.DebugLevel.OTA2____=OTA + Updater
espresso_lite_v2.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
espresso_lite_v2.menu.DebugLevel.all_____=All
espresso_lite_v2.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM

espresso_lite_v2.build.debug_port=
espresso_lite_v2.build.debug_level=

Expand Down
5 changes: 2 additions & 3 deletions bootloaders/eboot/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
XTENSA_TOOLCHAIN ?= ../../tools/xtensa-lx106-elf/bin/
ESPTOOL ?= ../../tools/esptool
ESPTOOL ?= ../../tools/esptool/esptool

BIN_DIR := ./
TARGET_DIR := ./

TARGET_OBJ_FILES := \
eboot.o \
eboot_command.o \


TARGET_OBJ_PATHS := $(addprefix $(TARGET_DIR)/,$(TARGET_OBJ_FILES))

Expand Down Expand Up @@ -50,4 +50,3 @@ clean:


.PHONY: all clean default

12 changes: 7 additions & 5 deletions bootloaders/eboot/eboot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
/* Copyright (c) 2015-2016 Ivan Grokhotkov. All rights reserved.
* This file is part of eboot bootloader.
*
* Redistribution and use is permitted according to the conditions of the
Expand Down Expand Up @@ -115,14 +115,16 @@ void main()
int res = 9;
struct eboot_command cmd;

if (eboot_command_read(&cmd)) {
if (eboot_command_read(&cmd) == 0) {
// valid command was passed via RTC_MEM
eboot_command_clear();
ets_putc('@');
} else {
// no valid command found
cmd.action = ACTION_LOAD_APP;
cmd.args[0] = 0;
ets_putc('~');
} else {
ets_putc('@');
}
eboot_command_clear();

if (cmd.action == ACTION_COPY_RAW) {
ets_putc('c'); ets_putc('p'); ets_putc(':');
Expand Down
Binary file modified bootloaders/eboot/eboot.elf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions cores/esp8266/IPAddress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,4 @@ String IPAddress::toString()
return String(szRet);
}

const IPAddress INADDR_NONE(0, 0, 0, 0);
2 changes: 1 addition & 1 deletion cores/esp8266/IPAddress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@ class IPAddress: public Printable {
friend class DNSClient;
};

const IPAddress INADDR_NONE(0, 0, 0, 0);
extern const IPAddress INADDR_NONE;

#endif
2 changes: 1 addition & 1 deletion tests/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ function build_sketches()
local build_arg=$3
local build_dir=build.tmp
mkdir -p $build_dir
rm -rf $build_dir/*
local build_cmd="python tools/build.py -b generic -v -k -p $PWD/$build_dir $build_arg "
local sketches=$(find $srcpath -name *.ino)
print_size_info >size.log
export ARDUINO_IDE_PATH=$arduino
for sketch in $sketches; do
rm -rf $build_dir/*
local sketchdir=$(dirname $sketch)
local sketchdirname=$(basename $sketchdir)
local sketchname=$(basename $sketch)
Expand Down