Initial restructure to support multiple target architectures

.gitmodules

@@ -1,94 +1,100 @@
-[submodule "Sming/third-party/rboot"]
-	path = Sming/third-party/rboot
-	url = https://github.com/raburton/rboot.git
-        ignore = dirty
 [submodule "Sming.wiki"]
 	path = docs/wiki
 	url = https://github.com/SmingHub/Sming.wiki.git
 	ignore = dirty
-[submodule "Sming/third-party/pwm"]
-	path = Sming/third-party/pwm
+[submodule "spiffs"]
+	path = Sming/Components/spiffs
+	url = https://github.com/pellepl/spiffs.git
+	ignore = dirty
+[submodule "http-parser"]
+	path = Sming/Components/http-parser
+	url = https://github.com/nodejs/http-parser.git
+	ignore = dirty
+[submodule "ws_parser"]
+	path = Sming/Components/ws_parser
+	url = https://github.com/charliesome/ws_parser.git
+	ignore = dirty
+[submodule "mqtt-codec"]
+	path = Sming/Components/mqtt-codec
+	url = https://github.com/slaff/mqtt-codec.git
+	ignore = dirty
+[submodule "libyuarel"]
+	path = Sming/Components/libyuarel
+	url = https://github.com/jacketizer/libyuarel.git
+	ignore = dirty
+
+[submodule "ESP8266.rboot"]
+	path = Sming/Arch/Esp8266/Components/rboot/rboot
+	url = https://github.com/raburton/rboot.git
+	ignore = dirty
+[submodule "ESP8266.new-pwm"]
+	path = Sming/Arch/Esp8266/Components/pwm/new-pwm
 	url = https://github.com/StefanBruens/ESP8266_new_pwm.git
-        ignore = dirty
-[submodule "Sming/third-party/axtls-8266"]
-	path = Sming/third-party/axtls-8266
+	ignore = dirty
+[submodule "ESP8266.axtls-8266"]
+	path = Sming/Arch/Esp8266/Components/axtls-8266/axtls-8266
 	url = https://github.com/igrr/axtls-8266.git
-        ignore = dirty
-[submodule "Sming/third-party/spiffs"]
-	path = Sming/third-party/spiffs
-	url = https://github.com/pellepl/spiffs.git
-[submodule "Sming/third-party/umm_malloc"]
-	path = Sming/third-party/umm_malloc
+	ignore = dirty
+[submodule "ESP8266.umm_malloc"]
+	path = Sming/Arch/Esp8266/Components/custom_heap/umm_malloc
 	url = https://github.com/rhempel/umm_malloc.git
 	ignore = dirty
-[submodule "Sming/third-party/esp-open-lwip"]
-	path = Sming/third-party/esp-open-lwip
+[submodule "ESP8266.esp-open-lwip"]
+	path = Sming/Arch/Esp8266/Components/esp-open-lwip/esp-open-lwip
 	url = https://github.com/pfalcon/esp-open-lwip.git
 	ignore = dirty
-[submodule "Sming/third-party/http-parser"]
-	path = Sming/third-party/http-parser
-	url = https://github.com/nodejs/http-parser.git
+[submodule "ESP8266.lwip2"]
+	path = Sming/Arch/Esp8266/Components/lwip2/lwip2
+	url = https://github.com/d-a-v/esp82xx-nonos-linklayer.git
 	ignore = dirty
-[submodule "Sming/third-party/ws_parser"]
-	path = Sming/third-party/ws_parser
-	url = https://github.com/charliesome/ws_parser.git
+
+[submodule "ESP8266.Sdk"]
+	path = Sming/Arch/Esp8266/Components/Sdk/ESP8266_NONOS_SDK
+	url = https://github.com/espressif/ESP8266_NONOS_SDK.git
 	ignore = dirty
-[submodule "Sming/Libraries/Adafruit_ST7735"]
+[submodule "ESP8266.esptool2"]
+	path = Sming/Arch/Esp8266/Tools/esptool2
+	url = https://github.com/raburton/esptool2.git
+	ignore = dirty
+
+[submodule "Libraries.Adafruit_ST7735"]
 	path = Sming/Libraries/Adafruit_ST7735
 	url = https://github.com/adafruit/Adafruit-ST7735-Library.git
 	ignore = dirty
-[submodule "Sming/Libraries/Adafruit_SSD1306"]
+[submodule "Libraries.Adafruit_SSD1306"]
 	path = Sming/Libraries/Adafruit_SSD1306
 	url = https://github.com/adafruit/Adafruit_SSD1306.git
 	ignore = dirty
-[submodule "Sming/Libraries/Adafruit_BME280_Library"]
+[submodule "Libraries.Adafruit_BME280_Library"]
 	path = Sming/Libraries/Adafruit_BME280_Library
 	url = https://github.com/adafruit/Adafruit_BME280_Library.git
 	ignore = dirty
-[submodule "Sming/Libraries/Adafruit_Sensor"]
+[submodule "Libraries.Adafruit_Sensor"]
 	path = Sming/Libraries/Adafruit_Sensor
 	url = https://github.com/adafruit/Adafruit_Sensor
 	ignore = dirty
-[submodule "Sming/third-party/lwip2"]
-	path = Sming/third-party/lwip2
-	url = https://github.com/d-a-v/esp82xx-nonos-linklayer.git
-	ignore = dirty
-[submodule "Sming/third-party/ESP8266_NONOS_SDK"]
-	path = Sming/third-party/ESP8266_NONOS_SDK
-	url = https://github.com/espressif/ESP8266_NONOS_SDK.git
-	ignore = dirty
-[submodule "tools/esptool2"]
-	path = tools/esptool2
-	url = https://github.com/raburton/esptool2.git
-	ignore = dirty
-[submodule "Sming/Libraries/RingBufCPP"]
+[submodule "Libraries.RingBufCPP"]
 	path = Sming/Libraries/RingBufCPP
 	url = https://github.com/wizard97/Embedded_RingBuf_CPP.git
 	ignore = dirty
-[submodule "Sming/Libraries/IR"]
+[submodule "Libraries.IR"]
 	path = Sming/Libraries/IR
 	url = https://github.com/markszabo/IRremoteESP8266.git
 	ignore = dirty
-[submodule "Sming/Libraries/DHTesp"]
+[submodule "Libraries.DHTesp"]
 	path = Sming/Libraries/DHTesp
 	url = https://github.com/beegee-tokyo/DHTesp.git
 	ignore = dirty
-[submodule "Sming/third-party/ITEADLIB_Arduino_Nextion"]
+[submodule "Libraries.ITEADLIB_Arduino_Nextion"]
 	path = Sming/Libraries/ITEADLIB_Arduino_Nextion
     url = https://github.com/itead/ITEADLIB_Arduino_Nextion.git
     ignore = dirty
-[submodule "Sming/Libraries/DFRobotDFPlayerMini"]
+[submodule "Libraries.DFRobotDFPlayerMini"]
 	path = Sming/Libraries/DFRobotDFPlayerMini
 	url = https://github.com/DFRobot/DFRobotDFPlayerMini.git
 	ignore = dirty
-[submodule "Sming/Libraries/TM1637"]
+[submodule "Libraries.TM1637"]
 	path = Sming/Libraries/TM1637
 	url = https://github.com/avishorp/TM1637.git
 	ignore = dirty
-[submodule "Sming/third-party/mqtt-codec"]
-	path = Sming/third-party/mqtt-codec
-	url = https://github.com/slaff/mqtt-codec.git
-	ignore = dirty
-[submodule "Sming/third-party/libyuarel"]
-	path = Sming/third-party/libyuarel
-	url = https://github.com/jacketizer/libyuarel.git
+

.travis.yml

@@ -59,6 +59,8 @@ script:
 - cd $SMING_HOME
 - if [ "$SDK_VERSION" == "2.0.0" ]; then ../.travis/tools/clang/format-pr.sh; fi
 - cd $SMING_HOME
+- make help
+- make list-config
 - make STRICT=1
 - make samples
 - make clean samples-clean

.travis/tools/clang/format-pr.sh

@@ -10,7 +10,7 @@ $CLANG_FORMAT --version
 cd $SMING_HOME/..
 
 # Get list of modified files
-files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^[^.]*[.]\(c\|cpp\|h\)$' | grep -e Sming/SmingCore -e samples || true)"
+files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^[^.]*[.]\(c\|cpp\|h\)$' | grep -e Sming/Core -e Sming/Platform -e Sming/Arch/.+/Core -e Sming/Arch/.+/Platform -e samples || true)"
 
 for f in $files_to_lint; do
 

Sming/system/uart.cpp → Sming/Arch/Esp8266/Components/driver/uart.cpp

@@ -46,7 +46,7 @@
 #include "Clock.h"
 #include "Digital.h"
 
-#include "espinc/uart.h"
+#include "driver/uart.h"
 #include "espinc/peri.h"
 
 #include "Data/Buffer/SerialBuffer.h"

Sming/system/crash_handler.c → Sming/Arch/Esp8266/Components/esp8266/crash_handler.c

@@ -21,7 +21,7 @@
  */
 
 #include <user_config.h>
-#include "gdb_hooks.h"
+#include "gdb/gdb_hooks.h"
 
 extern void __real_system_restart_local();
 

Sming/system/esp_cplusplus.cpp → Sming/Arch/Esp8266/Components/esp8266/esp_cplusplus.cpp

@@ -1,5 +1,5 @@
-#include "../include/user_config.h"
-#include "../include/esp_cplusplus.h"
+#include <user_config.h>
+#include "include/esp_cplusplus.h"
 #include <stdlib.h>
 
 ////////////////////////////////////////////////////////////////////////

Sming/appinit/user_main.cpp → Sming/Arch/Esp8266/Components/esp8266/startup.cpp

@@ -10,8 +10,8 @@
 
 #include <user_config.h>
 #include "Platform/System.h"
-#include "espinc/uart.h"
-#include "gdb_hooks.h"
+#include <driver/uart.h>
+#include <gdb/gdb_hooks.h>
 
 extern void init();
 

Sming/appspecific/gdb/gdb_hooks.cpp → Sming/Arch/Esp8266/Components/gdbstub/appcode/gdb_hooks.cpp

@@ -8,13 +8,13 @@
  *
  ****/
 
-#include <gdb_hooks.h>
-#include <gdb_syscall.h>
-#include "gdb/gdbstub.h"
-#include "gdb/gdbuart.h"
-#include "gdb/gdbstub-entry.h"
-#include "gdb/exceptions.h"
-#include <espinc/uart.h>
+#include <gdb/gdb_hooks.h>
+#include <gdb/gdb_syscall.h>
+#include "gdbstub/gdbstub.h"
+#include "gdbstub/gdbuart.h"
+#include "gdbstub/gdbstub-entry.h"
+#include "gdbstub/exceptions.h"
+#include <driver/uart.h>
 
 extern "C" {
 
@@ -49,7 +49,7 @@ void debug_print_stack(uint32_t start, uint32_t end)
 	m_puts(_F("\r\n"
 			  "Stack dump:\r\n"));
 	PSTR_ARRAY(instructions, "To decode the stack dump call from command line:\r\n"
-							 "   python $SMING_HOME/../tools/decode-stacktrace.py out/build/app.out\r\n"
+							 "   make decode-stacktrace\r\n"
 							 "and copy & paste the text enclosed in '===='.\r\n");
 	PSTR_ARRAY(separatorLine, "\n================================================================\r\n");
 	m_puts(instructions);

Sming/appspecific/gdb/gdbstub-entry.S → Sming/Arch/Esp8266/Components/gdbstub/appcode/gdbstub-entry.S

@@ -6,7 +6,7 @@
  * License: ESPRESSIF MIT License
  *******************************************************************************/
 
-#include "gdb/gdbstub-internal.h"
+#include "gdbstub/gdbstub-internal.h"
 
 #include <xtensa/config/specreg.h>
 #include <xtensa/config/core-isa.h>

Sming/gdb/gdbstub.cpp → Sming/Arch/Esp8266/Components/gdbstub/gdbstub.cpp

@@ -30,7 +30,7 @@
 
 #include "gdbstub.h"
 #include "gdbstub-entry.h"
-#include "gdb_hooks.h"
+#include <gdb/gdb_hooks.h>
 #include "GdbPacket.h"
 #include "exceptions.h"
 #include "gdb/registers.h"

Sming/gdb/gdbstub.h → Sming/Arch/Esp8266/Components/gdbstub/gdbstub.h

@@ -14,7 +14,7 @@
 #define _GDB_GDBSTUB_H_
 
 #include "gdbstub-internal.h"
-#include <gdb_hooks.h>
+#include <gdb/gdb_hooks.h>
 #include "BitManipulations.h"
 
 // GDB_xx macro versions required to ensure no flash access if requested

Sming/gdb/gdbsyscall.cpp → Sming/Arch/Esp8266/Components/gdbstub/gdbsyscall.cpp

@@ -16,7 +16,7 @@
 
 #include "gdbsyscall.h"
 #include "GdbPacket.h"
-#include <gdb_syscall.h>
+#include <gdb/gdb_syscall.h>
 #include <sys/errno.h>
 #include "Platform/System.h"
 

Sming/gdb/gdbuart.cpp → Sming/Arch/Esp8266/Components/gdbstub/gdbuart.cpp

@@ -12,7 +12,7 @@
 
 #include "gdbuart.h"
 #include "GdbPacket.h"
-#include "espinc/uart.h"
+#include "driver/uart.h"
 #include "Data/Buffer/SerialBuffer.h"
 #include "Platform/System.h"
 #include "HardwareSerial.h"

Sming/SmingCore/Digital.cpp → Sming/Arch/Esp8266/Core/Digital.cpp

@@ -11,6 +11,7 @@
 #include "Digital.h"
 #include "WiringFrameworkIncludes.h"
 #include "espinc/peri.h"
+#include "ESP8266EX.h"
 
 const unsigned int A0 = 17; // Single ESP8266EX analog input pin (TOUT) 10 bit, 0..1v
 

Sming/SmingCore/HardwarePWM.cpp → Sming/Arch/Esp8266/Core/HardwarePWM.cpp

@@ -25,6 +25,7 @@
 
 #include "Clock.h"
 #include "WiringFrameworkIncludes.h"
+#include "ESP8266EX.h"
 
 #include "HardwarePWM.h"
 

Sming/SmingCore/HardwareSerial.cpp → Sming/Arch/Esp8266/Core/HardwareSerial.cpp

@@ -12,7 +12,7 @@
 
 #include "HardwareSerial.h"
 #include <cstdarg>
-#include "System.h"
+#include "Platform/System.h"
 #include "m_printf.h"
 
 #if ENABLE_CMD_EXECUTOR

Sming/SmingCore/Interrupts.cpp → Sming/Arch/Esp8266/Core/Interrupts.cpp

@@ -11,7 +11,7 @@
 #include "Interrupts.h"
 #include "Digital.h"
 #include "WiringFrameworkIncludes.h"
-#include "System.h"
+#include "Platform/System.h"
 
 static InterruptCallback gpioInterruptsList[16] = {0};
 static InterruptDelegate delegateFunctionList[16];

Sming/SmingCore/Network/rBootHttpUpdate.h → Sming/Arch/Esp8266/Core/Network/rBootHttpUpdate.h

@@ -17,7 +17,7 @@
 #define _SMING_CORE_NETWORK_RBOOT_HTTP_UPDATE_H_
 
 #include "Data/Stream/DataSourceStream.h"
-#include "HttpClient.h"
+#include "Network/HttpClient.h"
 #include <rboot-api.h>
 
 #define NO_ROM_SWITCH 0xff

Sming/SmingCore/core_esp8266_si2c.cpp → Sming/Arch/Esp8266/Core/core_esp8266_si2c.cpp

@@ -21,6 +21,8 @@
 #include "twi.h"
 #include "Digital.h"
 
+#include <espinc/peri.h>
+
 unsigned char twi_dcount = 18;
 static unsigned char twi_sda, twi_scl;
 static uint32_t twi_clockStretchLimit;

Sming/SmingCore/Platform/AccessPoint.cpp → Sming/Arch/Esp8266/Platform/AccessPoint.cpp

@@ -8,7 +8,7 @@
  *
  ****/
 
-#include "AccessPoint.h"
+#include "Platform/AccessPoint.h"
 #include "Interrupts.h"
 #include "Data/HexString.h"
 

Sming/SmingCore/Platform/RTC.cpp → Sming/Arch/Esp8266/Platform/RTC.cpp

@@ -8,7 +8,7 @@
  *
  ****/
 
-#include "RTC.h"
+#include "Platform/RTC.h"
 
 RtcClass::RtcClass()
 {

Sming/SmingCore/Platform/Station.cpp → Sming/Arch/Esp8266/Platform/Station.cpp

@@ -8,7 +8,7 @@
  *
  ****/
 
-#include "Station.h"
+#include "Platform/Station.h"
 #include "Interrupts.h"
 #include "Data/HexString.h"
 

Sming/SmingCore/Platform/System.cpp → Sming/Arch/Esp8266/Platform/System.cpp

@@ -8,7 +8,7 @@
  *
  ****/
 
-#include "System.h"
+#include "Platform/System.h"
 #include "SimpleTimer.h"
 
 SystemClass System;

Sming/SmingCore/Platform/WDT.cpp → Sming/Arch/Esp8266/Platform/WDT.cpp

@@ -11,7 +11,7 @@
  *
  */
 
-#include "WDT.h"
+#include "Platform/WDT.h"
 
 WDTClass WDT;
 

Sming/SmingCore/Platform/WifiEvents.cpp → Sming/Arch/Esp8266/Platform/WifiEvents.cpp

@@ -10,7 +10,7 @@
  *      Author: shurik
  */
 
-#include <WifiEvents.h>
+#include "Platform/WifiEvents.h"
 
 WifiEventsClass WifiEvents;
 

Sming/SmingCore/Platform/WifiSniffer.cpp → Sming/Arch/Esp8266/Platform/WifiSniffer.cpp

@@ -12,7 +12,7 @@
  *
  ****/
 
-#include "WifiSniffer.h"
+#include "Platform/WifiSniffer.h"
 #include "esp_wifi_sniffer.h"
 
 WifiSnifferCallback WifiSniffer::snifferCallback;