Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
srefgeqfeqrfg
arduino-esp32
提交
450ea0d2
A
arduino-esp32
项目概览
srefgeqfeqrfg
/
arduino-esp32
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
arduino-esp32
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
450ea0d2
编写于
2月 11, 2017
作者:
M
me-no-dev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update ESP class
上级
a28a7f12
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
9 addition
and
36 deletion
+9
-36
cores/esp32/Esp.cpp
cores/esp32/Esp.cpp
+7
-28
cores/esp32/Esp.h
cores/esp32/Esp.h
+2
-8
未找到文件。
cores/esp32/Esp.cpp
浏览文件 @
450ea0d2
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
#include "Esp.h"
#include "Esp.h"
#include "rom/spi_flash.h"
#include "rom/spi_flash.h"
#include "esp_deep_sleep.h"
#include "esp_deep_sleep.h"
#include "esp_spi_flash.h"
#include <memory>
#include <memory>
//#define DEBUG_SERIAL Serial
//#define DEBUG_SERIAL Serial
...
@@ -113,7 +114,7 @@ uint32_t EspClass::getFlashChipSize(void)
...
@@ -113,7 +114,7 @@ uint32_t EspClass::getFlashChipSize(void)
uint32_t
data
;
uint32_t
data
;
uint8_t
*
bytes
=
(
uint8_t
*
)
&
data
;
uint8_t
*
bytes
=
(
uint8_t
*
)
&
data
;
// read first 4 byte (magic byte + flash config)
// read first 4 byte (magic byte + flash config)
if
(
SPIRead
(
0x0000
,
&
data
,
4
)
==
SPI_FLASH_RESULT
_OK
)
{
if
(
flashRead
(
0x0000
,
&
data
,
4
)
==
ESP
_OK
)
{
return
magicFlashChipSize
((
bytes
[
3
]
&
0xf0
)
>>
4
);
return
magicFlashChipSize
((
bytes
[
3
]
&
0xf0
)
>>
4
);
}
}
return
0
;
return
0
;
...
@@ -124,7 +125,7 @@ uint32_t EspClass::getFlashChipSpeed(void)
...
@@ -124,7 +125,7 @@ uint32_t EspClass::getFlashChipSpeed(void)
uint32_t
data
;
uint32_t
data
;
uint8_t
*
bytes
=
(
uint8_t
*
)
&
data
;
uint8_t
*
bytes
=
(
uint8_t
*
)
&
data
;
// read first 4 byte (magic byte + flash config)
// read first 4 byte (magic byte + flash config)
if
(
SPIRead
(
0x0000
,
&
data
,
4
)
==
SPI_FLASH_RESULT
_OK
)
{
if
(
flashRead
(
0x0000
,
&
data
,
4
)
==
ESP
_OK
)
{
return
magicFlashChipSpeed
(
bytes
[
3
]
&
0x0F
);
return
magicFlashChipSpeed
(
bytes
[
3
]
&
0x0F
);
}
}
return
0
;
return
0
;
...
@@ -136,7 +137,7 @@ FlashMode_t EspClass::getFlashChipMode(void)
...
@@ -136,7 +137,7 @@ FlashMode_t EspClass::getFlashChipMode(void)
uint32_t
data
;
uint32_t
data
;
uint8_t
*
bytes
=
(
uint8_t
*
)
&
data
;
uint8_t
*
bytes
=
(
uint8_t
*
)
&
data
;
// read first 4 byte (magic byte + flash config)
// read first 4 byte (magic byte + flash config)
if
(
SPIRead
(
0x0000
,
&
data
,
4
)
==
SPI_FLASH_RESULT
_OK
)
{
if
(
flashRead
(
0x0000
,
&
data
,
4
)
==
ESP
_OK
)
{
mode
=
magicFlashChipMode
(
bytes
[
2
]);
mode
=
magicFlashChipMode
(
bytes
[
2
]);
}
}
return
mode
;
return
mode
;
...
@@ -191,39 +192,17 @@ FlashMode_t EspClass::magicFlashChipMode(uint8_t byte)
...
@@ -191,39 +192,17 @@ FlashMode_t EspClass::magicFlashChipMode(uint8_t byte)
return
mode
;
return
mode
;
}
}
bool
EspClass
::
eraseConfig
(
void
)
{
bool
ret
=
true
;
size_t
cfgAddr
=
(
getFlashChipSize
()
-
0x4000
);
size_t
cfgSize
=
(
8
*
1024
);
while
(
cfgSize
)
{
if
(
SPIEraseSector
((
cfgAddr
/
4096
))
!=
SPI_FLASH_RESULT_OK
)
{
ret
=
false
;
}
cfgSize
-=
4096
;
cfgAddr
+=
4096
;
}
return
ret
;
}
bool
EspClass
::
flashEraseSector
(
uint32_t
sector
)
bool
EspClass
::
flashEraseSector
(
uint32_t
sector
)
{
{
int
rc
=
SPIEraseSector
(
sector
);
return
spi_flash_erase_sector
(
sector
)
==
ESP_OK
;
return
rc
==
0
;
}
}
bool
EspClass
::
flashWrite
(
uint32_t
offset
,
uint32_t
*
data
,
size_t
size
)
bool
EspClass
::
flashWrite
(
uint32_t
offset
,
uint32_t
*
data
,
size_t
size
)
{
{
int
rc
=
SPIWrite
(
offset
,
(
uint32_t
*
)
data
,
size
);
return
spi_flash_write
(
offset
,
(
uint32_t
*
)
data
,
size
)
==
ESP_OK
;
return
rc
==
0
;
}
}
bool
EspClass
::
flashRead
(
uint32_t
offset
,
uint32_t
*
data
,
size_t
size
)
bool
EspClass
::
flashRead
(
uint32_t
offset
,
uint32_t
*
data
,
size_t
size
)
{
{
int
rc
=
SPIRead
(
offset
,
(
uint32_t
*
)
data
,
size
);
return
spi_flash_read
(
offset
,
(
uint32_t
*
)
data
,
size
)
==
ESP_OK
;
return
rc
==
0
;
}
}
cores/esp32/Esp.h
浏览文件 @
450ea0d2
...
@@ -55,15 +55,12 @@ public:
...
@@ -55,15 +55,12 @@ public:
~
EspClass
()
{}
~
EspClass
()
{}
void
restart
();
void
restart
();
uint32_t
getFreeHeap
();
uint32_t
getFreeHeap
();
uint8_t
getCpuFreqMHz
(){
return
F_CPU
;
}
uint32_t
getChipId
();
uint32_t
getCycleCount
();
const
char
*
getSdkVersion
();
const
char
*
getSdkVersion
();
void
deepSleep
(
uint32_t
time_us
);
void
deepSleep
(
uint32_t
time_us
);
uint8_t
getCpuFreqMHz
();
uint32_t
getFlashChipSize
();
uint32_t
getFlashChipSize
();
uint32_t
getFlashChipSpeed
();
uint32_t
getFlashChipSpeed
();
FlashMode_t
getFlashChipMode
();
FlashMode_t
getFlashChipMode
();
...
@@ -76,9 +73,6 @@ public:
...
@@ -76,9 +73,6 @@ public:
bool
flashWrite
(
uint32_t
offset
,
uint32_t
*
data
,
size_t
size
);
bool
flashWrite
(
uint32_t
offset
,
uint32_t
*
data
,
size_t
size
);
bool
flashRead
(
uint32_t
offset
,
uint32_t
*
data
,
size_t
size
);
bool
flashRead
(
uint32_t
offset
,
uint32_t
*
data
,
size_t
size
);
bool
eraseConfig
();
uint32_t
getCycleCount
();
};
};
extern
EspClass
ESP
;
extern
EspClass
ESP
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录