Merge branch 'master' of github.com:m5stack/m5-docs

This commit is contained in:
ali-admin
2020-11-12 17:30:14 +08:00
4 changed files with 44 additions and 5 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
## Tutorial&Quick-Start
<a href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/Demo-Board_cn.pdf"><el-tag effect="plain">Tutorial&PDF</el-tag></a>
<a href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/Demo-Board_en.pdf"><el-tag effect="plain">Tutorial&PDF</el-tag></a>
## Description
+1 -1
View File
@@ -75,7 +75,7 @@
</div>
<div>
<video id="example_video" controls>
<source src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/video/Product_example_video/App/PM2.5.mp4" type="video/mp4">
<source src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/video/Product_example_video/Base/M5GO_BOTTOM2_video.mp4" type="video/mp4">
</video>
<div class="easyloader-mask">
<a>
+41 -2
View File
@@ -213,10 +213,49 @@ void loop() {
`int shutdown( const RTC_DateTypeDef &RTC_DateStruct, const RTC_TimeTypeDef &RTC_TimeStruct);`
<!-- **使用示例:**
**使用示例:**
```
#include "M5CoreInk.h"
Ink_Sprite InkPageSprite(&M5.M5Ink);
void ButtonTest(char* str)
{
InkPageSprite.clear();
InkPageSprite.drawString(35,59,str);
InkPageSprite.pushSprite();
delay(2000);
}
``` -->
void setup() {
M5.begin();
if( !M5.M5Ink.isInit())
{
Serial.printf("Ink Init faild");
}
M5.M5Ink.clear();
delay(1000);
//creat ink refresh Sprite
if( InkPageSprite.creatSprite(0,0,200,200,true) != 0 )
{
Serial.printf("Ink Sprite creat faild");
}
ButtonTest("Press Btn PWR for sleep , after 5 sec wakeup.");
}
void loop() {
if( M5.BtnPWR.wasPressed())
{
Serial.printf("Btn %d was pressed \r\n",BUTTON_EXT_PIN);
M5.shutdown(20);
// M5.shutdown(RTC_TimeTypeDef(10,2,0));
}
M5.update();
}
```
+1 -1
View File
@@ -79,7 +79,7 @@
</div>
<div>
<video id="example_video" controls>
<source src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/video/Product_example_video/App/PM2.5.mp4" type="video/mp4">
<source src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/video/Product_example_video/Base/M5GO_BOTTOM2_video.mp4" type="video/mp4">
</video>
<div class="easyloader-mask">
<a>