Skip to content

Commit

Permalink
Showing 68 changed files with 1,967 additions and 1,224 deletions.
12 changes: 12 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
sudo: false
language: cpp
install:
- mkdir -p $TRAVIS_BUILD_DIR/opt/esp-open-sdk
- wget https://bintray.com/artifact/download/kireevco/generic/esp-open-sdk-1.2-linux-x86_64.tar.gz
- tar -zxf esp-open-sdk-1.2-linux-x86_64.tar.gz -C $TRAVIS_BUILD_DIR/opt/esp-open-sdk
- export PATH=$PATH:$TRAVIS_BUILD_DIR/opt/esp-open-sdk/sdk:$TRAVIS_BUILD_DIR/opt/esp-open-sdk/xtensa-lx106-elf/bin
- export SMING_HOME=$TRAVIS_BUILD_DIR/Sming
- export ESP_HOME=$TRAVIS_BUILD_DIR/opt/esp-open-sdk
script:
- cd Sming
- make
2 changes: 2 additions & 0 deletions Basic_AirUpdate/app/application.cpp
Original file line number Diff line number Diff line change
@@ -34,6 +34,8 @@ void connectOk()

void init()
{
spiffs_mount(); // Mount file system, in order to work with files

Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
Serial.systemDebugOutput(true); // Debug output to serial

2 changes: 0 additions & 2 deletions Basic_rBoot/Makefile-user.mk
Original file line number Diff line number Diff line change
@@ -55,5 +55,3 @@ SPIFF_SIZE ?= 65536
#RBOOT_SPIFFS_1 ?= 0x300000
## esptool2 path
#ESPTOOL2 ?= esptool2
## path to spiffy
#SPIFFY ?= spiffy
10 changes: 2 additions & 8 deletions Basic_rBoot/readme.txt
Original file line number Diff line number Diff line change
@@ -17,10 +17,6 @@ Makefile-user.mk

Building
--------
0) Set environment variable DISABLE_SPIFFS_AUTO=1 before building Sming itself
(libsming), this prevents Sming trying to auto-mount a spiffs filesystem
from the wrong flash location (which is potentially destructive to flash
contents).
1) Set ESP_HOME & SMING_HOME, as environment variables or edit Makefile-user.mk
as you would for general Sming app compiling.
2) Set ESPTOOL2 (env var or in Makefile-user.mk) to point to the esptool2
@@ -51,10 +47,8 @@ so the reason for this strange addressing is not clear.
Important compiler flags used:
BOOT_BIG_FLASH - when using big flash mode, ensures flash mapping code is built
in to the rom.
DISABLE_SPIFFS_AUTO - prevents automounting at the wrong location. (by code in
Sming/appinit/user_main.cpp). Instead we call spiffs_mount_manual from init.
RBOOT_BUILD_SMING - ensures big flash support function is correcly marked to
remain in iram (plus potentially other sming specific code in future).
RBOOT_INTEGRATION - ensures Sming specific options are pulled in to the rBoot
source at compile time.
SPIFF_SIZE=value - passed through to code for mounting the filesystem. Also used
in the Makefile to create the spiffs.

20 changes: 20 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Contributing to Sming Framework
All contributions (PRs) to Sming Framework have to be done to _develop_ branch.
If a feature or bugfix is a major change please contact Sming team to prepare feature specific handling.

__master__: Branch that contains latest production (stable) release. No PRs other than Final Release updates will be merged into __master__.
__develop__: Main development branch: contains all current new features.

This will mean that __all contributors__ will have to submit a PR to a _develop_ , it will be tested and then merged to __develop__ for automated integration testing (via TravisCI, Jenkins or SemaphoreCI), as well as manual testing on a real device.

__Sming Contributing flow__:
- Fork _Sming_ repo
- Create a branch off the _develop_: __MyNewFeature__
- Build, test your code
- Commit changes
- Push your changes to your fork on github
- Submit PR to the main Sming repo, __develop__ branch.
- Work with other contributors to test your feature and get it merged to _develop_

This is the most common approach for a git-flow:
http://nvie.com/posts/a-successful-git-branching-model/
2 changes: 2 additions & 0 deletions FtpServer_Files/app/application.cpp
Original file line number Diff line number Diff line change
@@ -31,6 +31,8 @@ void connectFail()

void init()
{
spiffs_mount(); // Mount file system, in order to work with files

Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
Serial.systemDebugOutput(true); // Enable debug output to serial

2 changes: 2 additions & 0 deletions HttpClient_Instapush/app/application.cpp
Original file line number Diff line number Diff line change
@@ -92,6 +92,8 @@ void connectOk()

void init()
{
spiffs_mount(); // Mount file system, in order to work with files

Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
Serial.systemDebugOutput(true); // Debug output to serial

2 changes: 2 additions & 0 deletions HttpClient_ThingSpeak/app/application.cpp
Original file line number Diff line number Diff line change
@@ -62,6 +62,8 @@ void connectFail()

void init()
{
spiffs_mount(); // Mount file system, in order to work with files

Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
Serial.systemDebugOutput(false); // Disable debug output to serial

2 changes: 2 additions & 0 deletions HttpServer_AJAX/app/application.cpp
Original file line number Diff line number Diff line change
@@ -97,6 +97,8 @@ void connectOk()

void init()
{
spiffs_mount(); // Mount file system, in order to work with files

Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
Serial.systemDebugOutput(true); // Enable debug output to serial

2 changes: 2 additions & 0 deletions HttpServer_Bootstrap/app/application.cpp
Original file line number Diff line number Diff line change
@@ -104,6 +104,8 @@ void connectOk()

void init()
{
spiffs_mount(); // Mount file system, in order to work with files

pinMode(LED_PIN, OUTPUT);

Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
2 changes: 2 additions & 0 deletions HttpServer_ConfigNetwork/app/application.cpp
Original file line number Diff line number Diff line change
@@ -191,6 +191,8 @@ void networkScanCompleted(bool succeeded, BssList list)

void init()
{
spiffs_mount(); // Mount file system, in order to work with files

Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
Serial.systemDebugOutput(true); // Enable debug output to serial
AppSettings.load();
2 changes: 2 additions & 0 deletions HttpServer_WebSockets/app/application.cpp
Original file line number Diff line number Diff line change
@@ -93,6 +93,8 @@ void connectOk()

void init()
{
spiffs_mount(); // Mount file system, in order to work with files

Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
Serial.systemDebugOutput(true); // Enable debug output to serial

2 changes: 1 addition & 1 deletion IR_lib/app/application.cpp
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
Timer irTimer;
decode_results dresults;
IRrecv irrecv(IR_PIN);
IRsend irsend;
IRsend irsend(IR_PIN);

void receiveIR()
{
2 changes: 2 additions & 0 deletions MeteoControl/app/application.cpp
Original file line number Diff line number Diff line change
@@ -30,6 +30,8 @@ void connectFail();

void init()
{
spiffs_mount(); // Mount file system, in order to work with files

Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
Serial.systemDebugOutput(false); // Debug output to serial

2 changes: 1 addition & 1 deletion README.md → Readme.md
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ Sming - Open Source framework for high efficiency WiFi SoC ESP8266 native develo

[![ESP8266 C++ development framework](https://github.com/anakod/Sming/wiki/images/small/combine.png)](https://github.com/anakod/Sming/wiki/examples)

[![Join the chat at https://gitter.im/alonewolfx2/Sming](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/alonewolfx2/Sming?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Gitter (chat)](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/SmingHub/Sming?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
[![Donate](http://img.shields.io/paypal/donate.png?color=yellow)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=WAQ8XDHCKU3PL&lc=US&item_name=Sming%20Framework%20development&item_number=sming&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)
[![Download](https://img.shields.io/badge/download-~1.7M-orange.svg)](https://github.com/anakod/Sming/releases/latest)
[![Build](https://travis-ci.org/SmingHub/Sming.svg?branch=develop)](https://travis-ci.org/SmingHub/Sming)
8 changes: 0 additions & 8 deletions Sming/.cproject
Original file line number Diff line number Diff line change
@@ -111,14 +111,6 @@
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="rebuild DISABLE_SPIFFS=1" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>rebuild DISABLE_SPIFFS=1</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
</buildTargets>
</storageModule>
</cproject>
Loading

0 comments on commit 1078641

Please sign in to comment.