From da553d7608655f4c4515faed65d86c5d1a150dc2 Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Fri, 12 Jul 2019 17:25:35 +0800 Subject: [PATCH] add 6060 --- docs/assets/css/main.css | 8 + docs/index.md | 253 +++++++++++++++---------------- docs/sidebar.md | 5 +- docs/zh_CN/1515/6060-push.md | 29 ++++ docs/zh_CN/README.md | 286 +++++++++++++++++++---------------- docs/zh_CN/module/gsm.md | 54 ++++++- docs/zh_CN/module/lte.md | 54 ++++++- docs/zh_CN/module/nb-iot.md | 55 ++++++- docs/zh_CN/sidebar.md | 5 +- 9 files changed, 482 insertions(+), 267 deletions(-) create mode 100644 docs/zh_CN/1515/6060-push.md diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css index bb4871d4..46a36cc8 100644 --- a/docs/assets/css/main.css +++ b/docs/assets/css/main.css @@ -22,8 +22,10 @@ body[data-page="index.md"] article.markdown-section { body[data-page="index.md"] article.markdown-section .item { width: 150px; margin-right: 10px; + margin-top: 10px; display: inline-block; position:relative; + box-shadow: 5px 5px 5px #888888; } body[data-page="index.md"] article.markdown-section p.item-title { @@ -38,12 +40,18 @@ body[data-page="zh_CN/README.md"] article.markdown-section { body[data-page="zh_CN/README.md"] article.markdown-section .item { width: 150px; margin-right: 10px; + margin-top: 10px; display: inline-block; position:relative; + box-shadow: 5px 5px 5px #888888; } body[data-page="zh_CN/README.md"] article.markdown-section p.item-title { text-align: center; + margin-top: 10px; + margin-bottom: 10px; + /* background-color: #007BFF; + color: white; */ } /* ja */ diff --git a/docs/index.md b/docs/index.md index 51dcedc5..edeab120 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,10 +9,6 @@ Core -## BASIC -## GRAY -## FIRE - M5Core QuickStart     IIC AddressTable     @@ -24,53 +20,52 @@ -

BASIC

+

BASIC

-

GRAY

+

GRAY

-

FIRE

+

FIRE

-## M5Stick -## M5StickC -## M5StickV +**M5Stick** + M5Stick QuickStart     M5StickC QuickStart     M5StickV QuickStart     M5Stick comparison » -**M5Stick** +
-

M5Stick

+

M5Stick

-             +
-

M5StickC

+

M5StickC

-             +
-

M5StickV

+

M5StickV

@@ -78,31 +73,31 @@ ## M5GO Kit ## FACES Kit - M5GO QuickStart     - FACES-kit QuickStart » **M5GO/FACES Kit** + M5GO QuickStart     + FACES-kit QuickStart »
-

M5GO Lite

+

M5GO Lite

-

M5GO Kit

+

M5GO Kit

-

FACES Kit

+

FACES Kit

*** @@ -130,35 +125,35 @@ -

GPS

+

GPS

-

LORA

+

LORA

-

LoRaWAN

+

LoRaWAN

-

SIM800L

+

SIM800L

-

COMMU

+

COMMU

## BATTERY @@ -175,49 +170,49 @@ -

BATTERY

+

BATTERY

-

PROTO

+

PROTO

-

PROTO-KIT

+

PROTO-KIT

-

PLUS

+

PLUS

-

USB

+

USB

-

BUS

+

BUS

-

GoPlus

+

GoPlus

## STEPMOTOR @@ -231,28 +226,28 @@ -

STEPMOTOR

+

STEPMOTOR

-

SERVO

+

SERVO

-

LEGO+

+

LEGO+

-

FAN

+

FAN

@@ -267,28 +262,28 @@ -

ENCODER

+

ENCODER

-

JOYSTICK

+

JOYSTICK

-

FINGER

+

FINGER

-

RFID

+

RFID

# BASE @@ -314,42 +309,42 @@ -

LAN

+

LAN

-

NODE

+

NODE

-

BTC

+

BTC

-

PLC

+

PLC

-

Core BOTTOM

+

Core BOTTOM

-

M5GO BOTTOM

+

M5GO BOTTOM

## M5GO RFID @@ -362,35 +357,35 @@ -

M5GO RFID

+

M5GO RFID

-

M5GO CHARGER

+

M5GO CHARGER

-

PM2.5

+

PM2.5

-

BASE15

+

BASE15

-

BASE26

+

BASE26

*** @@ -423,28 +418,28 @@ -

ESP32CAM

+

ESP32CAM

-

M5Camera

+

M5Camera

-

M5CameraF

+

M5CameraF

-

M5CameraX

+

M5CameraX

**Sensor class** @@ -461,49 +456,49 @@ -

ENV

+

ENV

-

EARTH

+

EARTH

-

LIGHT

+

LIGHT

-

PIR

+

PIR

-

NCIR

+

NCIR

-

THERMAL

+

THERMAL

-

COLOR

+

COLOR

## TOF @@ -518,49 +513,49 @@ -

TOF

+

TOF

-

HEART

+

HEART

-

ADC

+

ADC

-

MAKEY

+

MAKEY

-

GPS

+

GPS

-

FINGER

+

FINGER

-

WEIGHT

+

WEIGHT

@@ -573,28 +568,28 @@ -

TRACE

+

TRACE

-

ACCEL

+

ACCEL

-

OP.90

+

OP.90

-

OP.180

+

OP.180

@@ -610,35 +605,35 @@ -

ANGLE

+

ANGLE

-

BUTTON

+

BUTTON

-

Dual-BUTTON

+

Dual-BUTTON

-

JOYSTICK

+

JOYSTICK

-

CardKB

+

CardKB

@@ -657,49 +652,49 @@ -

EXT.IO

+

EXT.IO

-

DAC

+

DAC

-

RELAY

+

RELAY

-

HUB

+

HUB

-

PaHUB

+

PaHUB

-

PbHUB

+

PbHUB

-

3.96Port

+

3.96Port

## M5-BIT @@ -712,7 +707,7 @@ -

M5:bit

+

M5:bit

@@ -720,28 +715,28 @@ -

PROTO

+

PROTO

-

MINI-PROTO

+

MINI-PROTO

-

FAN

+

FAN

-

Vibrator-Motor

+

Vibrator-Motor

@@ -757,35 +752,35 @@ -

IR

+

IR

-

RS485

+

RS485

-

RFID

+

RFID

-

LASER-RX

+

LASER-RX

-

LASER-TX

+

LASER-TX

**C-HAT class** @@ -802,49 +797,49 @@ -

ENV

+

ENV

-

PIR

+

PIR

-

SPK

+

SPK

-

PROTO

+

PROTO

-

NCIR

+

NCIR

-

Thermal

+

Thermal

-

RS485

+

RS485

## HAT-ADC @@ -854,14 +849,14 @@ -

ADC

+

ADC

-

DAC

+

DAC

@@ -879,42 +874,42 @@ -

RGB LED

+

RGB LED

-

CatEar

+

CatEar

-

HEX

+

HEX

-

NeoFlash

+

NeoFlash

-

BUTTERFLY

+

BUTTERFLY

-

RGB

+

RGB

*** @@ -937,35 +932,35 @@ -

BALA

+

BALA

-

LidarBOT

+

LidarBOT

-

PIANO

+

PIANO

-

FLIR

+

FLIR

-

Demo Board

+

Demo Board

*** @@ -989,42 +984,42 @@ -

Grove-T

+

Grove-T

-

Grove Cable

+

Grove Cable

-

GROVE2GROVE

+

GROVE2GROVE

-

SCREW

+

SCREW

-

BUS-Socket

+

BUS-Socket

-

Frame

+

Frame

## BATTERY-BASE @@ -1032,7 +1027,7 @@ -

BATTERY-BASE

+

BATTERY-BASE

*** @@ -1056,28 +1051,28 @@ -

CORNER

+

CORNER

-

NUT

+

NUT

-

Connector

+

Connector

-

Aluminium-Profile

+

Aluminium-Profile

@@ -1097,14 +1092,14 @@ -

USB Downloader

+

USB Downloader

-

USB-ISP

+

USB-ISP

diff --git a/docs/sidebar.md b/docs/sidebar.md index b3c0db20..8c680c8f 100644 --- a/docs/sidebar.md +++ b/docs/sidebar.md @@ -49,9 +49,9 @@ LoRaWAN SIM800L COMMU - + NB-IoT BATTERY PROTO PROTO-KIT @@ -263,6 +263,7 @@ NUT Connector Aluminium-Profile + 6060-PUSH diff --git a/docs/zh_CN/1515/6060-push.md b/docs/zh_CN/1515/6060-push.md new file mode 100644 index 00000000..3bfcfa44 --- /dev/null +++ b/docs/zh_CN/1515/6060-push.md @@ -0,0 +1,29 @@ +# 6060-PUSH {docsify-ignore-all} + + + +*** + +:memo:**[描述](#描述)**      :octocat:**[例程](#例程)**      :electric_plug:**[原理图](#原理图)**      🛒**[购买链接](https://m5stack.com/collections/m5-module/products/servo-module)**      :clapper:**[相关视频](#相关视频)**   **[EasyLoader](#EasyLoader)** + +## 描述 + +**6060-PUSH** 是M5Stack结构体系应用中的一款，运动控制模组.内置高精度步进电机，Mega328微处理器，1515铝型材框架.您可以通过编写控制器程序，对步进电机进行控制.二者通过RS485串行总线进行通信交互，能够实现高精度位移.适用与各类运动控制场景，如3D打印，直线运动控制等. + + +## 产品特性 + +- 内置Mega328: GRBL +- 可定制: 长度 & 距离 +- RS485通信 +- 1515 铝型材框架 +- 48 步进电机: 两相四线制 + +## 包含 + +- 1x 6060 PUSH 模组 + +## 应用 + +- 3D打印 +- 直线运动控制 \ No newline at end of file diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md index 2f3c03c5..a9e5030b 100644 --- a/docs/zh_CN/README.md +++ b/docs/zh_CN/README.md @@ -1,5 +1,4 @@ -# 产品列表 {docsify-ignore-all} - +# 产品文档 {docsify-ignore-all} ***
@@ -7,22 +6,45 @@ Core
+ + - M5Core上手指南     - IIC地址表     - M5Core硬件区别 » - **M5Core** + + M5Core上手指南     + IIC地址表     + M5Core硬件区别 » + +
-

BASIC

+

BASIC

@@ -30,7 +52,7 @@ -

GRAY

+

GRAY

@@ -38,11 +60,11 @@ -

FIRE

+

FIRE

- +**M5Stick** M5Stick上手指南     M5StickC上手指南     @@ -50,14 +72,14 @@ M5Stick硬件区别 » -**M5Stick** +
-

M5Stick

+

M5Stick

@@ -65,7 +87,7 @@ -

M5StickC

+

M5StickC

@@ -73,22 +95,24 @@ -

M5StickV

+

M5StickV

+ + +**M5GO/FACES 套件** + + M5GO上手指南     FACES-kit上手指南 » - - -**M5GO/FACES 套件**
-

M5GO Lite

+

M5GO Lite

@@ -96,7 +120,7 @@ -

M5GO Kit

+

M5GO Kit

@@ -104,7 +128,7 @@ -

FACES Kit

+

FACES Kit

*** @@ -126,35 +150,35 @@ -

GPS

+

GPS

-

LORA

+

LORA

-

LoRaWAN

+

LoRaWAN

-

SIM800L

+

SIM800L

-

COMMU

+

COMMU

**拓展模块** @@ -185,49 +209,49 @@ -

BATTERY

+

BATTERY

-

PROTO

+

PROTO

-

PROTO-KIT

+

PROTO-KIT

-

PLUS

+

PLUS

-

USB

+

USB

-

BUS

+

BUS

-

GoPlus

+

GoPlus

@@ -237,28 +261,28 @@ -

STEPMOTOR

+

STEPMOTOR

-

SERVO

+

SERVO

-

LEGO+

+

LEGO+

-

FAN

+

FAN

@@ -269,28 +293,28 @@ -

ENCODER

+

ENCODER

-

JOYSTICK

+

JOYSTICK

-

FINGER

+

FINGER

-

RFID

+

RFID

# BASE @@ -307,42 +331,42 @@ -

LAN

+

LAN

-

NODE

+

NODE

-

BTC

+

BTC

-

PLC

+

PLC

-

Core BOTTOM

+

Core BOTTOM

-

M5GO BOTTOM

+

M5GO BOTTOM

@@ -350,35 +374,35 @@ -

M5GO RFID

+

M5GO RFID

-

M5GO CHARGER

+

M5GO CHARGER

-

PM2.5

+

PM2.5

-

BASE15

+

BASE15

-

BASE26

+

BASE26

*** @@ -402,28 +426,28 @@ -

ESP32CAM

+

ESP32CAM

-

M5Camera

+

M5Camera

-

M5CameraF

+

M5CameraF

-

M5CameraX

+

M5CameraX

**传感器类** @@ -433,49 +457,49 @@ -

ENV

+

ENV

-

EARTH

+

EARTH

-

LIGHT

+

LIGHT

-

PIR

+

PIR

-

NCIR

+

NCIR

-

THERMAL

+

THERMAL

-

COLOR

+

COLOR

@@ -484,49 +508,49 @@ -

TOF

+

TOF

-

HEART

+

HEART

-

ADC

+

ADC

-

MAKEY

+

MAKEY

-

GPS

+

GPS

-

FINGER

+

FINGER

-

WEIGHT

+

WEIGHT

@@ -535,28 +559,28 @@ -

TRACE

+

TRACE

-

ACCEL

+

ACCEL

-

OP.90

+

OP.90

-

OP.180

+

OP.180

@@ -566,35 +590,35 @@ -

ANGLE

+

ANGLE

-

BUTTON

+

BUTTON

-

Dual-BUTTON

+

Dual-BUTTON

-

JOYSTICK

+

JOYSTICK

-

CardKB

+

CardKB

@@ -604,49 +628,49 @@ -

EXT.IO

+

EXT.IO

-

DAC

+

DAC

-

RELAY

+

RELAY

-

HUB

+

HUB

-

PaHUB

+

PaHUB

-

PbHUB

+

PbHUB

-

3.96Port

+

3.96Port

@@ -654,7 +678,7 @@ -

M5:bit

+

M5:bit

@@ -662,28 +686,28 @@ -

PROTO

+

PROTO

-

MINI-PROTO

+

MINI-PROTO

-

FAN

+

FAN

-

Vibrator-Motor

+

Vibrator-Motor

**通讯类** @@ -693,35 +717,35 @@ -

IR

+

IR

-

RS485

+

RS485

-

RFID

+

RFID

-

LASER-RX

+

LASER-RX

-

LASER-TX

+

LASER-TX

**C-HAT 类** @@ -731,42 +755,42 @@ -

ENV

+

ENV

-

PIR

+

PIR

-

SPK

+

SPK

-

PROTO

+

PROTO

-

NCIR

+

NCIR

-

Thermal

+

Thermal

@@ -774,7 +798,7 @@ -

RS485

+

RS485

@@ -784,14 +808,14 @@ -

ADC

+

ADC

-

DAC

+

DAC

**视觉类** @@ -802,42 +826,42 @@ -

RGB LED

+

RGB LED

-

CatEar

+

CatEar

-

HEX

+

HEX

-

NeoFlash

+

NeoFlash

-

BUTTERFLY

+

BUTTERFLY

-

RGB

+

RGB

*** @@ -858,35 +882,35 @@ -

BALA

+

BALA

-

LidarBOT

+

LidarBOT

-

PIANO

+

PIANO

-

FLIR

+

FLIR

-

Demo Board

+

Demo Board

*** @@ -902,42 +926,42 @@ -

Grove-T

+

Grove-T

-

Grove Cable

+

Grove Cable

-

GROVE2GROVE

+

GROVE2GROVE

-

SCREW

+

SCREW

-

BUS-Socket

+

BUS-Socket

-

Frame

+

Frame

@@ -945,7 +969,7 @@ -

BATTERY-BASE

+

BATTERY-BASE

@@ -965,28 +989,28 @@ -

CORNER

+

CORNER

-

NUT

+

NUT

-

Connector

+

Connector

-

Aluminium-Profile

+

Aluminium-Profile

@@ -1004,14 +1028,14 @@ -

USB Downloader

+

USB Downloader

-

USB-ISP

+

USB-ISP

diff --git a/docs/zh_CN/module/gsm.md b/docs/zh_CN/module/gsm.md index e3f682fa..c8f40675 100644 --- a/docs/zh_CN/module/gsm.md +++ b/docs/zh_CN/module/gsm.md @@ -59,4 +59,56 @@ >2.下载软件后，双击运行应用程序，将M5设备通过数据线连接至电脑,选择端口参数，点击 **"Burn"** 即可开始烧录 -!>3.EasyLoader烧录前需要安装有CP210X（USB驱动程序），[点击此处查看驱动安装教程](zh_CN/related_documents/M5Burner#安装串口驱动) \ No newline at end of file +!>3.EasyLoader烧录前需要安装有CP210X（USB驱动程序），[点击此处查看驱动安装教程](zh_CN/related_documents/M5Burner#安装串口驱动) + + + +## 例程 + +### Arduino IDE + +*以下代码仅为片段，如需获取完整代码， [请点击此处.](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/GSM/Arduino).* + +```arduino +#include + +void IotWriteCommand(char cmd[],char date[]){ + char buf[256] = {0}; + + if(cmd == NULL) + sprintf(buf,"AT\r\n"); + else if(date == NULL) + sprintf(buf,"AT+%s\r\n",cmd); + else + sprintf(buf,"AT+%s=%s\r\n",cmd,date); + + Serial2.write(buf); +} +//AT+CSQ=? +void get_time(void){ + IotWriteCommand("CSQ=?",NULL); + while(Serial2.available()){ + uint8_t ch = Serial2.read(); + Serial.write(ch); + M5.Lcd.write(ch); + } +} + +void setup() { + M5.begin(); + + Serial.begin(115200); + Serial2.begin(115200, SERIAL_8N1, 16, 17); + pinMode(5, OUTPUT); + digitalWrite(5, 1); +} + +void loop() { + if(M5.BtnA.wasReleased()){ + M5.Lcd.fillScreen(TFT_BLACK); + M5.Lcd.setCursor(60,80,2); + get_time(); + } + M5.update(); +} +``` \ No newline at end of file diff --git a/docs/zh_CN/module/lte.md b/docs/zh_CN/module/lte.md index 2bd26325..7a89d925 100644 --- a/docs/zh_CN/module/lte.md +++ b/docs/zh_CN/module/lte.md @@ -77,4 +77,56 @@ >2.下载软件后，双击运行应用程序，将M5设备通过数据线连接至电脑,选择端口参数，点击 **"Burn"** 即可开始烧录 -!>3.EasyLoader烧录前需要安装有CP210X（USB驱动程序），[点击此处查看驱动安装教程](zh_CN/related_documents/M5Burner#安装串口驱动) \ No newline at end of file +!>3.EasyLoader烧录前需要安装有CP210X（USB驱动程序），[点击此处查看驱动安装教程](zh_CN/related_documents/M5Burner#安装串口驱动) + + + +## 例程 + +### Arduino IDE + +*以下代码仅为片段，如需获取完整代码， [请点击此处.](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/LTE/Arduino).* + +```arduino +#include + +void IotWriteCommand(char cmd[],char date[]){ + char buf[256] = {0}; + + if(cmd == NULL) + sprintf(buf,"AT\r\n"); + else if(date == NULL) + sprintf(buf,"AT+%s\r\n",cmd); + else + sprintf(buf,"AT+%s=%s\r\n",cmd,date); + + Serial2.write(buf); +} + +void get_time(void){ + IotWriteCommand(NULL,NULL); + while(Serial2.available()){ + uint8_t ch = Serial2.read(); + Serial.write(ch); + M5.Lcd.write(ch); + } +} + +void setup() { + M5.begin(); + + Serial.begin(115200); + Serial2.begin(115200, SERIAL_8N1, 16, 17); + pinMode(5, OUTPUT); + digitalWrite(5, 1); +} + +void loop() { + if(M5.BtnA.wasReleased()){ + M5.Lcd.fillScreen(TFT_BLACK); + M5.Lcd.setCursor(60,80,2); + get_time(); + } + M5.update(); +} +``` \ No newline at end of file diff --git a/docs/zh_CN/module/nb-iot.md b/docs/zh_CN/module/nb-iot.md index b1e2d3a4..997cd14e 100644 --- a/docs/zh_CN/module/nb-iot.md +++ b/docs/zh_CN/module/nb-iot.md @@ -78,4 +78,57 @@ >2.下载软件后，双击运行应用程序，将M5设备通过数据线连接至电脑,选择端口参数，点击 **"Burn"** 即可开始烧录 -!>3.EasyLoader烧录前需要安装有CP210X（USB驱动程序），[点击此处查看驱动安装教程](zh_CN/related_documents/M5Burner#安装串口驱动) \ No newline at end of file +!>3.EasyLoader烧录前需要安装有CP210X（USB驱动程序），[点击此处查看驱动安装教程](zh_CN/related_documents/M5Burner#安装串口驱动) + + + +## 例程 + +### Arduino IDE + +*以下代码仅为片段，如需获取完整代码， [请点击此处.](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/NB_IOT/Arduino).* + +```arduino +#include + +void IotWriteCommand(char cmd[],char date[]){ + char buf[256] = {0}; + + if(cmd == NULL) + sprintf(buf,"AT\r\n"); + else if(date == NULL) + sprintf(buf,"AT+%s\r\n",cmd); + else + sprintf(buf,"AT+%s=%s\r\n",cmd,date); + + Serial2.write(buf); +} + +void get_time(void){ + IotWriteCommand("CCLK?",NULL); + while(Serial2.available()){ + uint8_t ch = Serial2.read(); + Serial.write(ch); + M5.Lcd.write(ch); + } +} + +void setup() { + M5.begin(); + + Serial.begin(115200); + Serial2.begin(115200, SERIAL_8N1, 16, 17); + pinMode(5, OUTPUT); + digitalWrite(5, 1); +} + + +void loop() { + if(M5.BtnA.wasReleased()){ + M5.Lcd.fillScreen(TFT_BLACK); + M5.Lcd.setCursor(60,80,2); + get_time(); + } + M5.update(); +} +``` \ No newline at end of file diff --git a/docs/zh_CN/sidebar.md b/docs/zh_CN/sidebar.md index 7cd2f40a..34509013 100644 --- a/docs/zh_CN/sidebar.md +++ b/docs/zh_CN/sidebar.md @@ -39,9 +39,9 @@ LoRaWAN SIM800L COMMU - + NB-IoT BATTERY PROTO PROTO-KIT @@ -252,6 +252,7 @@ NUT Connector Aluminium-Profile + 6060-PUSH