From 8bf0ab1f3e6fa85482842b0f35054c87b8a79323 Mon Sep 17 00:00:00 2001 From: Chris Liebman Date: Thu, 18 Jul 2019 09:21:12 -0700 Subject: [PATCH] updates for change to platformio --- .gitignore | 18 ++++++------------ .travis.yml | 49 ++++++++++--------------------------------------- README.md | 10 ++++------ 3 files changed, 20 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 5b49161..dee8e1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,9 @@ -.metadata .DS_Store +ESPNTPServer.code-workspace *.bak *-bak -/.setup_hook.sh -/ESPNTPServer/.ino.cpp -/ESPNTPServer/.project -/ESPNTPServer/.cproject -/ESPNTPServer/.settings -/ESPNTPServer/Release -/ESPNTPServer/Debug -/ESPNTPServer/libraries -/ESPNTPServer/core -/ESPNTPServer/spec.d -/RemoteSystemsTempFiles +.pio +.vscode +eagle/ESPNTPServer/ESPNTPServer.b#* +eagle/ESPNTPServer/ESPNTPServer.s#* +eagle/ESPNTPServer/ESPNTPServer_*.zip diff --git a/.travis.yml b/.travis.yml index 2ca8dac..07e0e68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,46 +1,17 @@ language: python +python: - "2.7" -sudo: required +sudo: false -env: - global: - - APPLICATION_FOLDER="${HOME}/arduino-ide" - - SKETCHBOOK_FOLDER="${TRAVIS_BUILD_DIR}" - - ESP8266_DEVICE="esp8266com:esp8266:generic:CpuFrequency=160,CrystalFreq=26,FlashFreq=40,FlashMode=qio,FlashSize=4M1M,led=2,LwIPVariant=v2mss536,Debug=Serial1,DebugLevel=None____" - - ESPNTPSERVER_DIR="${TRAVIS_BUILD_DIR}/ESPNTPServer" +cache: + directories: + - "~/.platformio" -before_install: - - echo HOME is "'${HOME}'" - - id - - cd "${TRAVIS_BUILD_DIR}" - - ./setup.sh - # setup arduino-ci-script - - git clone https://github.com/per1234/arduino-ci-script.git "${HOME}/scripts" - - cd "${HOME}/scripts" - # Get new tags from the remote - - git fetch --tags - # Checkout the latest tag - - git checkout $(git describe --tags `git rev-list --tags --max-count=1`) - - source "${HOME}/scripts/arduino-ci-script.sh" - - # Uncomment the following lines to get verbose output for debugging - # 0 (minimum/default) - 2 (maximum) verbosity - #- set_script_verbosity 1 - # Turn on verbose output during compilation - #- set_verbose_output_during_compilation "true" - - # Don't for library issues that don't affect compilation - - set_library_testing "false" - - - set_application_folder "$APPLICATION_FOLDER" - - set_sketchbook_folder "$SKETCHBOOK_FOLDER" - - - install_ide "1.8.5" - - # make it look like a sketch for arduino - - touch "${ESPNTPSERVER_DIR}/ESPNTPServer.ino" +install: + - pip install -U platformio + - platformio update script: - # build with arduino - - build_sketch "${ESPNTPSERVER_DIR}" "${ESP8266_DEVICE}" "false" "1.8.5" + - platformio run + diff --git a/README.md b/README.md index 9fc61a2..c106658 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,11 @@ # ESPNTPServer + GPS fueled ESP8266 based NTP Server -[![Build Status](https://travis-ci.org/liebman/ESPNTPServer.svg?branch=master)](https://travis-ci.org/liebman/ESPNTPServer) +<<<<<<< HEAD +[![Build Status](https://travis-ci.org/liebman/ESPNTPServer.svg?branch=master)](https://travis-ci.org/liebman/ESPNTPServer.svg) -[ESPNTPServer](ESPNTPServer) Contains the code for the NTP Server. I used [Eclipse with an Arduino plugin](http://sloeber.io) for development. If you want to use the Arduino IDE then create an empty file named ESPNTPServer.ino - -[hardware](hardware) contains the esp8266 arduino core version used as a git submodule - -[libraries](libraries) has all needed libraries as git submodules +[src](src) Contains the code for the NTP Server [eagle](eagle) contains the schematic and board designs in Eagle cad.