Skip to content

Commit 43585fa

Browse files
author
Espressif Systems
committed
1.use ESPRSSIF MIT License;
2.add smartconfig support;
1 parent ec75c85 commit 43585fa

File tree

4 files changed

+71
-21
lines changed

4 files changed

+71
-21
lines changed

Diff for: LICENSE

+39-21
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,40 @@
1-
The MIT License (MIT)
2-
3-
Copyright (c) 2015 Espressif Systems
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
1+
ESPRSSIF MIT License
2+
3+
Copyright (c) 2015 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
4+
5+
Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
6+
it is free of charge, to any person obtaining a copy of this software and associated
7+
documentation files (the ��Software��), to deal in the Software without restriction,
8+
including without limitation the rights to use, copy, modify, merge, publish, distribute,
9+
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
10+
is furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all copies or
13+
substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED ��AS IS��, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
16+
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
17+
PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
18+
FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20+
DEALINGS IN THE SOFTWARE.
21+
22+
23+
���� MIT ����֤
24+
25+
��Ȩ (c) 2015 <������Ϣ�Ƽ����Ϻ������޹�˾>
26+
27+
������֤��Ȩ������������Ϣ�Ƽ� ESP8266 ��Ʒ��Ӧ�ÿ������ڴ�����£�������֤�����Ȩ�κλ�ø�
28+
������������ĵ���ͳ��Ϊ�������������������Ƶؾ�Ӫ�����������������Ƶ�ʹ�á����ơ��޸ġ��ϲ���
29+
���淢�С�ɢ��������Ȩ������������������������Ȩ��������Ȩ����������ЩȨ����ͬʱ�����������
30+
��������
31+
32+
�����������������и����ж�����������ϵİ�Ȩ��������Ȩ������
33+
34+
�������������������ṩ��û���κ���ȷ�򰵺��ĵ������������������ڹ��������ԡ��ʺ�ijһ�ض���;
35+
�ͷ���Ȩ�ı�֤�����ߺͰ�Ȩ���������κ�����¾�����������������ʹ��������Ժ�ͬ��ʽ��������Ȩ
36+
��������ʽ������κ����⡢�𺦻��������θ���
37+
38+
39+
2240

Diff for: include/espressif/esp_common.h

+2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@
1717

1818
#include "esp8266/esp8266.h"
1919

20+
#include "smartconfig.h"
2021
#include "spi_flash.h"
22+
2123
#endif

Diff for: include/espressif/smartconfig.h

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Copyright (C) 2015 -2018 Espressif System
3+
*
4+
*/
5+
6+
#ifndef __SMARTCONFIG_H__
7+
#define __SMARTCONFIG_H__
8+
9+
typedef void (*sc_callback_t)(void *data);
10+
11+
typedef enum {
12+
SC_STATUS_WAIT = 0,
13+
SC_STATUS_FIND_CHANNEL,
14+
SC_STATUS_GETTING_SSID_PSWD,
15+
SC_STATUS_GOT_SSID_PSWD,
16+
SC_STATUS_LINK,
17+
SC_STATUS_LINK_OVER,
18+
} sc_status;
19+
20+
typedef enum {
21+
SC_TYPE_ESPTOUCH = 0,
22+
SC_TYPE_AIRKISS,
23+
} sc_type;
24+
25+
sc_status smartconfig_get_status(void);
26+
const char *smartconfig_get_version(void);
27+
bool smartconfig_start(sc_type type, sc_callback_t cb, ...);
28+
bool smartconfig_stop(void);
29+
30+
#endif

Diff for: lib/libsmartconfig.a

83.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)