From 32bd42b0281237d29e18bb769afad02bc6782a64 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrr@users.noreply.github.com>
Date: Mon, 6 Jun 2016 14:37:39 +0800
Subject: [PATCH] Store git version of the core in the compiled binary (#2099)

* Store git version of the core in the compiled binary

* Don't update version number when using boards manager package
---
 bootloaders/eboot/eboot.c               |  17 +++++++++++++++++
 bootloaders/eboot/eboot.elf             | Bin 9839 -> 10352 bytes
 cores/esp8266/Esp.cpp                   |  13 +++++++++++++
 cores/esp8266/Esp.h                     |   1 +
 cores/esp8266/core_esp8266_main.cpp     |  13 +++++++++++++
 cores/esp8266/core_version.h            |   6 ++++++
 package/build_boards_manager_package.sh |  14 +++++++++++---
 platform.txt                            |   8 +++++++-
 tools/sdk/ld/eagle.app.v6.common.ld     |   1 +
 9 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 cores/esp8266/core_version.h

diff --git a/bootloaders/eboot/eboot.c b/bootloaders/eboot/eboot.c
index f53d3c9125..69bc692e97 100644
--- a/bootloaders/eboot/eboot.c
+++ b/bootloaders/eboot/eboot.c
@@ -9,6 +9,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <string.h>
 #include "flash.h"
 #include "eboot_command.h"
 
@@ -17,6 +18,20 @@
 extern void ets_wdt_enable(void);
 extern void ets_wdt_disable(void);
 
+int print_version(const uint32_t flash_addr)
+{
+    uint32_t ver;
+    if (SPIRead(flash_addr + APP_START_OFFSET + sizeof(image_header_t) + sizeof(section_header_t), &ver, sizeof(ver))) {
+        return 1;
+    }
+    const char* __attribute__ ((aligned (4))) fmtt = "v%08x\n\0\0";
+    uint32_t fmt[2];
+    fmt[0] = ((uint32_t*) fmtt)[0];
+    fmt[1] = ((uint32_t*) fmtt)[1];
+    ets_printf((const char*) fmt, ver);
+    return 0;
+}
+
 int load_app_from_flash_raw(const uint32_t flash_addr)
 {
     image_header_t image_header;
@@ -114,6 +129,8 @@ void main()
 {
     int res = 9;
     struct eboot_command cmd;
+    
+    print_version(0);
 
     if (eboot_command_read(&cmd) == 0) {
         // valid command was passed via RTC_MEM
diff --git a/bootloaders/eboot/eboot.elf b/bootloaders/eboot/eboot.elf
index aa61b97f02ff5a2a8444a08fc5e81495fe8b7727..1ccbe25fc312cfa70690fa91a8737c38c2aa678f 100755
GIT binary patch
delta 4370
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
AL;wH)

delta 3781
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

diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp
index 0ea0fef1dd..cd0786a08f 100644
--- a/cores/esp8266/Esp.cpp
+++ b/cores/esp8266/Esp.cpp
@@ -158,6 +158,19 @@ uint32_t EspClass::getChipId(void)
     return system_get_chip_id();
 }
 
+extern "C" uint32_t core_version;
+extern "C" const char* core_release;
+
+String EspClass::getCoreVersion()
+{
+    if (core_release != NULL) {
+        return String(core_release);
+    }
+    char buf[12];
+    snprintf(buf, sizeof(buf), "%08x", core_version);
+    return String(buf);
+}
+
 const char * EspClass::getSdkVersion(void)
 {
     return system_get_sdk_version();
diff --git a/cores/esp8266/Esp.h b/cores/esp8266/Esp.h
index 83f4b1b73d..c506a525f1 100644
--- a/cores/esp8266/Esp.h
+++ b/cores/esp8266/Esp.h
@@ -106,6 +106,7 @@ class EspClass {
         uint32_t getChipId();
 
         const char * getSdkVersion();
+        String getCoreVersion();
 
         uint8_t getBootVersion();
         uint8_t getBootMode();
diff --git a/cores/esp8266/core_esp8266_main.cpp b/cores/esp8266/core_esp8266_main.cpp
index f63fe24f52..634eb7902b 100644
--- a/cores/esp8266/core_esp8266_main.cpp
+++ b/cores/esp8266/core_esp8266_main.cpp
@@ -31,6 +31,8 @@ extern "C" {
 #include "user_interface.h"
 #include "cont.h"
 }
+#include <core_version.h>
+
 #define LOOP_TASK_PRIORITY 1
 #define LOOP_QUEUE_SIZE    1
 
@@ -38,6 +40,16 @@ extern "C" {
 
 struct rst_info resetInfo;
 
+extern "C" {
+extern const uint32_t __attribute__((section(".ver_number"))) core_version = ARDUINO_ESP8266_GIT_VER;
+const char* core_release = 
+#ifdef ARDUINO_ESP8266_RELEASE
+    ARDUINO_ESP8266_RELEASE;
+#else
+    NULL;
+#endif
+} // extern "C"
+
 int atexit(void (*func)()) {
     return 0;
 }
@@ -134,6 +146,7 @@ void init_done() {
     system_set_os_print(1);
     gdb_init();
     do_global_ctors();
+    printf("\n%08x\n", core_version);
     esp_schedule();
 }
 
diff --git a/cores/esp8266/core_version.h b/cores/esp8266/core_version.h
new file mode 100644
index 0000000000..09e384c1fd
--- /dev/null
+++ b/cores/esp8266/core_version.h
@@ -0,0 +1,6 @@
+#define ARDUINO_ESP8266_GIT_VER 0x00000000
+
+// ARDUINO_ESP8266_RELEASE is defined for released versions as a string containing the version name, i.e. "2_3_0_RC1"
+// ARDUINO_ESP8266_RELEASE is used in the core internally. Please use ESP.getCoreVersion() function instead.
+
+// ARDUINO_ESP8266_RELEASE_<version number> are defined for releases, for use in #ifdef... constructs
diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh
index f713b1c692..8859603d80 100755
--- a/package/build_boards_manager_package.sh
+++ b/package/build_boards_manager_package.sh
@@ -46,8 +46,8 @@ rm exclude.txt
 
 # Get additional libraries (TODO: add them as git submodule or subtree?)
 
-# SoftwareSerial version 2.2
-wget -q -O SoftwareSerial.zip https://github.com/plerup/espsoftwareserial/archive/097712eb07f5b3a70ef419b6e7a7ed2ada5aab85.zip
+# SoftwareSerial library
+wget -q -O SoftwareSerial.zip https://github.com/plerup/espsoftwareserial/archive/3.1.0.zip
 unzip -q SoftwareSerial.zip
 rm -rf SoftwareSerial.zip
 mv espsoftwareserial-* SoftwareSerial
@@ -66,9 +66,17 @@ cat $srcdir/platform.txt | \
 $SED 's/runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-lx106-elf//g' | \
 $SED 's/runtime.tools.esptool.path={runtime.platform.path}\/tools\/esptool//g' | \
 $SED 's/tools.esptool.path={runtime.platform.path}\/tools\/esptool/tools.esptool.path=\{runtime.tools.esptool.path\}/g' | \
-$SED 's/tools.mkspiffs.path={runtime.platform.path}\/tools\/mkspiffs/tools.mkspiffs.path=\{runtime.tools.mkspiffs.path\}/g' \
+$SED 's/tools.mkspiffs.path={runtime.platform.path}\/tools\/mkspiffs/tools.mkspiffs.path=\{runtime.tools.mkspiffs.path\}/g' |\
+$SED 's/recipe.hooks.core.prebuild.1.pattern.*//g' \
  > $outdir/platform.txt
 
+# Put core version and short hash of git version into core_version.h
+ver_define=`echo $ver | tr "[:lower:].-" "[:upper:]_"`
+echo Ver define: $ver_define
+echo \#define ARDUINO_ESP8266_GIT_VER 0x`git rev-parse --short=8 HEAD 2>/dev/null` >$outdir/cores/esp8266/core_version.h
+echo \#define ARDUINO_ESP8266_RELEASE_$ver_define >>$outdir/cores/esp8266/core_version.h
+echo \#define ARDUINO_ESP8266_RELEASE \"$ver_define\" >>$outdir/cores/esp8266/core_version.h
+
 # Zip the package
 pushd package/versions/$ver
 echo "Making $package_name.zip"
diff --git a/platform.txt b/platform.txt
index d1bce473ad..209a4c8c3d 100644
--- a/platform.txt
+++ b/platform.txt
@@ -22,7 +22,7 @@ build.lwip_flags=-DLWIP_OPEN_SRC
 
 compiler.path={runtime.tools.xtensa-lx106-elf-gcc.path}/bin/
 compiler.sdk.path={runtime.platform.path}/tools/sdk
-compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/lwip/include"
+compiler.cpreprocessor.flags=-D__ets__ -DICACHE_FLASH -U__STRICT_ANSI__ "-I{compiler.sdk.path}/include" "-I{compiler.sdk.path}/lwip/include" "-I{build.path}/core"
 
 compiler.c.cmd=xtensa-lx106-elf-gcc
 compiler.c.flags=-c {compiler.warning_flags} -Os -g -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals -falign-functions=4 -MMD -std=gnu99 -ffunction-sections -fdata-sections
@@ -63,6 +63,12 @@ compiler.ar.extra_flags=
 compiler.objcopy.eep.extra_flags=
 compiler.elf2hex.extra_flags=
 
+## generate file with git version number
+## needs bash, git, and echo
+recipe.hooks.core.prebuild.1.pattern=bash -c "mkdir -p {build.path}/core && echo \#define ARDUINO_ESP8266_GIT_VER 0x`git --git-dir {runtime.platform.path}/.git rev-parse --short=8 HEAD 2>/dev/null || echo ffffffff` >{build.path}/core/core_version.h"
+## windows-compatible version may be added later
+recipe.hooks.core.prebuild.1.pattern.windows=
+
 ## Compile c files
 recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.cpreprocessor.flags} {compiler.c.flags} -DF_CPU={build.f_cpu} {build.lwip_flags} {build.debug_port} {build.debug_level} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DARDUINO_BOARD="{build.board}" {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
 
diff --git a/tools/sdk/ld/eagle.app.v6.common.ld b/tools/sdk/ld/eagle.app.v6.common.ld
index 90d9fc18ce..ac03c8987b 100644
--- a/tools/sdk/ld/eagle.app.v6.common.ld
+++ b/tools/sdk/ld/eagle.app.v6.common.ld
@@ -152,6 +152,7 @@ SECTIONS
   .irom0.text : ALIGN(4)
   {
     _irom0_text_start = ABSOLUTE(.);
+    *(.ver_number)
     *.c.o( EXCLUDE_FILE (umm_malloc.c.o) .literal*, \
            EXCLUDE_FILE (umm_malloc.c.o) .text*)
     *.cpp.o(.literal*, .text*)