Taylor Gy
OneNet_IoT_demo for ASC platform
Dependencies: Common_lib ESP8266 EdpKit_lib cJSON_lib driver_mbed_HP20x driver_mbed_TH02 wifi_example
Fork of
mbed-os-example-esp8266
by 
ESP8266
Revision 2:1dbc3aa8ae3a, committed 2017-03-29
- Comitter:
- TaylorGy
- Date:
- Wed Mar 29 03:14:41 2017 +0000
- Parent:
- 1:b4a718e62e0b
- Commit message:
- Beta Version V1.01
Changed in this revision
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Common_lib.lib Wed Mar 29 03:14:41 2017 +0000 @@ -0,0 +1,1 @@ +https://developer.mbed.org/users/TaylorGy/code/Common_lib/#ea00e3a8793b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ESP8266.lib Wed Mar 29 03:14:41 2017 +0000 @@ -0,0 +1,1 @@ +https://developer.mbed.org/users/TaylorGy/code/ESP8266/#dfb22bd0e039
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/EdpKit_lib.lib Wed Mar 29 03:14:41 2017 +0000 @@ -0,0 +1,1 @@ +https://developer.mbed.org/users/TaylorGy/code/EdpKit_lib/#79de700849c5
--- a/LICENSE Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright {yyyy} {name of copyright owner}
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--- a/README.md Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-# mbed-os-example-wifi #
-
-WiFi example for mbed OS
-
-## Getting started with the WiFi API ##
-
-This is a quick example of a simple WiFi application using the WiFi and network-socket APIs that is provided as a part of [mbed-os](github.com/armmbed/mbed-os).
-
-The program brings up the WiFi and the underlying network interface, and uses it to scans available networks, connects to a network, prints interface and connection details and performs simple HTTP operation.
-
-### Supported hardware ###
-
-* [UBLOX Odin board](https://developer.mbed.org/platforms/ublox-EVK-ODIN-W2/) (`UBLOX_EVK_ODIN_W2` target when using mbed CLI)
-* Other mbed target with ESP2866 module (Board it's connected to shouldn't have other network interface eg. Ethernet)
-
-ESP2866 is a fallback option and will be used if the build is for unsupported platform.
-
-#### Connecting the ESP2866 ####
-
-ESP module needs to be connected to RX and TX UART pins (+ power and ground) on your target board. That can be achieved using Grove shield or connected directly using jumper wires, please note that not all Arduino form factor boards have UART compatible with the Grove shiled.
-
-For Grove shield TX has to be connected to D1 and RX to D0.
-
-Make sure that UART module you're connecting ESP to is different than the debug UART connected to your USB port.
-
-## Getting started
-
-1. Import the example
-
- ```
- mbed import mbed-os-example-wifi
- cd mbed-os-example-wifi
- ```
-2. Configure the WiFi credentials
-
- Edit ```mbed_app.json``` to include correct SSID and Password:
-
- ```
- "config": {
- "wifi-ssid": {
- "help": "WiFi SSID",
- "value": "\"SSID\""
- },
- "wifi-password": {
- "help": "WiFi Password",
- "value": "\"Password\""
- }
- },
- ```
-
-3. Compile and generate binary
-
- For example, for `GCC`:
-
- ```
- mbed compile -t GCC_ARM -m UBLOX_EVK_ODIN_W2
- ```
-
-## Documentation ##
-
-More information on the network-socket API can be found in the [mbed handbook](https://docs.mbed.com/docs/mbed-os-api-reference/en/5.2/APIs/communication/network_sockets/).
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cJSON_lib.lib Wed Mar 29 03:14:41 2017 +0000 @@ -0,0 +1,1 @@ +https://developer.mbed.org/users/TaylorGy/code/cJSON_lib/#c809010834e2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/driver_mbed_HP20x.lib Wed Mar 29 03:14:41 2017 +0000 @@ -0,0 +1,1 @@ +https://developer.mbed.org/users/TaylorGy/code/driver_mbed_HP20x/#2ee0bc82e7b8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/driver_mbed_TH02.lib Wed Mar 29 03:14:41 2017 +0000 @@ -0,0 +1,1 @@ +https://developer.mbed.org/users/TaylorGy/code/driver_mbed_TH02/#89151affda00
--- a/esp8266-driver.lib Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -https://github.com/armmbed/esp8266-driver/#4ed87bf7fe37d5ba0de6c4e78868f604a82f8ecb
--- a/esp8266-driver/.git/HEAD Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -ref: refs/heads/master
--- a/esp8266-driver/.git/ORIG_HEAD Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -aabf2bfd8ad215d2080613cfe16a1ade42b65525
--- a/esp8266-driver/.git/config Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - fetch = +refs/heads/*:refs/remotes/origin/* - url = https://github.com/armmbed/esp8266-driver/ -[branch "master"] - remote = origin - merge = refs/heads/master
--- a/esp8266-driver/.git/description Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository.
--- a/esp8266-driver/.git/hooks/applypatch-msg.sample Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message taken by
-# applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit. The hook is
-# allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "applypatch-msg".
-
-. git-sh-setup
-test -x "$GIT_DIR/hooks/commit-msg" &&
- exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
-:
--- a/esp8266-driver/.git/hooks/commit-msg.sample Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message.
-# Called by "git commit" with one argument, the name of the file
-# that has the commit message. The hook should exit with non-zero
-# status after issuing an appropriate message if it wants to stop the
-# commit. The hook is allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "commit-msg".
-
-# Uncomment the below to add a Signed-off-by line to the message.
-# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
-# hook is more suited to it.
-#
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
-
-# This example catches duplicate Signed-off-by lines.
-
-test "" = "$(grep '^Signed-off-by: ' "$1" |
- sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
- echo >&2 Duplicate Signed-off-by lines.
- exit 1
-}
--- a/esp8266-driver/.git/hooks/post-update.sample Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info
--- a/esp8266-driver/.git/hooks/pre-applypatch.sample Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed
-# by applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-applypatch".
-
-. git-sh-setup
-test -x "$GIT_DIR/hooks/pre-commit" &&
- exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
-:
--- a/esp8266-driver/.git/hooks/pre-commit.sample Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 -fi - -# If you want to allow non-ascii filenames set this variable to true. -allownonascii=$(git config hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ascii filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - echo "Error: Attempt to add a non-ascii file name." - echo - echo "This can cause problems if you want to work" - echo "with people on other platforms." - echo - echo "To be portable it is advisable to rename the file ..." - echo - echo "If you know what you are doing you can disable this" - echo "check using:" - echo - echo " git config hooks.allownonascii true" - echo - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against --
--- a/esp8266-driver/.git/hooks/pre-rebase.sample Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006, 2008 Junio C Hamano
-#
-# The "pre-rebase" hook is run just before "git rebase" starts doing
-# its job, and can prevent the command from running by exiting with
-# non-zero status.
-#
-# The hook is called with the following parameters:
-#
-# $1 -- the upstream the series was forked from.
-# $2 -- the branch being rebased (or empty when rebasing the current branch).
-#
-# This sample shows how to prevent topic branches that are already
-# merged to 'next' branch from getting rebased, because allowing it
-# would result in rebasing already published history.
-
-publish=next
-basebranch="$1"
-if test "$#" = 2
-then
- topic="refs/heads/$2"
-else
- topic=`git symbolic-ref HEAD` ||
- exit 0 ;# we do not interrupt rebasing detached HEAD
-fi
-
-case "$topic" in
-refs/heads/??/*)
- ;;
-*)
- exit 0 ;# we do not interrupt others.
- ;;
-esac
-
-# Now we are dealing with a topic branch being rebased
-# on top of master. Is it OK to rebase it?
-
-# Does the topic really exist?
-git show-ref -q "$topic" || {
- echo >&2 "No such branch $topic"
- exit 1
-}
-
-# Is topic fully merged to master?
-not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
-if test -z "$not_in_master"
-then
- echo >&2 "$topic is fully merged to master; better remove it."
- exit 1 ;# we could allow it, but there is no point.
-fi
-
-# Is topic ever merged to next? If so you should not be rebasing it.
-only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
-only_next_2=`git rev-list ^master ${publish} | sort`
-if test "$only_next_1" = "$only_next_2"
-then
- not_in_topic=`git rev-list "^$topic" master`
- if test -z "$not_in_topic"
- then
- echo >&2 "$topic is already up-to-date with master"
- exit 1 ;# we could allow it, but there is no point.
- else
- exit 0
- fi
-else
- not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
- /usr/bin/perl -e '
- my $topic = $ARGV[0];
- my $msg = "* $topic has commits already merged to public branch:\n";
- my (%not_in_next) = map {
- /^([0-9a-f]+) /;
- ($1 => 1);
- } split(/\n/, $ARGV[1]);
- for my $elem (map {
- /^([0-9a-f]+) (.*)$/;
- [$1 => $2];
- } split(/\n/, $ARGV[2])) {
- if (!exists $not_in_next{$elem->[0]}) {
- if ($msg) {
- print STDERR $msg;
- undef $msg;
- }
- print STDERR " $elem->[1]\n";
- }
- }
- ' "$topic" "$not_in_next" "$not_in_master"
- exit 1
-fi
-
-<<\DOC_END
-
-This sample hook safeguards topic branches that have been
-published from being rewound.
-
-The workflow assumed here is:
-
- * Once a topic branch forks from "master", "master" is never
- merged into it again (either directly or indirectly).
-
- * Once a topic branch is fully cooked and merged into "master",
- it is deleted. If you need to build on top of it to correct
- earlier mistakes, a new topic branch is created by forking at
- the tip of the "master". This is not strictly necessary, but
- it makes it easier to keep your history simple.
-
- * Whenever you need to test or publish your changes to topic
- branches, merge them into "next" branch.
-
-The script, being an example, hardcodes the publish branch name
-to be "next", but it is trivial to make it configurable via
-$GIT_DIR/config mechanism.
-
-With this workflow, you would want to know:
-
-(1) ... if a topic branch has ever been merged to "next". Young
- topic branches can have stupid mistakes you would rather
- clean up before publishing, and things that have not been
- merged into other branches can be easily rebased without
- affecting other people. But once it is published, you would
- not want to rewind it.
-
-(2) ... if a topic branch has been fully merged to "master".
- Then you can delete it. More importantly, you should not
- build on top of it -- other people may already want to
- change things related to the topic as patches against your
- "master", so if you need further changes, it is better to
- fork the topic (perhaps with the same name) afresh from the
- tip of "master".
-
-Let's look at this example:
-
- o---o---o---o---o---o---o---o---o---o "next"
- / / / /
- / a---a---b A / /
- / / / /
- / / c---c---c---c B /
- / / / \ /
- / / / b---b C \ /
- / / / / \ /
- ---o---o---o---o---o---o---o---o---o---o---o "master"
-
-
-A, B and C are topic branches.
-
- * A has one fix since it was merged up to "next".
-
- * B has finished. It has been fully merged up to "master" and "next",
- and is ready to be deleted.
-
- * C has not merged to "next" at all.
-
-We would want to allow C to be rebased, refuse A, and encourage
-B to be deleted.
-
-To compute (1):
-
- git rev-list ^master ^topic next
- git rev-list ^master next
-
- if these match, topic has not merged in next at all.
-
-To compute (2):
-
- git rev-list master..topic
-
- if this is empty, it is fully merged to "master".
-
-DOC_END
--- a/esp8266-driver/.git/hooks/prepare-commit-msg.sample Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first comments out the -# "Conflicts:" part of a merge commit. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -case "$2,$3" in - merge,) - /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; - -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$1" ;; - - *) ;; -esac - -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
--- a/esp8266-driver/.git/hooks/update.sample Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to blocks unannotated tags from entering.
-# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
-#
-# To enable this hook, rename this file to "update".
-#
-# Config
-# ------
-# hooks.allowunannotated
-# This boolean sets whether unannotated tags will be allowed into the
-# repository. By default they won't be.
-# hooks.allowdeletetag
-# This boolean sets whether deleting tags will be allowed in the
-# repository. By default they won't be.
-# hooks.allowmodifytag
-# This boolean sets whether a tag may be modified after creation. By default
-# it won't be.
-# hooks.allowdeletebranch
-# This boolean sets whether deleting branches will be allowed in the
-# repository. By default they won't be.
-# hooks.denycreatebranch
-# This boolean sets whether remotely creating branches will be denied
-# in the repository. By default this is allowed.
-#
-
-# --- Command line
-refname="$1"
-oldrev="$2"
-newrev="$3"
-
-# --- Safety check
-if [ -z "$GIT_DIR" ]; then
- echo "Don't run this script from the command line." >&2
- echo " (if you want, you could supply GIT_DIR then run" >&2
- echo " $0 <ref> <oldrev> <newrev>)" >&2
- exit 1
-fi
-
-if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
- echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
- exit 1
-fi
-
-# --- Config
-allowunannotated=$(git config --bool hooks.allowunannotated)
-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
-denycreatebranch=$(git config --bool hooks.denycreatebranch)
-allowdeletetag=$(git config --bool hooks.allowdeletetag)
-allowmodifytag=$(git config --bool hooks.allowmodifytag)
-
-# check for no description
-projectdesc=$(sed -e '1q' "$GIT_DIR/description")
-case "$projectdesc" in
-"Unnamed repository"* | "")
- echo "*** Project description file hasn't been set" >&2
- exit 1
- ;;
-esac
-
-# --- Check types
-# if $newrev is 0000...0000, it's a commit to delete a ref.
-zero="0000000000000000000000000000000000000000"
-if [ "$newrev" = "$zero" ]; then
- newrev_type=delete
-else
- newrev_type=$(git cat-file -t $newrev)
-fi
-
-case "$refname","$newrev_type" in
- refs/tags/*,commit)
- # un-annotated tag
- short_refname=${refname##refs/tags/}
- if [ "$allowunannotated" != "true" ]; then
- echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
- echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
- exit 1
- fi
- ;;
- refs/tags/*,delete)
- # delete tag
- if [ "$allowdeletetag" != "true" ]; then
- echo "*** Deleting a tag is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- refs/tags/*,tag)
- # annotated tag
- if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
- then
- echo "*** Tag '$refname' already exists." >&2
- echo "*** Modifying a tag is not allowed in this repository." >&2
- exit 1
- fi
- ;;
- refs/heads/*,commit)
- # branch
- if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
- echo "*** Creating a branch is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- refs/heads/*,delete)
- # delete branch
- if [ "$allowdeletebranch" != "true" ]; then
- echo "*** Deleting a branch is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- refs/remotes/*,commit)
- # tracking branch
- ;;
- refs/remotes/*,delete)
- # delete tracking branch
- if [ "$allowdeletebranch" != "true" ]; then
- echo "*** Deleting a tracking branch is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- *)
- # Anything else (is there anything else?)
- echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
- exit 1
- ;;
-esac
-
-# --- Finished
-exit 0
Binary file esp8266-driver/.git/index has changed
--- a/esp8266-driver/.git/info/exclude Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -.hg -.git -.svn -.CVS -.cvs -*.orig -.build -.export -.msub -.meta -.ctags* -*.uvproj -*.uvopt -*.project -*.cproject -*.launch -*.ewp -*.eww -Makefile -Debug -*.htm -*.settings -mbed_settings.py -*.py[cod] -# subrepo ignores -ESP8266/ATParser \ No newline at end of file
--- a/esp8266-driver/.git/logs/HEAD Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 aabf2bfd8ad215d2080613cfe16a1ade42b65525 www-data <www-data@developer-sjc-cyan-compiler.local.mbed.org> 1484252191 +0000 clone: from https://github.com/armmbed/esp8266-driver/ -aabf2bfd8ad215d2080613cfe16a1ade42b65525 dc37b65ca877d969aa492f348626df6e1b0b1df0 www-data <www-data@developer-sjc-cyan-compiler.local.mbed.org> 1484252191 +0000 checkout: moving from master to dc37b65ca877d969aa492f348626df6e1b0b1df0 -dc37b65ca877d969aa492f348626df6e1b0b1df0 aabf2bfd8ad215d2080613cfe16a1ade42b65525 www-data <www-data@developer-sjc-cyan-compiler.local.mbed.org> 1484258696 +0000 checkout: moving from dc37b65ca877d969aa492f348626df6e1b0b1df0 to master -aabf2bfd8ad215d2080613cfe16a1ade42b65525 4ed87bf7fe37d5ba0de6c4e78868f604a82f8ecb www-data <www-data@developer-sjc-cyan-compiler.local.mbed.org> 1484258697 +0000 pull origin: Fast-forward
--- a/esp8266-driver/.git/logs/refs/heads/master Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 aabf2bfd8ad215d2080613cfe16a1ade42b65525 www-data <www-data@developer-sjc-cyan-compiler.local.mbed.org> 1484252191 +0000 clone: from https://github.com/armmbed/esp8266-driver/ -aabf2bfd8ad215d2080613cfe16a1ade42b65525 4ed87bf7fe37d5ba0de6c4e78868f604a82f8ecb www-data <www-data@developer-sjc-cyan-compiler.local.mbed.org> 1484258697 +0000 pull origin: Fast-forward
--- a/esp8266-driver/.git/logs/refs/remotes/origin/HEAD Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -0000000000000000000000000000000000000000 aabf2bfd8ad215d2080613cfe16a1ade42b65525 www-data <www-data@developer-sjc-cyan-compiler.local.mbed.org> 1484252191 +0000 clone: from https://github.com/armmbed/esp8266-driver/
Binary file esp8266-driver/.git/objects/07/bcb9b245abc132562d04eda40e8a19f1597603 has changed
Binary file esp8266-driver/.git/objects/09/3cbfaa677ad0f1a8b2e9e71e5eb3c9b59e5c6c has changed
Binary file esp8266-driver/.git/objects/16/80c8292e1addcea4defbe1d2469c4106964e89 has changed
Binary file esp8266-driver/.git/objects/18/7bb094d5f1910589e4bd343db0ce1fa0868c5f has changed
Binary file esp8266-driver/.git/objects/19/6587025cf513267b3951ed7ae861f6b5887854 has changed
Binary file esp8266-driver/.git/objects/19/99dae3ef80f9c4cb363ee01d9696dca1e4ad61 has changed
--- a/esp8266-driver/.git/objects/1c/f9de7a21e429683d2eb0b66fe432ed62076940 Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-xÑJÄ0E}ÎW ûîIÒd">ëL -Òí¤âç[ë ø4áÞÃIë²Ì ¬w½@ÙÖì2æTu4Lät¼.>¹Xuã*×ãHH¦8 Ça@#}6qLÁ:æX°`̦(Þú´VxêÜúz¤Â+·¾4 áiëòÍí,y{t> ÜëAkÑßþ¿ê]¾¤v8]d·ç.0_w`á$Pêº@ë>÷'¼\ÞÈxRêcÔc×àÏHtL½%[&(:Æ´L&}DögõÞokû
\ No newline at end of file
Binary file esp8266-driver/.git/objects/1d/a853686baeb82ad49a3096a35a6039e3784d0f has changed
Binary file esp8266-driver/.git/objects/1f/ebc6b296641ca1db45adc9dbeb6cd07a0c826f has changed
Binary file esp8266-driver/.git/objects/1f/fb7d341d8e640475216fbe547a27a414b6da8c has changed
Binary file esp8266-driver/.git/objects/22/3dd241b1fc8f44dd138118cf6fec74cd1a9bc0 has changed
Binary file esp8266-driver/.git/objects/28/42cffee5a2e5ced2dd2be10ebef3706f615b42 has changed
Binary file esp8266-driver/.git/objects/29/cc547a20c724f7bc42b054348b67bbeaed6b19 has changed
--- a/esp8266-driver/.git/objects/29/d63ae2ee0a233e2fbd9577cdddc7661bb783d1 Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-xm»NÄ0D©óW¢ÞÅv® GZ¡Ý
-møäØ×I´y?$öï QQMsæhÆ®ó<f¨Uý#´è¡ò(ÛFc97BwÒZ
´A"åDSiÉYË
ÖJzßµl;OÒxÞÖJp
ÈzóÇ«ÚÉ%¹½ðLÛÚ8ÿ]ã(µEÝrR¼Æ¦2%knw8ÙÁ¤Lñ\2}t$WcÃ`
p`±Êþ\Ù0xókéà´¬Ât?÷c JwÜjÕbOÊ4A¤B)ã ×.o×¹#÷V{£|0ÖRعH)UÕÅ9H%5fðÛØH¹Äe\z´ÍøåvÕ®xß_$»v
\ No newline at end of file
--- a/esp8266-driver/.git/objects/2b/043ceb297fac4e61b9692b067dc0aa687e908e Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-xOANÃ0äìWìØqÁ
¨ÖÞubØí@û{L%>ÀiwF3³³.k¨ ÌxS33uÆ©I;+µ×Ö"I ©ï¤âò^r¯ Ä 3Ç
-äÔÞÁá¸ßÓd&D=õ^éÑô¼áÎJÛ·º¤ OK¥¦ÓÂ^±Ô6îÝr] ·Êg,·LÛtzFÉAØI#¥p×¢¿úGpf\m·P/À9§\Àç´KÑWCaåÕ¶C~
§Xxf bó6ÕÞ¹~§||GÇþÈîx'v0s{¹T{¸rÃHt X
ógñÕ»}Þ
\ No newline at end of file
Binary file esp8266-driver/.git/objects/2b/ac3dde128ea49dfedcf71a634d278a4d183721 has changed
Binary file esp8266-driver/.git/objects/2c/b42275ecb72337156ccc82bd4b294c76478cc8 has changed
Binary file esp8266-driver/.git/objects/2d/4c36ef2e6528e1c8327babe5bedd834d6e558d has changed
Binary file esp8266-driver/.git/objects/35/4b47b19c9e48a6d2cc99bfb84838355ff8e59b has changed
Binary file esp8266-driver/.git/objects/36/dcaec219088ae255ccd1b63a6bd213ea08b43a has changed
Binary file esp8266-driver/.git/objects/37/084b5e2bef8a8997323b0afb3d664c5143a7ed has changed
--- a/esp8266-driver/.git/objects/3b/6d076031a93285f075bf9342b24b64db0e6082 Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-xANÃ0EY糡Vv ÇlX°qñxÜX$vä¸M{{ °ÿÿ§OiBÕÈ»Á÷Æ6Ò)o´U§,×$)¬Ê ©µnU5cæXÀµE_wÞíXw¦¯
éÑ·%ê©V, q
Ç2¤ aÀ0ÂWIéOëô²LÉñ>åÃ3ȦÕ}£ð(¤Ýü
-ÿ?Y}Ï ; ÖPxý Îà¯"»ÝiDÀèÀ"ý¬7p±Ø0rÙÃ[8ßÂÑ,e+¹ÑGï9³[8 a 8þu
b*0g^¶gî¯kÕ/àçpj
\ No newline at end of file
Binary file esp8266-driver/.git/objects/40/050a429b64dacc27067d0c6f5ec1aa9858cedd has changed
Binary file esp8266-driver/.git/objects/45/0cc128865ffb90b5cbfe5af193621644024fa7 has changed
Binary file esp8266-driver/.git/objects/4a/3f18ae22a0402db6001e0b2145f79693c66a7f has changed
--- a/esp8266-driver/.git/objects/58/8eb441e386da562bc0b29358186a0414b2eb21 Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -x=»N1D©÷+nìõs¥ Hé"(¨¯íkÅÚ#¯E|=nÎHg4>ÏsªÐkùP u÷jà}$- Þ£ 2SÖ0ï]wÇBK= -?ÈàEtEä<£AÙ`¬ ÜxºÃÞr3J#¼c ó¾ nÒ:á~Ò²} |K#¸±L2xd±®µíg¥oÛºÂy«SËÇÒààþàeþrÙÃSMT õÞ[!ôÙÜa¡ >Òkº,m8¢'x¹^º ßoUÍ \ No newline at end of file
Binary file esp8266-driver/.git/objects/58/e9a0ed3ecc7e05ddf9578c6153c2a4882e8484 has changed
--- a/esp8266-driver/.git/objects/60/7744089602deb46784e2f5d7bd815837f65a1f Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-xÐQJÄ0`s¹ÀJ4i "."¸Â4ùkBm³¦SõøvðiæáçûñyÖÝ
T¨½¶¬Q-*ßjÕô®éB«ë`aLÄÅÌL ºÆ©
-µêl«B/{kÔZ!X%ÛÕR¸c.ôKZ8_"
-=»
·qçã¾<¬ ·Ü"¬÷TÕ¶k¤ªLEi¤~?ôÿ ÑlÐ !! ôܽßv~¤ S¿ÁÃ:{Ny&Îôôznµ§yk /}ÄBnG
->×T0]°Å9fðw.ãaÉ~Óñ|¿VÆqy
\ No newline at end of file
Binary file esp8266-driver/.git/objects/63/6af254ddfee68e83cd550e5184e253efa469a0 has changed
--- a/esp8266-driver/.git/objects/63/da515ed94f2f08c3adf90b51458c4891e61347 Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -xÁJÅ0E]÷+æ$¤)(nü N&¶<Úd -~¾õ-Ü»ºwq8 .û¾)¸ ´ÀÉ~ [K..9`H(JMôÙºÏyÍ.Y<e;ÁÙh f:u- Þ׶u-u Ôõg^ïçõTù¦þ$é|5££Gãø úËÿO1á-%IÐÏZKSÈWN=Û± _PåRSJMzÜʽðMô¥êðF_m \ No newline at end of file
Binary file esp8266-driver/.git/objects/69/aa3c94dc3fbc0fa13e539c0e958d787d17c8a6 has changed
Binary file esp8266-driver/.git/objects/6f/c14e3cc6a40c322c8e5c4d8a2e9da552537027 has changed
Binary file esp8266-driver/.git/objects/71/cc5953f21d106855490b4ff1b08472472c3a3d has changed
Binary file esp8266-driver/.git/objects/72/02907f786dec6fedf5618a1df556ebf15679c1 has changed
Binary file esp8266-driver/.git/objects/74/b05f50b0d7e5e40753dceb5b55f44776572277 has changed
Binary file esp8266-driver/.git/objects/76/27ac0bc2f5d7e79d81861e328d7a44757e81d0 has changed
Binary file esp8266-driver/.git/objects/77/d37a0a4d1dcf2348571c8407560f6786e4daf3 has changed
Binary file esp8266-driver/.git/objects/83/1e027303af67fcf6df5adb872b801f6449ee3b has changed
Binary file esp8266-driver/.git/objects/83/76fae074f632e3ca81ce6dfc91944c3cb11847 has changed
Binary file esp8266-driver/.git/objects/85/42c211a5de5eeccef8a9a9997f9321ba6d880c has changed
Binary file esp8266-driver/.git/objects/85/fbaf1da3ed19b09195fcb4138178b5f0f4c2c4 has changed
Binary file esp8266-driver/.git/objects/86/45716bafafd88b0d67b2c3d12b8b8e4bf46a0a has changed
--- a/esp8266-driver/.git/objects/86/ed47c8bf40c86fdc569c7e678a8944f5e01c2a Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-xmÉj1Ds¯hÈÙ4ÒôH`M ñÅä ´´<"³E#çïãßrª¦ëUA¹ibê)'"-SÒ6T[
-Ê([Q ËL°Â#J×p)LK¾M¢1w¢µØ8£ÚÖkÔÆH]!Öè·Ìr ØwÛèV¡'ªUpDÍ(±%W»)Á[⧹£{³äl\w;¶%ÓÙ,kòå¸T %oV «ÜmØÿy_,lÆ)ÑÜÿn1wÅ®/À?±ê@éH0¾D?
Ï !¤iÝça°ä_B<¯¹Óõ¹2Þ'ZªzgãÉôÑÃ×ä¾)ïîÖ¥(4¿·<*`y:
\ No newline at end of file
Binary file esp8266-driver/.git/objects/8a/21294bb1073d2d6804235b6bc6af2fb2d08ce6 has changed
Binary file esp8266-driver/.git/objects/8a/ae3bd490162291eef8d92f0b169b9b8fd706a6 has changed
Binary file esp8266-driver/.git/objects/8b/3302ea06c0f2d012f20563700f48c7d75d4b3c has changed
--- a/esp8266-driver/.git/objects/8d/1823c75c461e49fa7dc8f7cd0bc3a4eb980ef6 Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-xTÛNÛ@í³¿b¾r*BQÃ¥jTH8!¢=vVØ^wwIQûíÙØ\zIðCÙ9sæسDÍ ··»ûÆëlnz° # ÐuTDêvçîx¦%Ftì«ÈBc-`'Âbç2ëóHiH±
-+À.r4GvN)0"
X«;t§w¨TôÚ]t U¾Ð2[h°ÝííT3`f¨u
¨ÁιèVeZðÞnw¡É*ÕØè3öBdÊBa0¤'Þ[F" Jiç®O
Òf«
-Cͬ rAä PÑóB¶"ÍêÎÍ÷;²,ÛÂn+ wå8¦s6<> ù§[Dºzè"KÐÐø½-@äD*3ÚW"J UE¬rV1éRKK i©VÆLCi¬³×õ¤Y5 ÐäÏ h!"ÆÀ¡ß£?ô[ r9| _Làrp~>M§>Ïáx<:NãE`0º/ÃÑI £Ýà}®y¢)YM t>m·RS`ßplr d$- #Äd±ÅrÔ©4lCC¦ÈTZaÝÑ_sq£Þ[I¾.*{Ïg+ÃAb89ôêüÁäp¿
ÌìÎöÔ?pÃ{ðxÓYÁÈ° \sæ|Å þO¾-O
n²íèr?m¡³¾÷s=_4êÎ!&h®o W£>NQº!c´>mn÷ð-CC7L þCôNÉ^À-Gåóí´LT@rt+uô0ÅÔ m²-è¶â½^©Ï#Þ6¹ÐÔ,CÏIÞéлô_"³[r©pß6zsJrE.ã÷kùýz4ÊÒ's÷÷S{Ø²Ò k ¢··cMEÂj"ìà ²÷neÉú
-}Eó®ÅoÜóâ
\ No newline at end of file
--- a/esp8266-driver/.git/objects/8e/0c9a889667fd3a837894a1cace2d8196a691a6 Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-xÑN! E}æ+úNÂ$ÆïÆýJvW 0ÿoݾ´émÏíµËY»ÑÀi©é²ó(b¦-* w´feÑ-Q¯Ðh£A|Ò¤Åuv³á²èÐFJ&¨Y{)³û8×ï{ïð¼OjðÐxÖÛðZb- òtÎý´R
-V9â`à°ËâõqÒ0.[ä r«úñEx=½y(ÄK£»þ ÔõJqtÈ {ÿ- |Í·Õá1o-&hÜ
\ No newline at end of file
Binary file esp8266-driver/.git/objects/8f/231b0645ab4e7081eccc0b3a1bf366c70634e7 has changed
Binary file esp8266-driver/.git/objects/8f/2bc9cd442ea21d44a52c8bab55333c6941fb17 has changed
Binary file esp8266-driver/.git/objects/90/10cd39078cc91486da1d08547eb05660362c2c has changed
Binary file esp8266-driver/.git/objects/94/d0e46f45972aac11ae428b5cc64fe8a4ee6d27 has changed
Binary file esp8266-driver/.git/objects/95/3bb50291cd5a3100d0e45b128a5d266235e24a has changed
Binary file esp8266-driver/.git/objects/95/9c04625282673ad11f65ffd55ed8f97a1a0cea has changed
Binary file esp8266-driver/.git/objects/9d/54161261715aa62843752a37a092b48db56c27 has changed
Binary file esp8266-driver/.git/objects/a0/9061bb1823bd9c729a46cf3b2cd121063a5af1 has changed
Binary file esp8266-driver/.git/objects/a3/b83979ec8272d283fb1a2ad25c9b9e74d9e0cf has changed
Binary file esp8266-driver/.git/objects/a8/b5125912fe6450dcca33fa357ad7b5870cbeab has changed
--- a/esp8266-driver/.git/objects/aa/bf2bfd8ad215d2080613cfe16a1ade42b65525 Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-xmÍNÃ09ç)VâL±ÿJj½ôÒ@k{ÝXà8*¼=¥7N3o4ñSΩB'íC-D`\ñVqÍ%¢jè´l±ÓÈlë N*ßêfÆBc£(íy£bðRY¯IiÆ
-%1î[üã#s䥵ËÎ 8Fã½GF`\«¨4³±ÁµöS×¾¤¥NsO¸Ôl}7»µÒ.
-ë pa:Ý2«<1ÅXãïÃ~ù÷T«í8ïÝ%Õ~uðO¬9Q¹Ìë0@¡Ï
-ÜB,Sýù
g·iðú!|©iö!Àù°; 69ÀõV1|½ýiSÉXÓ4.?Ûs¡
\ No newline at end of file
Binary file esp8266-driver/.git/objects/ad/baed3a1a00735f51ba1e24c38d552a80acd3b8 has changed
Binary file esp8266-driver/.git/objects/b8/8add7ec5d94cae6d187ada1bcb5ab545eb846e has changed
Binary file esp8266-driver/.git/objects/bb/8182f41bb5512e916d29be1c734aa9f1f19d2f has changed
Binary file esp8266-driver/.git/objects/c2/09d637a05d23a7390c41c594867e66cd7a2b61 has changed
Binary file esp8266-driver/.git/objects/c3/0ea2129fa524f9352ef4ec7388986fe0a3513f has changed
--- a/esp8266-driver/.git/objects/cc/460d8d2e1456b3734b3792da65ced4a132800f Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-xPMKÄ0õ_1àyK6I ¸âMAoâ!ÓLl°mJ.ûóM׫'OóÞ|¼÷!̳ÏÐôú&G" V ¾®ÔR×èæ3Úôu£DTZ#²ÕDZÊ!*˵âMmúFtÒq-ÑõM+P´¨Zï3[ C1úÃ:Rgr)Ça¼û-ÓŤìvu«âZ .9gÃ5è¾ÿo öAiíRp²,ÌT¬fp%ZvòË- ;`ápzݹÀÄØËßp1Ì`éìò_¥¢¿ àæ ÅBÎÞ°ÁLá»*ÂK×/ðøöºª{òJpÛ´ ûJê2
\ No newline at end of file
Binary file esp8266-driver/.git/objects/cc/760c5cfd58ef1044951e299f3ade8b9693ca1c has changed
Binary file esp8266-driver/.git/objects/cd/1bf66c5d69ec983c6dee28fc1e321f9f6467ec has changed
--- a/esp8266-driver/.git/objects/d6/fc3baf28fbcb8e58792079af68bcc9c23e1dce Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -xK -Â0@]ç³$c>4 â\ÉÔSÒÒÛ[÷n ¼÷2 -`p©DZLÑXÓÚ¢ÍÑ~Ex äM¯÷SH*6¸Ây âøðüûæÂv\ïG@ë]g¼óÛ5§Uúþþ3-üê:å(ánÂ0·iâ*ÐSViV fð@ \ No newline at end of file
Binary file esp8266-driver/.git/objects/d9/141ca34383010414da53f1ca1b9e63f02d1c9c has changed
Binary file esp8266-driver/.git/objects/d9/566bd8f78b611da45730ac75e7a07eca493a03 has changed
Binary file esp8266-driver/.git/objects/da/dd0c5ed6c6246b0a1d800e832cf49b5ac008ea has changed
Binary file esp8266-driver/.git/objects/db/de089f2f8ca06714f1f9c94212a5cb6d2aad02 has changed
Binary file esp8266-driver/.git/objects/dc/37b65ca877d969aa492f348626df6e1b0b1df0 has changed
Binary file esp8266-driver/.git/objects/dd/16c394cb04f4bbad0e8d2103e5a33ff0e24bf5 has changed
Binary file esp8266-driver/.git/objects/de/b0b90a3ec974c3b1634155711cdd74ed498d2e has changed
--- a/esp8266-driver/.git/objects/e2/1cfb7dc779c8f4eb259d1d2beeb13fd1d18a68 Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -xÁJÅ0E]ç+·JÒ¤I"n]ëL2Z^Ót âß[ýçr÷æVë*0ÎúI:3RR ë Íìva/'p èKpÎêÀλ1²å2ë³ËÉzˬ E =e4ì¼Qø¥uøàãhðwܼ¿4È ½a¯Cnõ̵:Ív µÕZ]éuRøºzßóö [MLÃru? µsív¯ÖïÐyCaå*p?õ³[r \ No newline at end of file
Binary file esp8266-driver/.git/objects/e2/f0dc5443e5a1d9c7ad96f98202c93749158758 has changed
Binary file esp8266-driver/.git/objects/e4/2e2eeb911f57571bf2708fa7a9136f5bb677bb has changed
Binary file esp8266-driver/.git/objects/e4/c54243acb2e7a28d0913dee7ebbe369311e8b3 has changed
--- a/esp8266-driver/.git/objects/ed/2c98d0a9878f01b5a9996497223be7e1361fac Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-x]ÁjÃ@ D{öW äÚÄ´SroΦô¼ÎÊY]kYÉ1ýûnBoÌ<¦Òã{yZ4¿¿v RO~-
-_øB¥9ZF R`uýøÜßß¼c$ñS¤¦Y°ãfWÕ§,có@Þ4£$ð< Th4hpnôWzÒgôU¦8e)æªè.?V³b| þÝW"9yÌla ¹3A§Ë3üÈTÔN ÿÖpÙ÷þàÄ(3¦ìN{Ú"eݶ§ EÉT6×Ê6RNKÚ.ý´3¹½²þºA_ *$
\ No newline at end of file
Binary file esp8266-driver/.git/objects/ee/fdaba7a9dee8e0b7db8b369517b7fe43258fbd has changed
--- a/esp8266-driver/.git/objects/f0/bec599b1539dd61af8ccca0e7a640176f6709f Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-xuÍjÃ0{öSì½`,YÒÊJÚK/í¬þáÊ
-²i¾:õÖ¹ÍÇ ÌØR¬À{ªÅ{L±æI"ŵQr¡ÊrìîTüRA+ïZm¬VÁY©&^¡&= ¤ åÔÑVo¹ÀJõ3|>¨Îy_çÓP^ ýúÇTRosz&ôèáyhêm{«/ðëÛfà°äâïß?ǯXoù§Öëéò~í½e!ÄööârITc^Ö_~ÜT^
\ No newline at end of file
--- a/esp8266-driver/.git/objects/f1/c3f75ad0a80184aa30155e298f07f373a75263 Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-xÍJ1=ç)ú¾ ùéÌõàzpÑ'è$ÙYLZ2Qðí
}UEQ ¥¥Óã]oÌ0eëLÐ8öz2 cÔÁ Ù!F¯Ñmú¢ÆµÝ'tÄYumi?z SJÑ#üäQôÝÏÒàHRç RàáBõrOs¡åó>Jy3x;âh
¶Z«ÍÝ(;ÿ·¯Þ9^i¸Ô$ÃóÇi²ªtX¹&x{ª¿Eåë\cJK¡Öí *·àåtPøcJ
\ No newline at end of file
Binary file esp8266-driver/.git/objects/f3/e3d6d5476b159f82b07d3dec0220e1047bd9b0 has changed
Binary file esp8266-driver/.git/objects/f9/7b41d3f75717a383be2c0410acb3137a725563 has changed
Binary file esp8266-driver/.git/objects/fc/0f1633de1d2b92aacc30e8cbee920f8e495b7f has changed
Binary file esp8266-driver/.git/objects/fd/612d3304a70f928496e13f3a54aba553b0dd9f has changed
--- a/esp8266-driver/.git/packed-refs Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -# pack-refs with: peeled -f0bec599b1539dd61af8ccca0e7a640176f6709f refs/remotes/origin/bulislaw_add_readme -aabf2bfd8ad215d2080613cfe16a1ade42b65525 refs/remotes/origin/master -1999dae3ef80f9c4cb363ee01d9696dca1e4ad61 refs/tags/latest -450cc128865ffb90b5cbfe5af193621644024fa7 refs/tags/v1.0 -29d63ae2ee0a233e2fbd9577cdddc7661bb783d1 refs/tags/v1.1
--- a/esp8266-driver/.git/refs/heads/master Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -4ed87bf7fe37d5ba0de6c4e78868f604a82f8ecb
--- a/esp8266-driver/.git/refs/remotes/origin/HEAD Thu Jan 12 22:05:15 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -ref: refs/remotes/origin/master
--- a/esp8266-driver/ESP8266/ATParser/ATParser.cpp Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,333 +0,0 @@
-/* Copyright (c) 2015 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @section DESCRIPTION
- *
- * Parser for the AT command syntax
- *
- */
-
-#include "ATParser.h"
-#include "mbed_debug.h"
-
-
-// getc/putc handling with timeouts
-int ATParser::putc(char c)
-{
- Timer timer;
- timer.start();
-
- while (true) {
- if (_serial->writeable()) {
- return _serial->putc(c);
- }
- if (timer.read_ms() > _timeout) {
- return -1;
- }
- }
-}
-
-int ATParser::getc()
-{
- Timer timer;
- timer.start();
-
- while (true) {
- if (_serial->readable()) {
- return _serial->getc();
- }
- if (timer.read_ms() > _timeout) {
- return -1;
- }
- }
-}
-
-void ATParser::flush()
-{
- while (_serial->readable()) {
- _serial->getc();
- }
-}
-
-
-// read/write handling with timeouts
-int ATParser::write(const char *data, int size)
-{
- int i = 0;
- for ( ; i < size; i++) {
- if (putc(data[i]) < 0) {
- return -1;
- }
- }
- return i;
-}
-
-int ATParser::read(char *data, int size)
-{
- int i = 0;
- for ( ; i < size; i++) {
- int c = getc();
- if (c < 0) {
- return -1;
- }
- data[i] = c;
- }
- return i;
-}
-
-
-// printf/scanf handling
-int ATParser::vprintf(const char *format, va_list args)
-{
- if (vsprintf(_buffer, format, args) < 0) {
- return false;
- }
- int i = 0;
- for ( ; _buffer[i]; i++) {
- if (putc(_buffer[i]) < 0) {
- return -1;
- }
- }
- return i;
-}
-
-int ATParser::vscanf(const char *format, va_list args)
-{
- // Since format is const, we need to copy it into our buffer to
- // add the line's null terminator and clobber value-matches with asterisks.
- //
- // We just use the beginning of the buffer to avoid unnecessary allocations.
- int i = 0;
- int offset = 0;
-
- while (format[i]) {
- if (format[i] == '%' && format[i+1] != '%' && format[i+1] != '*') {
- _buffer[offset++] = '%';
- _buffer[offset++] = '*';
- i++;
- } else {
- _buffer[offset++] = format[i++];
- }
- }
-
- // Scanf has very poor support for catching errors
- // fortunately, we can abuse the %n specifier to determine
- // if the entire string was matched.
- _buffer[offset++] = '%';
- _buffer[offset++] = 'n';
- _buffer[offset++] = 0;
-
- // To workaround scanf's lack of error reporting, we actually
- // make two passes. One checks the validity with the modified
- // format string that only stores the matched characters (%n).
- // The other reads in the actual matched values.
- //
- // We keep trying the match until we succeed or some other error
- // derails us.
- int j = 0;
-
- while (true) {
- // Ran out of space
- if (j+1 >= _buffer_size - offset) {
- return false;
- }
- // Recieve next character
- int c = getc();
- if (c < 0) {
- return -1;
- }
- _buffer[offset + j++] = c;
- _buffer[offset + j] = 0;
-
- // Check for match
- int count = -1;
- sscanf(_buffer+offset, _buffer, &count);
-
- // We only succeed if all characters in the response are matched
- if (count == j) {
- // Store the found results
- vsscanf(_buffer+offset, format, args);
- return j;
- }
- }
-}
-
-
-// Command parsing with line handling
-bool ATParser::vsend(const char *command, va_list args)
-{
- // Create and send command
- if (vsprintf(_buffer, command, args) < 0) {
- return false;
- }
- for (int i = 0; _buffer[i]; i++) {
- if (putc(_buffer[i]) < 0) {
- return false;
- }
- }
-
- // Finish with newline
- for (int i = 0; _delimiter[i]; i++) {
- if (putc(_delimiter[i]) < 0) {
- return false;
- }
- }
-
- debug_if(dbg_on, "AT> %s\r\n", _buffer);
- return true;
-}
-
-bool ATParser::vrecv(const char *response, va_list args)
-{
- // Iterate through each line in the expected response
- while (response[0]) {
- // Since response is const, we need to copy it into our buffer to
- // add the line's null terminator and clobber value-matches with asterisks.
- //
- // We just use the beginning of the buffer to avoid unnecessary allocations.
- int i = 0;
- int offset = 0;
-
- while (response[i]) {
- if (memcmp(&response[i+1-_delim_size], _delimiter, _delim_size) == 0) {
- i++;
- break;
- } else if (response[i] == '%' && response[i+1] != '%' && response[i+1] != '*') {
- _buffer[offset++] = '%';
- _buffer[offset++] = '*';
- i++;
- } else {
- _buffer[offset++] = response[i++];
- }
- }
-
- // Scanf has very poor support for catching errors
- // fortunately, we can abuse the %n specifier to determine
- // if the entire string was matched.
- _buffer[offset++] = '%';
- _buffer[offset++] = 'n';
- _buffer[offset++] = 0;
-
- // To workaround scanf's lack of error reporting, we actually
- // make two passes. One checks the validity with the modified
- // format string that only stores the matched characters (%n).
- // The other reads in the actual matched values.
- //
- // We keep trying the match until we succeed or some other error
- // derails us.
- int j = 0;
-
- while (true) {
- // Recieve next character
- int c = getc();
- if (c < 0) {
- return false;
- }
- _buffer[offset + j++] = c;
- _buffer[offset + j] = 0;
-
- // Check for oob data
- for (int k = 0; k < _oobs.size(); k++) {
- if (j == _oobs[k].len && memcmp(
- _oobs[k].prefix, _buffer+offset, _oobs[k].len) == 0) {
- debug_if(dbg_on, "AT! %s\r\n", _oobs[k].prefix);
- _oobs[k].cb();
-
- // oob may have corrupted non-reentrant buffer,
- // so we need to set it up again
- return vrecv(response, args);
- }
- }
-
- // Check for match
- int count = -1;
- sscanf(_buffer+offset, _buffer, &count);
-
- // We only succeed if all characters in the response are matched
- if (count == j) {
- debug_if(dbg_on, "AT= %s\r\n", _buffer+offset);
- // Reuse the front end of the buffer
- memcpy(_buffer, response, i);
- _buffer[i] = 0;
-
- // Store the found results
- vsscanf(_buffer+offset, _buffer, args);
-
- // Jump to next line and continue parsing
- response += i;
- break;
- }
-
- // Clear the buffer when we hit a newline or ran out of space
- // running out of space usually means we ran into binary data
- if (j+1 >= _buffer_size - offset ||
- strcmp(&_buffer[offset + j-_delim_size], _delimiter) == 0) {
-
- debug_if(dbg_on, "AT< %s", _buffer+offset);
- j = 0;
- }
- }
- }
-
- return true;
-}
-
-
-// Mapping to vararg functions
-int ATParser::printf(const char *format, ...)
-{
- va_list args;
- va_start(args, format);
- int res = vprintf(format, args);
- va_end(args);
- return res;
-}
-
-int ATParser::scanf(const char *format, ...)
-{
- va_list args;
- va_start(args, format);
- int res = vscanf(format, args);
- va_end(args);
- return res;
-}
-
-bool ATParser::send(const char *command, ...)
-{
- va_list args;
- va_start(args, command);
- bool res = vsend(command, args);
- va_end(args);
- return res;
-}
-
-bool ATParser::recv(const char *response, ...)
-{
- va_list args;
- va_start(args, response);
- bool res = vrecv(response, args);
- va_end(args);
- return res;
-}
-
-
-// oob registration
-void ATParser::oob(const char *prefix, Callback<void()> cb)
-{
- struct oob oob;
- oob.len = strlen(prefix);
- oob.prefix = prefix;
- oob.cb = cb;
- _oobs.push_back(oob);
-}
--- a/esp8266-driver/ESP8266/ATParser/ATParser.h Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,234 +0,0 @@
-/* Copyright (c) 2015 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @section DESCRIPTION
- *
- * Parser for the AT command syntax
- *
- */
-#ifndef AT_PARSER_H
-#define AT_PARSER_H
-
-#include "mbed.h"
-#include <cstdarg>
-#include <vector>
-#include "BufferedSerial.h"
-#include "Callback.h"
-
-
-/**
-* Parser class for parsing AT commands
-*
-* Here are some examples:
-* @code
-* ATParser at = ATParser(serial, "\r\n");
-* int value;
-* char buffer[100];
-*
-* at.send("AT") && at.recv("OK");
-* at.send("AT+CWMODE=%d", 3) && at.recv("OK");
-* at.send("AT+CWMODE?") && at.recv("+CWMODE:%d\r\nOK", &value);
-* at.recv("+IPD,%d:", &value);
-* at.read(buffer, value);
-* at.recv("OK");
-* @endcode
-*/
-class ATParser
-{
-private:
- // Serial information
- BufferedSerial *_serial;
- int _buffer_size;
- char *_buffer;
- int _timeout;
-
- // Parsing information
- const char *_delimiter;
- int _delim_size;
- bool dbg_on;
-
- struct oob {
- unsigned len;
- const char *prefix;
- mbed::Callback<void()> cb;
- };
- std::vector<oob> _oobs;
-
-public:
- /**
- * Constructor
- *
- * @param serial serial interface to use for AT commands
- * @param buffer_size size of internal buffer for transaction
- * @param timeout timeout of the connection
- * @param delimiter string of characters to use as line delimiters
- */
- ATParser(BufferedSerial &serial, const char *delimiter = "\r\n", int buffer_size = 256, int timeout = 8000, bool debug = false) :
- _serial(&serial),
- _buffer_size(buffer_size) {
- _buffer = new char[buffer_size];
- setTimeout(timeout);
- setDelimiter(delimiter);
- debugOn(debug);
- }
-
- /**
- * Destructor
- */
- ~ATParser() {
- delete [] _buffer;
- }
-
- /**
- * Allows timeout to be changed between commands
- *
- * @param timeout timeout of the connection
- */
- void setTimeout(int timeout) {
- _timeout = timeout;
- }
-
- /**
- * Sets string of characters to use as line delimiters
- *
- * @param delimiter string of characters to use as line delimiters
- */
- void setDelimiter(const char *delimiter) {
- _delimiter = delimiter;
- _delim_size = strlen(delimiter);
- }
-
- /**
- * Allows echo to be on or off
- *
- * @param echo 1 for echo and 0 turns it off
- */
- void debugOn(uint8_t on) {
- dbg_on = (on) ? 1 : 0;
- }
-
- /**
- * Sends an AT command
- *
- * Sends a formatted command using printf style formatting
- * @see ::printf
- *
- * @param command printf-like format string of command to send which
- * is appended with the specified delimiter
- * @param ... all printf-like arguments to insert into command
- * @return true only if command is successfully sent
- */
- bool send(const char *command, ...);
- bool vsend(const char *command, va_list args);
-
- /**
- * Recieve an AT response
- *
- * Recieves a formatted response using scanf style formatting
- * @see ::scanf
- *
- * Responses are parsed line at a time using the specified delimiter.
- * Any recieved data that does not match the response is ignored until
- * a timeout occurs.
- *
- * @param response scanf-like format string of response to expect
- * @param ... all scanf-like arguments to extract from response
- * @return true only if response is successfully matched
- */
- bool recv(const char *response, ...);
- bool vrecv(const char *response, va_list args);
-
- /**
- * Write a single byte to the underlying stream
- *
- * @param c The byte to write
- * @return The byte that was written or -1 during a timeout
- */
- int putc(char c);
-
- /**
- * Get a single byte from the underlying stream
- *
- * @return The byte that was read or -1 during a timeout
- */
- int getc();
-
- /**
- * Write an array of bytes to the underlying stream
- *
- * @param data the array of bytes to write
- * @param size number of bytes to write
- * @return number of bytes written or -1 on failure
- */
- int write(const char *data, int size);
-
- /**
- * Read an array of bytes from the underlying stream
- *
- * @param data the destination for the read bytes
- * @param size number of bytes to read
- * @return number of bytes read or -1 on failure
- */
- int read(char *data, int size);
-
- /**
- * Direct printf to underlying stream
- * @see ::printf
- *
- * @param format format string to pass to printf
- * @param ... arguments to printf
- * @return number of bytes written or -1 on failure
- */
- int printf(const char *format, ...);
- int vprintf(const char *format, va_list args);
-
- /**
- * Direct scanf on underlying stream
- * @see ::scanf
- *
- * @param format format string to pass to scanf
- * @param ... arguments to scanf
- * @return number of bytes read or -1 on failure
- */
- int scanf(const char *format, ...);
- int vscanf(const char *format, va_list args);
-
- /**
- * Attach a callback for out-of-band data
- *
- * @param prefix string on when to initiate callback
- * @param func callback to call when string is read
- * @note out-of-band data is only processed during a scanf call
- */
- void oob(const char *prefix, mbed::Callback<void()> func);
-
- /**
- * Attach a callback for out-of-band data
- *
- * @param prefix string on when to initiate callback
- * @param obj pointer to object to call member function on
- * @param method callback to call when string is read
- * @note out-of-band data is only processed during a scanf call
- */
- template <typename T, typename M>
- void oob(const char *prefix, T *obj, M method) {
- return oob(prefix, mbed::Callback<void()>(obj, method));
- }
-
- /**
- * Flushes the underlying stream
- */
- void flush();
-};
-#endif
--- a/esp8266-driver/ESP8266/ATParser/BufferedSerial/Buffer/MyBuffer.cpp Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-
-/**
- * @file Buffer.cpp
- * @brief Software Buffer - Templated Ring Buffer for most data types
- * @author sam grove
- * @version 1.0
- * @see
- *
- * Copyright (c) 2013
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "MyBuffer.h"
-
-template <class T>
-MyBuffer<T>::MyBuffer(uint32_t size)
-{
- _buf = new T [size];
- _size = size;
- clear();
-
- return;
-}
-
-template <class T>
-MyBuffer<T>::~MyBuffer()
-{
- delete [] _buf;
-
- return;
-}
-
-template <class T>
-uint32_t MyBuffer<T>::getSize()
-{
- return this->_size;
-}
-
-template <class T>
-void MyBuffer<T>::clear(void)
-{
- _wloc = 0;
- _rloc = 0;
- memset(_buf, 0, _size);
-
- return;
-}
-
-template <class T>
-uint32_t MyBuffer<T>::peek(char c)
-{
- return 1;
-}
-
-// make the linker aware of some possible types
-template class MyBuffer<uint8_t>;
-template class MyBuffer<int8_t>;
-template class MyBuffer<uint16_t>;
-template class MyBuffer<int16_t>;
-template class MyBuffer<uint32_t>;
-template class MyBuffer<int32_t>;
-template class MyBuffer<uint64_t>;
-template class MyBuffer<int64_t>;
-template class MyBuffer<char>;
-template class MyBuffer<wchar_t>;
--- a/esp8266-driver/ESP8266/ATParser/BufferedSerial/Buffer/MyBuffer.h Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-
-/**
- * @file Buffer.h
- * @brief Software Buffer - Templated Ring Buffer for most data types
- * @author sam grove
- * @version 1.0
- * @see
- *
- * Copyright (c) 2013
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MYBUFFER_H
-#define MYBUFFER_H
-
-#include <stdint.h>
-#include <string.h>
-
-/** A templated software ring buffer
- *
- * Example:
- * @code
- * #include "mbed.h"
- * #include "MyBuffer.h"
- *
- * MyBuffer <char> buf;
- *
- * int main()
- * {
- * buf = 'a';
- * buf.put('b');
- * char *head = buf.head();
- * puts(head);
- *
- * char whats_in_there[2] = {0};
- * int pos = 0;
- *
- * while(buf.available())
- * {
- * whats_in_there[pos++] = buf;
- * }
- * printf("%c %c\n", whats_in_there[0], whats_in_there[1]);
- * buf.clear();
- * error("done\n\n\n");
- * }
- * @endcode
- */
-
-template <typename T>
-class MyBuffer
-{
-private:
- T *_buf;
- volatile uint32_t _wloc;
- volatile uint32_t _rloc;
- uint32_t _size;
-
-public:
- /** Create a Buffer and allocate memory for it
- * @param size The size of the buffer
- */
- MyBuffer(uint32_t size = 0x100);
-
- /** Get the size of the ring buffer
- * @return the size of the ring buffer
- */
- uint32_t getSize();
-
- /** Destry a Buffer and release it's allocated memory
- */
- ~MyBuffer();
-
- /** Add a data element into the buffer
- * @param data Something to add to the buffer
- */
- void put(T data);
-
- /** Remove a data element from the buffer
- * @return Pull the oldest element from the buffer
- */
- T get(void);
-
- /** Get the address to the head of the buffer
- * @return The address of element 0 in the buffer
- */
- T *head(void);
-
- /** Reset the buffer to 0. Useful if using head() to parse packeted data
- */
- void clear(void);
-
- /** Determine if anything is readable in the buffer
- * @return 1 if something can be read, 0 otherwise
- */
- uint32_t available(void);
-
- /** Overloaded operator for writing to the buffer
- * @param data Something to put in the buffer
- * @return
- */
- MyBuffer &operator= (T data)
- {
- put(data);
- return *this;
- }
-
- /** Overloaded operator for reading from the buffer
- * @return Pull the oldest element from the buffer
- */
- operator int(void)
- {
- return get();
- }
-
- uint32_t peek(char c);
-
-};
-
-template <class T>
-inline void MyBuffer<T>::put(T data)
-{
- _buf[_wloc++] = data;
- _wloc %= (_size-1);
-
- return;
-}
-
-template <class T>
-inline T MyBuffer<T>::get(void)
-{
- T data_pos = _buf[_rloc++];
- _rloc %= (_size-1);
-
- return data_pos;
-}
-
-template <class T>
-inline T *MyBuffer<T>::head(void)
-{
- T *data_pos = &_buf[0];
-
- return data_pos;
-}
-
-template <class T>
-inline uint32_t MyBuffer<T>::available(void)
-{
- return (_wloc == _rloc) ? 0 : 1;
-}
-
-#endif
-
--- a/esp8266-driver/ESP8266/ATParser/BufferedSerial/BufferedPrint.c Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2014-2015 ARM Limited. All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
- * Licensed under the Apache License, Version 2.0 (the License); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "mbed_error.h"
-
-size_t BufferedSerialThunk(void *buf_serial, const void *s, size_t length);
-
-int BufferedPrintfC(void *stream, int size, const char* format, va_list arg)
-{
- int r;
- char buffer[512];
- if (size >= 512) {
- return -1;
- }
- memset(buffer, 0, size);
- r = vsprintf(buffer, format, arg);
- // this may not hit the heap but should alert the user anyways
- if(r > (int32_t) size) {
- error("%s %d buffer overwrite (max_buf_size: %d exceeded: %d)!\r\n", __FILE__, __LINE__, size, r);
- return 0;
- }
- if ( r > 0 ) {
- BufferedSerialThunk(stream, buffer, r);
- }
- return r;
-}
--- a/esp8266-driver/ESP8266/ATParser/BufferedSerial/BufferedSerial.cpp Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-/**
- * @file BufferedSerial.cpp
- * @brief Software Buffer - Extends mbed Serial functionallity adding irq driven TX and RX
- * @author sam grove
- * @version 1.0
- * @see
- *
- * Copyright (c) 2013
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "BufferedSerial.h"
-#include <stdarg.h>
-
-extern "C" int BufferedPrintfC(void *stream, int size, const char* format, va_list arg);
-
-BufferedSerial::BufferedSerial(PinName tx, PinName rx, uint32_t buf_size, uint32_t tx_multiple, const char* name)
- : RawSerial(tx, rx) , _rxbuf(buf_size), _txbuf((uint32_t)(tx_multiple*buf_size))
-{
- RawSerial::attach(this, &BufferedSerial::rxIrq, Serial::RxIrq);
- this->_buf_size = buf_size;
- this->_tx_multiple = tx_multiple;
- return;
-}
-
-BufferedSerial::~BufferedSerial(void)
-{
- RawSerial::attach(NULL, RawSerial::RxIrq);
- RawSerial::attach(NULL, RawSerial::TxIrq);
-
- return;
-}
-
-int BufferedSerial::readable(void)
-{
- return _rxbuf.available(); // note: look if things are in the buffer
-}
-
-int BufferedSerial::writeable(void)
-{
- return 1; // buffer allows overwriting by design, always true
-}
-
-int BufferedSerial::getc(void)
-{
- return _rxbuf;
-}
-
-int BufferedSerial::putc(int c)
-{
- _txbuf = (char)c;
- BufferedSerial::prime();
-
- return c;
-}
-
-int BufferedSerial::puts(const char *s)
-{
- if (s != NULL) {
- const char* ptr = s;
-
- while(*(ptr) != 0) {
- _txbuf = *(ptr++);
- }
- _txbuf = '\n'; // done per puts definition
- BufferedSerial::prime();
-
- return (ptr - s) + 1;
- }
- return 0;
-}
-
-extern "C" size_t BufferedSerialThunk(void *buf_serial, const void *s, size_t length)
-{
- BufferedSerial *buffered_serial = (BufferedSerial *)buf_serial;
- return buffered_serial->write(s, length);
-}
-
-int BufferedSerial::printf(const char* format, ...)
-{
- va_list arg;
- va_start(arg, format);
- int r = BufferedPrintfC((void*)this, this->_buf_size, format, arg);
- va_end(arg);
- return r;
-}
-
-ssize_t BufferedSerial::write(const void *s, size_t length)
-{
- if (s != NULL && length > 0) {
- const char* ptr = (const char*)s;
- const char* end = ptr + length;
-
- while (ptr != end) {
- _txbuf = *(ptr++);
- }
- BufferedSerial::prime();
-
- return ptr - (const char*)s;
- }
- return 0;
-}
-
-
-void BufferedSerial::rxIrq(void)
-{
- // read from the peripheral and make sure something is available
- if(serial_readable(&_serial)) {
- _rxbuf = serial_getc(&_serial); // if so load them into a buffer
- // trigger callback if necessary
- if (_cbs[RxIrq]) {
- _cbs[RxIrq]();
- }
- }
-
- return;
-}
-
-void BufferedSerial::txIrq(void)
-{
- // see if there is room in the hardware fifo and if something is in the software fifo
- while(serial_writable(&_serial)) {
- if(_txbuf.available()) {
- serial_putc(&_serial, (int)_txbuf.get());
- } else {
- // disable the TX interrupt when there is nothing left to send
- RawSerial::attach(NULL, RawSerial::TxIrq);
- // trigger callback if necessary
- if (_cbs[TxIrq]) {
- _cbs[TxIrq]();
- }
- break;
- }
- }
-
- return;
-}
-
-void BufferedSerial::prime(void)
-{
- // if already busy then the irq will pick this up
- if(serial_writable(&_serial)) {
- RawSerial::attach(NULL, RawSerial::TxIrq); // make sure not to cause contention in the irq
- BufferedSerial::txIrq(); // only write to hardware in one place
- RawSerial::attach(this, &BufferedSerial::txIrq, RawSerial::TxIrq);
- }
-
- return;
-}
-
-void BufferedSerial::attach(Callback<void()> func, IrqType type)
-{
- _cbs[type] = func;
-}
-
--- a/esp8266-driver/ESP8266/ATParser/BufferedSerial/BufferedSerial.h Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-
-/**
- * @file BufferedSerial.h
- * @brief Software Buffer - Extends mbed Serial functionallity adding irq driven TX and RX
- * @author sam grove
- * @version 1.0
- * @see
- *
- * Copyright (c) 2013
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BUFFEREDSERIAL_H
-#define BUFFEREDSERIAL_H
-
-#include "mbed.h"
-#include "MyBuffer.h"
-
-/** A serial port (UART) for communication with other serial devices
- *
- * Can be used for Full Duplex communication, or Simplex by specifying
- * one pin as NC (Not Connected)
- *
- * Example:
- * @code
- * #include "mbed.h"
- * #include "BufferedSerial.h"
- *
- * BufferedSerial pc(USBTX, USBRX);
- *
- * int main()
- * {
- * while(1)
- * {
- * Timer s;
- *
- * s.start();
- * pc.printf("Hello World - buffered\n");
- * int buffered_time = s.read_us();
- * wait(0.1f); // give time for the buffer to empty
- *
- * s.reset();
- * printf("Hello World - blocking\n");
- * int polled_time = s.read_us();
- * s.stop();
- * wait(0.1f); // give time for the buffer to empty
- *
- * pc.printf("printf buffered took %d us\n", buffered_time);
- * pc.printf("printf blocking took %d us\n", polled_time);
- * wait(0.5f);
- * }
- * }
- * @endcode
- */
-
-/**
- * @class BufferedSerial
- * @brief Software buffers and interrupt driven tx and rx for Serial
- */
-class BufferedSerial : public RawSerial
-{
-private:
- MyBuffer <char> _rxbuf;
- MyBuffer <char> _txbuf;
- uint32_t _buf_size;
- uint32_t _tx_multiple;
-
- void rxIrq(void);
- void txIrq(void);
- void prime(void);
-
- Callback<void()> _cbs[2];
-
-public:
- /** Create a BufferedSerial port, connected to the specified transmit and receive pins
- * @param tx Transmit pin
- * @param rx Receive pin
- * @param buf_size printf() buffer size
- * @param tx_multiple amount of max printf() present in the internal ring buffer at one time
- * @param name optional name
- * @note Either tx or rx may be specified as NC if unused
- */
- BufferedSerial(PinName tx, PinName rx, uint32_t buf_size = 256, uint32_t tx_multiple = 4,const char* name=NULL);
-
- /** Destroy a BufferedSerial port
- */
- virtual ~BufferedSerial(void);
-
- /** Check on how many bytes are in the rx buffer
- * @return 1 if something exists, 0 otherwise
- */
- virtual int readable(void);
-
- /** Check to see if the tx buffer has room
- * @return 1 always has room and can overwrite previous content if too small / slow
- */
- virtual int writeable(void);
-
- /** Get a single byte from the BufferedSerial Port.
- * Should check readable() before calling this.
- * @return A byte that came in on the Serial Port
- */
- virtual int getc(void);
-
- /** Write a single byte to the BufferedSerial Port.
- * @param c The byte to write to the Serial Port
- * @return The byte that was written to the Serial Port Buffer
- */
- virtual int putc(int c);
-
- /** Write a string to the BufferedSerial Port. Must be NULL terminated
- * @param s The string to write to the Serial Port
- * @return The number of bytes written to the Serial Port Buffer
- */
- virtual int puts(const char *s);
-
- /** Write a formatted string to the BufferedSerial Port.
- * @param format The string + format specifiers to write to the Serial Port
- * @return The number of bytes written to the Serial Port Buffer
- */
- virtual int printf(const char* format, ...);
-
- /** Write data to the Buffered Serial Port
- * @param s A pointer to data to send
- * @param length The amount of data being pointed to
- * @return The number of bytes written to the Serial Port Buffer
- */
- virtual ssize_t write(const void *s, std::size_t length);
-
- /** Attach a function to call whenever a serial interrupt is generated
- * @param func A pointer to a void function, or 0 to set as none
- * @param type Which serial interrupt to attach the member function to (Serial::RxIrq for receive, TxIrq for transmit buffer empty)
- */
- virtual void attach(Callback<void()> func, IrqType type=RxIrq);
-
- /** Attach a member function to call whenever a serial interrupt is generated
- * @param obj pointer to the object to call the member function on
- * @param method pointer to the member function to call
- * @param type Which serial interrupt to attach the member function to (Serial::RxIrq for receive, TxIrq for transmit buffer empty)
- */
- template <typename T>
- void attach(T *obj, void (T::*method)(), IrqType type=RxIrq) {
- attach(Callback<void()>(obj, method), type);
- }
-
- /** Attach a member function to call whenever a serial interrupt is generated
- * @param obj pointer to the object to call the member function on
- * @param method pointer to the member function to call
- * @param type Which serial interrupt to attach the member function to (Serial::RxIrq for receive, TxIrq for transmit buffer empty)
- */
- template <typename T>
- void attach(T *obj, void (*method)(T*), IrqType type=RxIrq) {
- attach(Callback<void()>(obj, method), type);
- }
-};
-
-#endif
--- a/esp8266-driver/ESP8266/ESP8266.cpp Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,306 +0,0 @@
-/* ESP8266 Example
- * Copyright (c) 2015 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "ESP8266.h"
-
-ESP8266::ESP8266(PinName tx, PinName rx, bool debug)
- : _serial(tx, rx, 1024), _parser(_serial)
- , _packets(0), _packets_end(&_packets)
-{
- _serial.baud(115200);
- _parser.debugOn(debug);
-}
-
-bool ESP8266::startup(int mode)
-{
- //only 3 valid modes
- if(mode < 1 || mode > 3) {
- return false;
- }
-
- bool success = reset()
- && _parser.send("AT+CWMODE=%d", mode)
- && _parser.recv("OK")
- && _parser.send("AT+CIPMUX=1")
- && _parser.recv("OK");
-
- _parser.oob("+IPD", this, &ESP8266::_packet_handler);
-
- return success;
-}
-
-bool ESP8266::reset(void)
-{
- for (int i = 0; i < 2; i++) {
- if (_parser.send("AT+RST")
- && _parser.recv("OK\r\nready")) {
- return true;
- }
- }
-
- return false;
-}
-
-bool ESP8266::dhcp(bool enabled, int mode)
-{
- //only 3 valid modes
- if(mode < 0 || mode > 2) {
- return false;
- }
-
- return _parser.send("AT+CWDHCP=%d,%d", enabled?1:0, mode)
- && _parser.recv("OK");
-}
-
-bool ESP8266::connect(const char *ap, const char *passPhrase)
-{
- return _parser.send("AT+CWJAP=\"%s\",\"%s\"", ap, passPhrase)
- && _parser.recv("OK");
-}
-
-bool ESP8266::disconnect(void)
-{
- return _parser.send("AT+CWQAP") && _parser.recv("OK");
-}
-
-const char *ESP8266::getIPAddress(void)
-{
- if (!(_parser.send("AT+CIFSR")
- && _parser.recv("+CIFSR:STAIP,\"%15[^\"]\"", _ip_buffer)
- && _parser.recv("OK"))) {
- return 0;
- }
-
- return _ip_buffer;
-}
-
-const char *ESP8266::getMACAddress(void)
-{
- if (!(_parser.send("AT+CIFSR")
- && _parser.recv("+CIFSR:STAMAC,\"%17[^\"]\"", _mac_buffer)
- && _parser.recv("OK"))) {
- return 0;
- }
-
- return _mac_buffer;
-}
-
-const char *ESP8266::getGateway()
-{
- if (!(_parser.send("AT+CIPSTA?")
- && _parser.recv("+CIPSTA:gateway:\"%15[^\"]\"", _gateway_buffer)
- && _parser.recv("OK"))) {
- return 0;
- }
-
- return _gateway_buffer;
-}
-
-const char *ESP8266::getNetmask()
-{
- if (!(_parser.send("AT+CIPSTA?")
- && _parser.recv("+CIPSTA:netmask:\"%15[^\"]\"", _netmask_buffer)
- && _parser.recv("OK"))) {
- return 0;
- }
-
- return _netmask_buffer;
-}
-
-int8_t ESP8266::getRSSI()
-{
- int8_t rssi;
- char bssid[18];
-
- if (!(_parser.send("AT+CWJAP?")
- && _parser.recv("+CWJAP:\"%*[^\"]\",\"%17[^\"]\"", bssid)
- && _parser.recv("OK"))) {
- return 0;
- }
-
- if (!(_parser.send("AT+CWLAP=\"\",\"%s\",", bssid)
- && _parser.recv("+CWLAP:(%*d,\"%*[^\"]\",%hhd,", &rssi)
- && _parser.recv("OK"))) {
- return 0;
- }
-
- return rssi;
-}
-
-bool ESP8266::isConnected(void)
-{
- return getIPAddress() != 0;
-}
-
-int ESP8266::scan(WiFiAccessPoint *res, unsigned limit)
-{
- unsigned cnt = 0;
- nsapi_wifi_ap_t ap;
-
- if (!_parser.send("AT+CWLAP")) {
- return NSAPI_ERROR_DEVICE_ERROR;
- }
-
- while (recv_ap(&ap)) {
- if (cnt < limit) {
- res[cnt] = WiFiAccessPoint(ap);
- }
-
- cnt++;
- if (limit != 0 && cnt >= limit) {
- break;
- }
- }
-
- return cnt;
-}
-
-bool ESP8266::open(const char *type, int id, const char* addr, int port)
-{
- //IDs only 0-4
- if(id > 4) {
- return false;
- }
-
- return _parser.send("AT+CIPSTART=%d,\"%s\",\"%s\",%d", id, type, addr, port)
- && _parser.recv("OK");
-}
-
-bool ESP8266::send(int id, const void *data, uint32_t amount)
-{
- //May take a second try if device is busy
- for (unsigned i = 0; i < 2; i++) {
- if (_parser.send("AT+CIPSEND=%d,%d", id, amount)
- && _parser.recv(">")
- && _parser.write((char*)data, (int)amount) >= 0) {
- return true;
- }
- }
-
- return false;
-}
-
-void ESP8266::_packet_handler()
-{
- int id;
- uint32_t amount;
-
- // parse out the packet
- if (!_parser.recv(",%d,%d:", &id, &amount)) {
- return;
- }
-
- struct packet *packet = (struct packet*)malloc(
- sizeof(struct packet) + amount);
- if (!packet) {
- return;
- }
-
- packet->id = id;
- packet->len = amount;
- packet->next = 0;
-
- if (!(_parser.read((char*)(packet + 1), amount))) {
- free(packet);
- return;
- }
-
- // append to packet list
- *_packets_end = packet;
- _packets_end = &packet->next;
-}
-
-int32_t ESP8266::recv(int id, void *data, uint32_t amount)
-{
- while (true) {
- // check if any packets are ready for us
- for (struct packet **p = &_packets; *p; p = &(*p)->next) {
- if ((*p)->id == id) {
- struct packet *q = *p;
-
- if (q->len <= amount) { // Return and remove full packet
- memcpy(data, q+1, q->len);
-
- if (_packets_end == &(*p)->next) {
- _packets_end = p;
- }
- *p = (*p)->next;
-
- uint32_t len = q->len;
- free(q);
- return len;
- } else { // return only partial packet
- memcpy(data, q+1, amount);
-
- q->len -= amount;
- memmove(q+1, (uint8_t*)(q+1) + amount, q->len);
-
- return amount;
- }
- }
- }
-
- // Wait for inbound packet
- if (!_parser.recv("OK")) {
- return -1;
- }
- }
-}
-
-bool ESP8266::close(int id)
-{
- //May take a second try if device is busy
- for (unsigned i = 0; i < 2; i++) {
- if (_parser.send("AT+CIPCLOSE=%d", id)
- && _parser.recv("OK")) {
- return true;
- }
- }
-
- return false;
-}
-
-void ESP8266::setTimeout(uint32_t timeout_ms)
-{
- _parser.setTimeout(timeout_ms);
-}
-
-bool ESP8266::readable()
-{
- return _serial.readable();
-}
-
-bool ESP8266::writeable()
-{
- return _serial.writeable();
-}
-
-void ESP8266::attach(Callback<void()> func)
-{
- _serial.attach(func);
-}
-
-bool ESP8266::recv_ap(nsapi_wifi_ap_t *ap)
-{
- int sec;
- bool ret = _parser.recv("+CWLAP:(%d,\"%32[^\"]\",%hhd,\"%hhx:%hhx:%hhx:%hhx:%hhx:%hhx\",%d", &sec, ap->ssid,
- &ap->rssi, &ap->bssid[0], &ap->bssid[1], &ap->bssid[2], &ap->bssid[3], &ap->bssid[4],
- &ap->bssid[5], &ap->channel);
-
- ap->security = sec < 5 ? (nsapi_security_t)sec : NSAPI_SECURITY_UNKNOWN;
-
- return ret;
-}
--- a/esp8266-driver/ESP8266/ESP8266.h Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-/* ESP8266Interface Example
- * Copyright (c) 2015 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ESP8266_H
-#define ESP8266_H
-
-#include "ATParser.h"
-
-/** ESP8266Interface class.
- This is an interface to a ESP8266 radio.
- */
-class ESP8266
-{
-public:
- ESP8266(PinName tx, PinName rx, bool debug=false);
-
- /**
- * Startup the ESP8266
- *
- * @param mode mode of WIFI 1-client, 2-host, 3-both
- * @return true only if ESP8266 was setup correctly
- */
- bool startup(int mode);
-
- /**
- * Reset ESP8266
- *
- * @return true only if ESP8266 resets successfully
- */
- bool reset(void);
-
- /**
- * Enable/Disable DHCP
- *
- * @param enabled DHCP enabled when true
- * @param mode mode of DHCP 0-softAP, 1-station, 2-both
- * @return true only if ESP8266 enables/disables DHCP successfully
- */
- bool dhcp(bool enabled, int mode);
-
- /**
- * Connect ESP8266 to AP
- *
- * @param ap the name of the AP
- * @param passPhrase the password of AP
- * @return true only if ESP8266 is connected successfully
- */
- bool connect(const char *ap, const char *passPhrase);
-
- /**
- * Disconnect ESP8266 from AP
- *
- * @return true only if ESP8266 is disconnected successfully
- */
- bool disconnect(void);
-
- /**
- * Get the IP address of ESP8266
- *
- * @return null-teriminated IP address or null if no IP address is assigned
- */
- const char *getIPAddress(void);
-
- /**
- * Get the MAC address of ESP8266
- *
- * @return null-terminated MAC address or null if no MAC address is assigned
- */
- const char *getMACAddress(void);
-
- /** Get the local gateway
- *
- * @return Null-terminated representation of the local gateway
- * or null if no network mask has been recieved
- */
- const char *getGateway();
-
- /** Get the local network mask
- *
- * @return Null-terminated representation of the local network mask
- * or null if no network mask has been recieved
- */
- const char *getNetmask();
-
- /* Return RSSI for active connection
- *
- * @return Measured RSSI
- */
- int8_t getRSSI();
-
- /**
- * Check if ESP8266 is conenected
- *
- * @return true only if the chip has an IP address
- */
- bool isConnected(void);
-
- /** Scan for available networks
- *
- * @param ap Pointer to allocated array to store discovered AP
- * @param limit Size of allocated @a res array, or 0 to only count available AP
- * @return Number of entries in @a res, or if @a count was 0 number of available networks, negative on error
- * see @a nsapi_error
- */
- int scan(WiFiAccessPoint *res, unsigned limit);
-
- /**
- * Open a socketed connection
- *
- * @param type the type of socket to open "UDP" or "TCP"
- * @param id id to give the new socket, valid 0-4
- * @param port port to open connection with
- * @param addr the IP address of the destination
- * @return true only if socket opened successfully
- */
- bool open(const char *type, int id, const char* addr, int port);
-
- /**
- * Sends data to an open socket
- *
- * @param id id of socket to send to
- * @param data data to be sent
- * @param amount amount of data to be sent - max 1024
- * @return true only if data sent successfully
- */
- bool send(int id, const void *data, uint32_t amount);
-
- /**
- * Receives data from an open socket
- *
- * @param id id to receive from
- * @param data placeholder for returned information
- * @param amount number of bytes to be received
- * @return the number of bytes received
- */
- int32_t recv(int id, void *data, uint32_t amount);
-
- /**
- * Closes a socket
- *
- * @param id id of socket to close, valid only 0-4
- * @return true only if socket is closed successfully
- */
- bool close(int id);
-
- /**
- * Allows timeout to be changed between commands
- *
- * @param timeout_ms timeout of the connection
- */
- void setTimeout(uint32_t timeout_ms);
-
- /**
- * Checks if data is available
- */
- bool readable();
-
- /**
- * Checks if data can be written
- */
- bool writeable();
-
- /**
- * Attach a function to call whenever network state has changed
- *
- * @param func A pointer to a void function, or 0 to set as none
- */
- void attach(Callback<void()> func);
-
- /**
- * Attach a function to call whenever network state has changed
- *
- * @param obj pointer to the object to call the member function on
- * @param method pointer to the member function to call
- */
- template <typename T, typename M>
- void attach(T *obj, M method) {
- attach(Callback<void()>(obj, method));
- }
-
-private:
- BufferedSerial _serial;
- ATParser _parser;
-
- struct packet {
- struct packet *next;
- int id;
- uint32_t len;
- // data follows
- } *_packets, **_packets_end;
- void _packet_handler();
- bool recv_ap(nsapi_wifi_ap_t *ap);
-
- char _ip_buffer[16];
- char _gateway_buffer[16];
- char _netmask_buffer[16];
- char _mac_buffer[18];
-};
-
-#endif
--- a/esp8266-driver/ESP8266Interface.cpp Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +0,0 @@
-/* ESP8266 implementation of NetworkInterfaceAPI
- * Copyright (c) 2015 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <string.h>
-#include "ESP8266Interface.h"
-
-// Various timeouts for different ESP8266 operations
-#define ESP8266_CONNECT_TIMEOUT 15000
-#define ESP8266_SEND_TIMEOUT 500
-#define ESP8266_RECV_TIMEOUT 0
-#define ESP8266_MISC_TIMEOUT 500
-
-// ESP8266Interface implementation
-ESP8266Interface::ESP8266Interface(PinName tx, PinName rx, bool debug)
- : _esp(tx, rx, debug)
-{
- memset(_ids, 0, sizeof(_ids));
- memset(_cbs, 0, sizeof(_cbs));
-
- _esp.attach(this, &ESP8266Interface::event);
-}
-
-int ESP8266Interface::connect(const char *ssid, const char *pass, nsapi_security_t security,
- uint8_t channel)
-{
- if (channel != 0) {
- return NSAPI_ERROR_UNSUPPORTED;
- }
-
- set_credentials(ssid, pass, security);
- return connect();
-}
-
-int ESP8266Interface::connect()
-{
- _esp.setTimeout(ESP8266_CONNECT_TIMEOUT);
-
- if (!_esp.startup(3)) {
- return NSAPI_ERROR_DEVICE_ERROR;
- }
-
- if (!_esp.dhcp(true, 1)) {
- return NSAPI_ERROR_DHCP_FAILURE;
- }
-
- if (!_esp.connect(ap_ssid, ap_pass)) {
- return NSAPI_ERROR_NO_CONNECTION;
- }
-
- if (!_esp.getIPAddress()) {
- return NSAPI_ERROR_DHCP_FAILURE;
- }
-
- return NSAPI_ERROR_OK;
-}
-
-int ESP8266Interface::set_credentials(const char *ssid, const char *pass, nsapi_security_t security)
-{
- memset(ap_ssid, 0, sizeof(ap_ssid));
- strncpy(ap_ssid, ssid, sizeof(ap_ssid));
-
- memset(ap_pass, 0, sizeof(ap_pass));
- strncpy(ap_pass, pass, sizeof(ap_pass));
-
- ap_sec = security;
-
- return 0;
-}
-
-int ESP8266Interface::set_channel(uint8_t channel)
-{
- return NSAPI_ERROR_UNSUPPORTED;
-}
-
-
-int ESP8266Interface::disconnect()
-{
- _esp.setTimeout(ESP8266_MISC_TIMEOUT);
-
- if (!_esp.disconnect()) {
- return NSAPI_ERROR_DEVICE_ERROR;
- }
-
- return NSAPI_ERROR_OK;
-}
-
-const char *ESP8266Interface::get_ip_address()
-{
- return _esp.getIPAddress();
-}
-
-const char *ESP8266Interface::get_mac_address()
-{
- return _esp.getMACAddress();
-}
-
-const char *ESP8266Interface::get_gateway()
-{
- return _esp.getGateway();
-}
-
-const char *ESP8266Interface::get_netmask()
-{
- return _esp.getNetmask();
-}
-
-int8_t ESP8266Interface::get_rssi()
-{
- return _esp.getRSSI();
-}
-
-int ESP8266Interface::scan(WiFiAccessPoint *res, unsigned count)
-{
- return _esp.scan(res, count);
-}
-
-struct esp8266_socket {
- int id;
- nsapi_protocol_t proto;
- bool connected;
- SocketAddress addr;
-};
-
-int ESP8266Interface::socket_open(void **handle, nsapi_protocol_t proto)
-{
- // Look for an unused socket
- int id = -1;
-
- for (int i = 0; i < ESP8266_SOCKET_COUNT; i++) {
- if (!_ids[i]) {
- id = i;
- _ids[i] = true;
- break;
- }
- }
-
- if (id == -1) {
- return NSAPI_ERROR_NO_SOCKET;
- }
-
- struct esp8266_socket *socket = new struct esp8266_socket;
- if (!socket) {
- return NSAPI_ERROR_NO_SOCKET;
- }
-
- socket->id = id;
- socket->proto = proto;
- socket->connected = false;
- *handle = socket;
- return 0;
-}
-
-int ESP8266Interface::socket_close(void *handle)
-{
- struct esp8266_socket *socket = (struct esp8266_socket *)handle;
- int err = 0;
- _esp.setTimeout(ESP8266_MISC_TIMEOUT);
-
- if (!_esp.close(socket->id)) {
- err = NSAPI_ERROR_DEVICE_ERROR;
- }
-
- _ids[socket->id] = false;
- delete socket;
- return err;
-}
-
-int ESP8266Interface::socket_bind(void *handle, const SocketAddress &address)
-{
- return NSAPI_ERROR_UNSUPPORTED;
-}
-
-int ESP8266Interface::socket_listen(void *handle, int backlog)
-{
- return NSAPI_ERROR_UNSUPPORTED;
-}
-
-int ESP8266Interface::socket_connect(void *handle, const SocketAddress &addr)
-{
- struct esp8266_socket *socket = (struct esp8266_socket *)handle;
- _esp.setTimeout(ESP8266_MISC_TIMEOUT);
-
- const char *proto = (socket->proto == NSAPI_UDP) ? "UDP" : "TCP";
- if (!_esp.open(proto, socket->id, addr.get_ip_address(), addr.get_port())) {
- return NSAPI_ERROR_DEVICE_ERROR;
- }
-
- socket->connected = true;
- return 0;
-}
-
-int ESP8266Interface::socket_accept(void *server, void **socket, SocketAddress *addr)
-{
- return NSAPI_ERROR_UNSUPPORTED;
-}
-
-int ESP8266Interface::socket_send(void *handle, const void *data, unsigned size)
-{
- struct esp8266_socket *socket = (struct esp8266_socket *)handle;
- _esp.setTimeout(ESP8266_SEND_TIMEOUT);
-
- if (!_esp.send(socket->id, data, size)) {
- return NSAPI_ERROR_DEVICE_ERROR;
- }
-
- return size;
-}
-
-int ESP8266Interface::socket_recv(void *handle, void *data, unsigned size)
-{
- struct esp8266_socket *socket = (struct esp8266_socket *)handle;
- _esp.setTimeout(ESP8266_RECV_TIMEOUT);
-
- int32_t recv = _esp.recv(socket->id, data, size);
- if (recv < 0) {
- return NSAPI_ERROR_WOULD_BLOCK;
- }
-
- return recv;
-}
-
-int ESP8266Interface::socket_sendto(void *handle, const SocketAddress &addr, const void *data, unsigned size)
-{
- struct esp8266_socket *socket = (struct esp8266_socket *)handle;
-
- if (socket->connected && socket->addr != addr) {
- _esp.setTimeout(ESP8266_MISC_TIMEOUT);
- if (!_esp.close(socket->id)) {
- return NSAPI_ERROR_DEVICE_ERROR;
- }
- socket->connected = false;
- }
-
- if (!socket->connected) {
- int err = socket_connect(socket, addr);
- if (err < 0) {
- return err;
- }
- socket->addr = addr;
- }
-
- return socket_send(socket, data, size);
-}
-
-int ESP8266Interface::socket_recvfrom(void *handle, SocketAddress *addr, void *data, unsigned size)
-{
- struct esp8266_socket *socket = (struct esp8266_socket *)handle;
- int ret = socket_recv(socket, data, size);
- if (ret >= 0 && addr) {
- *addr = socket->addr;
- }
-
- return ret;
-}
-
-void ESP8266Interface::socket_attach(void *handle, void (*callback)(void *), void *data)
-{
- struct esp8266_socket *socket = (struct esp8266_socket *)handle;
- _cbs[socket->id].callback = callback;
- _cbs[socket->id].data = data;
-}
-
-void ESP8266Interface::event() {
- for (int i = 0; i < ESP8266_SOCKET_COUNT; i++) {
- if (_cbs[i].callback) {
- _cbs[i].callback(_cbs[i].data);
- }
- }
-}
--- a/esp8266-driver/ESP8266Interface.h Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,275 +0,0 @@
-/* ESP8266 implementation of NetworkInterfaceAPI
- * Copyright (c) 2015 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ESP8266_INTERFACE_H
-#define ESP8266_INTERFACE_H
-
-#include "mbed.h"
-#include "ESP8266.h"
-
-
-#define ESP8266_SOCKET_COUNT 5
-
-/** ESP8266Interface class
- * Implementation of the NetworkStack for the ESP8266
- */
-class ESP8266Interface : public NetworkStack, public WiFiInterface
-{
-public:
- /** ESP8266Interface lifetime
- * @param tx TX pin
- * @param rx RX pin
- * @param debug Enable debugging
- */
- ESP8266Interface(PinName tx, PinName rx, bool debug = false);
-
- /** Start the interface
- *
- * Attempts to connect to a WiFi network. Requires ssid and passphrase to be set.
- * If passphrase is invalid, NSAPI_ERROR_AUTH_ERROR is returned.
- *
- * @return 0 on success, negative error code on failure
- */
- virtual int connect();
-
- /** Start the interface
- *
- * Attempts to connect to a WiFi network.
- *
- * @param ssid Name of the network to connect to
- * @param pass Security passphrase to connect to the network
- * @param security Type of encryption for connection (Default: NSAPI_SECURITY_NONE)
- * @param channel This parameter is not supported, setting it to anything else than 0 will result in NSAPI_ERROR_UNSUPPORTED
- * @return 0 on success, or error code on failure
- */
- virtual int connect(const char *ssid, const char *pass, nsapi_security_t security = NSAPI_SECURITY_NONE,
- uint8_t channel = 0);
-
- /** Set the WiFi network credentials
- *
- * @param ssid Name of the network to connect to
- * @param pass Security passphrase to connect to the network
- * @param security Type of encryption for connection
- * (defaults to NSAPI_SECURITY_NONE)
- * @return 0 on success, or error code on failure
- */
- virtual int set_credentials(const char *ssid, const char *pass, nsapi_security_t security = NSAPI_SECURITY_NONE);
-
- /** Set the WiFi network channel - NOT SUPPORTED
- *
- * This function is not supported and will return NSAPI_ERROR_UNSUPPORTED
- *
- * @param channel Channel on which the connection is to be made, or 0 for any (Default: 0)
- * @return Not supported, returns NSAPI_ERROR_UNSUPPORTED
- */
- virtual int set_channel(uint8_t channel);
-
- /** Stop the interface
- * @return 0 on success, negative on failure
- */
- virtual int disconnect();
-
- /** Get the internally stored IP address
- * @return IP address of the interface or null if not yet connected
- */
- virtual const char *get_ip_address();
-
- /** Get the internally stored MAC address
- * @return MAC address of the interface
- */
- virtual const char *get_mac_address();
-
- /** Get the local gateway
- *
- * @return Null-terminated representation of the local gateway
- * or null if no network mask has been recieved
- */
- virtual const char *get_gateway();
-
- /** Get the local network mask
- *
- * @return Null-terminated representation of the local network mask
- * or null if no network mask has been recieved
- */
- virtual const char *get_netmask();
-
- /** Gets the current radio signal strength for active connection
- *
- * @return Connection strength in dBm (negative value)
- */
- virtual int8_t get_rssi();
-
- /** Scan for available networks
- *
- * This function will block.
- *
- * @param ap Pointer to allocated array to store discovered AP
- * @param count Size of allocated @a res array, or 0 to only count available AP
- * @param timeout Timeout in milliseconds; 0 for no timeout (Default: 0)
- * @return Number of entries in @a, or if @a count was 0 number of available networks, negative on error
- * see @a nsapi_error
- */
- virtual int scan(WiFiAccessPoint *res, unsigned count);
-
- /** Translates a hostname to an IP address with specific version
- *
- * The hostname may be either a domain name or an IP address. If the
- * hostname is an IP address, no network transactions will be performed.
- *
- * If no stack-specific DNS resolution is provided, the hostname
- * will be resolve using a UDP socket on the stack.
- *
- * @param address Destination for the host SocketAddress
- * @param host Hostname to resolve
- * @param version IP version of address to resolve, NSAPI_UNSPEC indicates
- * version is chosen by the stack (defaults to NSAPI_UNSPEC)
- * @return 0 on success, negative error code on failure
- */
- using NetworkInterface::gethostbyname;
-
- /** Add a domain name server to list of servers to query
- *
- * @param addr Destination for the host address
- * @return 0 on success, negative error code on failure
- */
- using NetworkInterface::add_dns_server;
-
-protected:
- /** Open a socket
- * @param handle Handle in which to store new socket
- * @param proto Type of socket to open, NSAPI_TCP or NSAPI_UDP
- * @return 0 on success, negative on failure
- */
- virtual int socket_open(void **handle, nsapi_protocol_t proto);
-
- /** Close the socket
- * @param handle Socket handle
- * @return 0 on success, negative on failure
- * @note On failure, any memory associated with the socket must still
- * be cleaned up
- */
- virtual int socket_close(void *handle);
-
- /** Bind a server socket to a specific port
- * @param handle Socket handle
- * @param address Local address to listen for incoming connections on
- * @return 0 on success, negative on failure.
- */
- virtual int socket_bind(void *handle, const SocketAddress &address);
-
- /** Start listening for incoming connections
- * @param handle Socket handle
- * @param backlog Number of pending connections that can be queued up at any
- * one time [Default: 1]
- * @return 0 on success, negative on failure
- */
- virtual int socket_listen(void *handle, int backlog);
-
- /** Connects this TCP socket to the server
- * @param handle Socket handle
- * @param address SocketAddress to connect to
- * @return 0 on success, negative on failure
- */
- virtual int socket_connect(void *handle, const SocketAddress &address);
-
- /** Accept a new connection.
- * @param handle Handle in which to store new socket
- * @param server Socket handle to server to accept from
- * @return 0 on success, negative on failure
- * @note This call is not-blocking, if this call would block, must
- * immediately return NSAPI_ERROR_WOULD_WAIT
- */
- virtual int socket_accept(void *handle, void **socket, SocketAddress *address);
-
- /** Send data to the remote host
- * @param handle Socket handle
- * @param data The buffer to send to the host
- * @param size The length of the buffer to send
- * @return Number of written bytes on success, negative on failure
- * @note This call is not-blocking, if this call would block, must
- * immediately return NSAPI_ERROR_WOULD_WAIT
- */
- virtual int socket_send(void *handle, const void *data, unsigned size);
-
- /** Receive data from the remote host
- * @param handle Socket handle
- * @param data The buffer in which to store the data received from the host
- * @param size The maximum length of the buffer
- * @return Number of received bytes on success, negative on failure
- * @note This call is not-blocking, if this call would block, must
- * immediately return NSAPI_ERROR_WOULD_WAIT
- */
- virtual int socket_recv(void *handle, void *data, unsigned size);
-
- /** Send a packet to a remote endpoint
- * @param handle Socket handle
- * @param address The remote SocketAddress
- * @param data The packet to be sent
- * @param size The length of the packet to be sent
- * @return The number of written bytes on success, negative on failure
- * @note This call is not-blocking, if this call would block, must
- * immediately return NSAPI_ERROR_WOULD_WAIT
- */
- virtual int socket_sendto(void *handle, const SocketAddress &address, const void *data, unsigned size);
-
- /** Receive a packet from a remote endpoint
- * @param handle Socket handle
- * @param address Destination for the remote SocketAddress or null
- * @param buffer The buffer for storing the incoming packet data
- * If a packet is too long to fit in the supplied buffer,
- * excess bytes are discarded
- * @param size The length of the buffer
- * @return The number of received bytes on success, negative on failure
- * @note This call is not-blocking, if this call would block, must
- * immediately return NSAPI_ERROR_WOULD_WAIT
- */
- virtual int socket_recvfrom(void *handle, SocketAddress *address, void *buffer, unsigned size);
-
- /** Register a callback on state change of the socket
- * @param handle Socket handle
- * @param callback Function to call on state change
- * @param data Argument to pass to callback
- * @note Callback may be called in an interrupt context.
- */
- virtual void socket_attach(void *handle, void (*callback)(void *), void *data);
-
- /** Provide access to the NetworkStack object
- *
- * @return The underlying NetworkStack object
- */
- virtual NetworkStack *get_stack()
- {
- return this;
- }
-
-private:
- ESP8266 _esp;
- bool _ids[ESP8266_SOCKET_COUNT];
-
- char ap_ssid[33]; /* 32 is what 802.11 defines as longest possible name; +1 for the \0 */
- nsapi_security_t ap_sec;
- uint8_t ap_ch;
- char ap_pass[64]; /* The longest allowed passphrase */
-
- void event();
-
- struct {
- void (*callback)(void *);
- void *data;
- } _cbs[ESP8266_SOCKET_COUNT];
-};
-
-#endif
--- a/main.cpp Thu Jan 12 22:05:15 2017 +0000
+++ b/main.cpp Wed Mar 29 03:14:41 2017 +0000
@@ -1,117 +1,74 @@
-/* WiFi Example
- * Copyright (c) 2016 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/************************************************************/
+/* (C) 2016 Beijing ARM Accelerator Technology Co., Ltd. */
+/* Description: Demo for ASC Platform. */
+/* Performed an example for getting data form Sensors, */
+/* then send data to OneNet Cloud by using EDP protocol */
+/* Author: ss.pan */
+/* Version: 1.01 */
+/* Date: 2017-03-28 */
+/************************************************************/
+#include "mbed.h"
+#include "wifi_example.h"
+#include "driver_mbed_TH02.h"
+#include <driver_mbed_HP20x.h>
+#include <driver_mbed_KalmanFilter.h>
-#include "mbed.h"
-#include "TCPSocket.h"
+unsigned char ret = 0;
+KalmanFilter p_filter; //Kalman filter for pressure
+KalmanFilter a_filter; //Kalman filter for altitude
-#include "ESP8266Interface.h"
-ESP8266Interface wifi(D1, D0);
+float temperature = -999.999;
+float humidity = -999.999;
+float pressure = -999.999;
+float pressure_filtered = -999.999;
+float altitude = -999.999;
+float altitude_filtered = -999.999;
-const char *sec2str(nsapi_security_t sec)
+void getSensorDat(void);
+
+/**
+* @brief main
+**/
+int main()
{
- switch (sec) {
- case NSAPI_SECURITY_NONE:
- return "None";
- case NSAPI_SECURITY_WEP:
- return "WEP";
- case NSAPI_SECURITY_WPA:
- return "WPA";
- case NSAPI_SECURITY_WPA2:
- return "WPA2";
- case NSAPI_SECURITY_WPA_WPA2:
- return "WPA/WPA2";
- case NSAPI_SECURITY_UNKNOWN:
- default:
- return "Unknown";
+ connectInit();
+ devLink(DEVICEID,APIKEY);
+ while(1) {
+ getSensorDat();
+ if(!checkSocketStatus()) {
+ sendJsonDat("humidity ", humidity);
+ wait_ms(500);
+ sendJsonDat("temperature", temperature);
+ wait_ms(500);
+ sendJsonDat("pressure", pressure_filtered);
+ wait_ms(500);
+ sendJsonDat("altitude", altitude_filtered);
+ wait_ms(500);
+ }
}
}
-void scan_demo(WiFiInterface *wifi)
+/**
+* @brief get sensor data
+**/
+void getSensorDat(void)
{
- WiFiAccessPoint *ap;
-
- printf("Scan:\r\n");
-
- int count = wifi->scan(NULL,0);
-
- /* Limit number of network arbitrary to 15 */
- count = count < 15 ? count : 15;
-
- ap = new WiFiAccessPoint[count];
- count = wifi->scan(ap, count);
- for (int i = 0; i < count; i++)
- {
- printf("Network: %s secured: %s BSSID: %hhX:%hhX:%hhX:%hhx:%hhx:%hhx RSSI: %hhd Ch: %hhd\r\n", ap[i].get_ssid(),
- sec2str(ap[i].get_security()), ap[i].get_bssid()[0], ap[i].get_bssid()[1], ap[i].get_bssid()[2],
- ap[i].get_bssid()[3], ap[i].get_bssid()[4], ap[i].get_bssid()[5], ap[i].get_rssi(), ap[i].get_channel());
- }
- printf("%d networks available.\r\n", count);
-
- delete[] ap;
-}
-
-void http_demo(NetworkInterface *net)
-{
- TCPSocket socket;
-
- printf("Sending HTTP request to www.arm.com...\r\n");
-
- // Open a socket on the network interface, and create a TCP connection to www.arm.com
- socket.open(net);
- socket.connect("www.arm.com", 80);
+ int ret;
+ temperature = myTH02.ReadTemperature();
+ humidity = myTH02.ReadHumidity();
+ wait_ms(50);
+ HP20x.begin();
+ wait_ms(100);
- // Send a simple http request
- char sbuffer[] = "GET / HTTP/1.1\r\nHost: www.arm.com\r\n\r\n";
- int scount = socket.send(sbuffer, sizeof sbuffer);
- printf("sent %d [%.*s]\r\n", scount, strstr(sbuffer, "\r\n")-sbuffer, sbuffer);
-
- // Recieve a simple http response and print out the response line
- char rbuffer[64];
- int rcount = socket.recv(rbuffer, sizeof rbuffer);
- printf("recv %d [%.*s]\r\n", rcount, strstr(rbuffer, "\r\n")-rbuffer, rbuffer);
-
- // Close the socket to return its memory and bring down the network interface
- socket.close();
-}
-
-int main()
-{
- printf("WiFi example\r\n\r\n");
-
- // Scan for available access points
- scan_demo(&wifi);
+ ret = HP20x.isAvailable();
+ if(OK_HP20X_DEV == ret) {
+ long p_data = HP20x.ReadPressure();
+ pressure = p_data/100.0f;
+ pressure_filtered = p_filter.Filter(pressure);
- printf("\r\nConnecting...\r\n");
- int ret = wifi.connect(MBED_CONF_APP_WIFI_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2);
- if (ret != 0) {
- printf("\r\nConnection error\r\n");
- return -1;
+ long a_data = HP20x.ReadAltitude();
+ altitude = a_data/100.0f;
+ altitude_filtered = a_filter.Filter(altitude);
}
-
- printf("Success\r\n\r\n");
- printf("MAC: %s\r\n", wifi.get_mac_address());
- printf("IP: %s\r\n", wifi.get_ip_address());
- printf("Netmask: %s\r\n", wifi.get_netmask());
- printf("Gateway: %s\r\n", wifi.get_gateway());
- printf("RSSI: %d\r\n\r\n", wifi.get_rssi());
-
- http_demo(&wifi);
-
- wifi.disconnect();
-
- printf("\r\nDone\r\n");
-}
+}
\ No newline at end of file
--- a/mbed_app.json Thu Jan 12 22:05:15 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-{
- "config": {
- "wifi-ssid": {
- "help": "WiFi SSID",
- "value": "\"SSID\""
- },
- "wifi-password": {
- "help": "WiFi Password",
- "value": "\"Password\""
- }
- },
- "target_overrides": {
- "UBLOX_EVK_ODIN_W2": {
- "target.device_has": ["EMAC"]
- }
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wifi_example.lib Wed Mar 29 03:14:41 2017 +0000 @@ -0,0 +1,1 @@ +https://developer.mbed.org/users/TaylorGy/code/wifi_example/#cbe8a0553d45