From 19329c920f375f152ead6f295d2bdf4f55d7ee3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A1=A9=E5=85=A5=E5=AD=94=E7=AB=A0?= Date: Thu, 27 Dec 2018 16:13:35 +0800 Subject: [PATCH 1/2] fix bugs --- docs/index.html | 3 +- docs/ja/README.md | 16 ++++---- docs/ja/base/btc_base.md | 81 +++++++++++++++++++++++++++++++++++++++ docs/ja/base/lan_base.md | 4 +- docs/ja/base/node_base.md | 4 +- docs/ja/module/commu.md | 2 +- docs/ja/module/lora.md | 2 +- docs/ja/module/lorawan.md | 2 +- docs/ja/module/proto.md | 4 +- docs/ja/module/sim800.md | 2 +- docs/ja/unit/dac.md | 15 ++------ docs/ja/unit/env.md | 11 ++---- docs/ja/unit/ir.md | 2 +- docs/ja/unit/joystick.md | 2 +- docs/ja/unit/light.md | 2 +- docs/ja/unit/makey.md | 2 +- docs/ja/unit/ncir.md | 2 +- docs/ja/unit/neopixel.md | 2 +- docs/ja/unit/pir.md | 2 +- docs/ja/unit/relay.md | 4 +- docs/ja/unit/rgb.md | 2 +- docs/ja/unit/thermal.md | 2 +- docs/ja/unit/tof.md | 2 +- 23 files changed, 122 insertions(+), 48 deletions(-) create mode 100644 docs/ja/base/btc_base.md diff --git a/docs/index.html b/docs/index.html index 5b286061..9fd3f91e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -92,7 +92,8 @@ - + + diff --git a/docs/ja/README.md b/docs/ja/README.md index 19594cda..20e9cfd0 100644 --- a/docs/ja/README.md +++ b/docs/ja/README.md @@ -26,9 +26,7 @@ **通信モジュール** - - -[![module_lora.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_lora_01.png)](ja/module/lora)         [![module_lorawan.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_lorawan_01.png)](ja/module/lorawan)         [![module_sim800.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_sim800_01.png)](ja/module/sim800) +[![module_gps.png](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_gps_01.png)](ja/module/gps)         [![module_lora.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_lora_01.png)](ja/module/lora)         [![module_lorawan.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_lorawan_01.png)](ja/module/lorawan)         [![module_sim800.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_sim800_01.png)](ja/module/sim800) [![module_commu.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_commu_01.png)](ja/module/commu)         [![module_usb.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_usb_01.png)](ja/module/usb) @@ -42,16 +40,20 @@ **駆動モジュール** -[![stepmotor_01.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_stepmotor_01.png)](ja/module/stepmotor)         [![servo_01.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_servo_01.png)](ja/module/servo)          +[![stepmotor_01.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_stepmotor_01.png)](ja/module/stepmotor)         [![servo_01.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_servo_01.png)](ja/module/servo)         [![lego+_01.jpg](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/module/module_lego_plus_01.png)](ja/module/lego_plus) - - - + *** +[![lan_01.png](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/base/base_lan_01.png)](ja/base/lan_base)         [![node_01.png](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/base/base_node_01.png)](ja/base/node_base)         [![btc_01.png](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/base/base_btc_01.png)](ja/base/btc_base) + +*** + + + [![unit_m5camera.png](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/unit/unit_m5camera_01.png)](ja/unit/m5camera) [![unit_env.png](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/unit/unit_env_01.png)](ja/unit/env)         [![unit_ir.png](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/unit/unit_ir_01.png)](ja/unit/ir)         [![unit_pir.png](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/unit/unit_pir_01.png)](ja/unit/pir)         [![unit_angle.png](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/unit/unit_angle_01.png)](ja/unit/angle) diff --git a/docs/ja/base/btc_base.md b/docs/ja/base/btc_base.md new file mode 100644 index 00000000..f52545a9 --- /dev/null +++ b/docs/ja/base/btc_base.md @@ -0,0 +1,81 @@ +# BTC Base + + + + + +*** + +:memo:**[Description](#Description)**      :octocat:**[Example](#Example)**      🛒**[Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-Stock-Offer-GPS-Module-with-Internal-External-Antenna-MCX-Interface-IoT-Development-Board-for/3226069_32840757048.html?spm=2114.12010615.8148356.2.7c6c2743BZthY3)** + + + +# Description + +The M5Stack BTC Module is a base including DHT12 module which can detect +temperature and humidity. Your M5Stack Core board can stay as a small +displayer(like a small TV or a small IOT central contronller) after +adding this BTC Module. Absolutely, it is more easier to charge M5Stack +Core via Type-C Cable after adding this BTC Module. + +# Feature + +- DHT12 inside + +# Include + +- Type-C USB Cable +- M3 x 16 +- Tools + +# PinMap + +**DHT12** + +| DHT12 | ESP32 | +| :----------: |:------------:| +| SCL | G22 | +| GND | GND | +| SDA | G21 | +| 3V3 | 3V3 | + + + + +# Related Link + +- **[Offical Video](https://www.youtube.com/channel/UCozgFVglWYQXbvTmGyS739w)** + +- **[Forum](http://forum.m5stack.com/)** + +## Example + +### Arduino IDE + +```arduino +#include +#include "DHT12.h" +#include //The DHT12 uses I2C comunication. + +void setup() { + M5.begin(); + Wire.begin(); + M5.Lcd.setBrightness(10); + Serial.println(F("ENV Unit(DHT12 and BMP280) test...")); +} + +void loop() { + float tmp = dht12.readTemperature(); + float hum = dht12.readHumidity(); + Serial.printf("Temperatura: %2.2f*C Humedad: %0.2f%%\r\n", tmp, hum); + + M5.Lcd.setCursor(0, 0); + M5.Lcd.setTextColor(WHITE, BLACK); + M5.Lcd.setTextSize(3); + M5.Lcd.printf("Temp: %2.1f \r\nHumi: %2.0f%% \r\n", tmp, hum); + + delay(100); +} +``` + +For specific example `BTC.ino`, click [here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Base/BTC/Arduino) please. \ No newline at end of file diff --git a/docs/ja/base/lan_base.md b/docs/ja/base/lan_base.md index 4d290564..d9a6e519 100644 --- a/docs/ja/base/lan_base.md +++ b/docs/ja/base/lan_base.md @@ -42,7 +42,7 @@ M5Stackの無線通信が遅かったり、無線ネットワークに繋がら - **GitHub** - [M5Stack](https://github.com/m5stack/M5Stack) -
+ ## 関連情報 diff --git a/docs/ja/base/node_base.md b/docs/ja/base/node_base.md index 337268c3..7453eb20 100644 --- a/docs/ja/base/node_base.md +++ b/docs/ja/base/node_base.md @@ -43,7 +43,7 @@ - **サンプルコード** - [Arduino](https://github.com/m5stack/M5StackModule-Node/tree/master/example) -
+ ## 関連情報 diff --git a/docs/ja/module/commu.md b/docs/ja/module/commu.md index 021ec95a..3c8f0ac0 100644 --- a/docs/ja/module/commu.md +++ b/docs/ja/module/commu.md @@ -54,4 +54,4 @@ ## 回路図 - \ No newline at end of file + \ No newline at end of file diff --git a/docs/ja/module/lora.md b/docs/ja/module/lora.md index 6b4e8c22..8f60c0e8 100644 --- a/docs/ja/module/lora.md +++ b/docs/ja/module/lora.md @@ -53,4 +53,4 @@ LoRa™は少ない消費電力で広いエリアをカバーする無線通信 ## 回路図 - + diff --git a/docs/ja/module/lorawan.md b/docs/ja/module/lorawan.md index 5eb98ec7..2a137f84 100644 --- a/docs/ja/module/lorawan.md +++ b/docs/ja/module/lorawan.md @@ -55,4 +55,4 @@ ## 回路図 - \ No newline at end of file + \ No newline at end of file diff --git a/docs/ja/module/proto.md b/docs/ja/module/proto.md index d7cf79bd..503b67e4 100644 --- a/docs/ja/module/proto.md +++ b/docs/ja/module/proto.md @@ -63,7 +63,7 @@ - **GitHub** - [M5Stack](https://github.com/m5stack/M5Stack) -### Kit + ## 関連情報 diff --git a/docs/ja/module/sim800.md b/docs/ja/module/sim800.md index 32df3489..fc326b68 100644 --- a/docs/ja/module/sim800.md +++ b/docs/ja/module/sim800.md @@ -25,7 +25,7 @@ M5Stackシリーズのコアを使用し、Blockly、Arduino、MicroPythonでプ - 低消費電力で通話、SMS、データ通信が可能 - Bluetooth と Embedded AT -## ピンマッピング +## ピンマップ *After SIM800 was stacked with M5Core, they communicat through UART2* diff --git a/docs/ja/unit/dac.md b/docs/ja/unit/dac.md index 91e7bc5d..c8e9ce67 100644 --- a/docs/ja/unit/dac.md +++ b/docs/ja/unit/dac.md @@ -1,6 +1,10 @@ # DAC ユニット + +*** + +:memo:**[概要](#概要)**      :octocat:**[サンプルコード](#サンプルコード)**      🛒**[購入リンク](https://www.aliexpress.com/item/M5Stack-DAC-MCP4725-I2C-Dac-12-0/32947696641.html)** ## 概要 @@ -25,14 +29,3 @@ - **データシート** - [MCP4725](http://pdf1.alldatasheet.com/datasheet-pdf/view/233449/MICROCHIP/MCP4725.html) - -
- M5GO_Unit_dac -
-
- M5GO_Unit_dac_02 -
- -## 関連情報 - -- [DAC ユニット 購入(AliExpress)](https://www.aliexpress.com/store/product/M5Stack-DAC-MCP4725-I2C-Dac-12-0/3226069_32947696641.html) \ No newline at end of file diff --git a/docs/ja/unit/env.md b/docs/ja/unit/env.md index e7acac3b..19f7e73d 100644 --- a/docs/ja/unit/env.md +++ b/docs/ja/unit/env.md @@ -41,12 +41,9 @@ -### ピンマッピング +### ピンマップ -M5Core(GROVE A)GPIO22GPIO215VGND + + -
M5Core(GROVE A)GPIO22GPIO215VGND
ENV UnitSCLSDA5VGND
- - - - + \ No newline at end of file diff --git a/docs/ja/unit/ir.md b/docs/ja/unit/ir.md index 92ad04e0..19530dfc 100644 --- a/docs/ja/unit/ir.md +++ b/docs/ja/unit/ir.md @@ -27,7 +27,7 @@ -### ピンマッピング +### ピンマップ diff --git a/docs/ja/unit/joystick.md b/docs/ja/unit/joystick.md index 97b1f918..2df22099 100644 --- a/docs/ja/unit/joystick.md +++ b/docs/ja/unit/joystick.md @@ -25,7 +25,7 @@ -### ピンマッピング +### ピンマップ
M5Core(GROVE B)GPIO36GPIO265VGND
diff --git a/docs/ja/unit/light.md b/docs/ja/unit/light.md index cb7b0302..1ed9c741 100644 --- a/docs/ja/unit/light.md +++ b/docs/ja/unit/light.md @@ -28,7 +28,7 @@ -### ピンマッピング +### ピンマップ
M5Core(GROVE A)GPIO22GPIO215VGND
diff --git a/docs/ja/unit/makey.md b/docs/ja/unit/makey.md index ff0e81cb..64f8fa73 100644 --- a/docs/ja/unit/makey.md +++ b/docs/ja/unit/makey.md @@ -36,7 +36,7 @@ -### ピンマッピング +### ピンマップ
M5Core(GROVE B)GPIO36GPIO265VGND
diff --git a/docs/ja/unit/ncir.md b/docs/ja/unit/ncir.md index 00223382..a885f94f 100644 --- a/docs/ja/unit/ncir.md +++ b/docs/ja/unit/ncir.md @@ -32,7 +32,7 @@ -### ピンマッピング +### ピンマップ
M5Core(GROVE A)GPIO22GPIO215VGND
diff --git a/docs/ja/unit/neopixel.md b/docs/ja/unit/neopixel.md index b9eac79a..215c5185 100644 --- a/docs/ja/unit/neopixel.md +++ b/docs/ja/unit/neopixel.md @@ -27,7 +27,7 @@ -### ピンマッピング +### ピンマップ
M5Core(GROVE A)GPIO22GPIO215VGND
diff --git a/docs/ja/unit/pir.md b/docs/ja/unit/pir.md index af22a765..6cfa1c02 100644 --- a/docs/ja/unit/pir.md +++ b/docs/ja/unit/pir.md @@ -26,7 +26,7 @@ -### ピンマッピング +### ピンマップ
M5Core(GROVE A)GPIO22GPIO215VGND
diff --git a/docs/ja/unit/relay.md b/docs/ja/unit/relay.md index e8e43383..89f67c30 100644 --- a/docs/ja/unit/relay.md +++ b/docs/ja/unit/relay.md @@ -32,7 +32,7 @@ -### ピンマッピング +### ピンマップ
M5Core(GROVE B)GPIO36GPIO265VGND
@@ -47,4 +47,4 @@ ## 関連動画 - \ No newline at end of file + \ No newline at end of file diff --git a/docs/ja/unit/rgb.md b/docs/ja/unit/rgb.md index c309417f..ba947d82 100644 --- a/docs/ja/unit/rgb.md +++ b/docs/ja/unit/rgb.md @@ -25,7 +25,7 @@ -### ピンマッピング +### ピンマップ
M5Core(GROVE B)GPIO36GPIO265VGND
diff --git a/docs/ja/unit/thermal.md b/docs/ja/unit/thermal.md index d5f2e725..33aee4c3 100644 --- a/docs/ja/unit/thermal.md +++ b/docs/ja/unit/thermal.md @@ -34,7 +34,7 @@ -### ピンマッピング +### ピンマップ
M5Core(GROVE B)GPIO36GPIO265VGND
diff --git a/docs/ja/unit/tof.md b/docs/ja/unit/tof.md index be901e9f..2d77026f 100644 --- a/docs/ja/unit/tof.md +++ b/docs/ja/unit/tof.md @@ -36,7 +36,7 @@ -### ピンマッピング +### ピンマップ
M5Core(GROVE A)GPIO22GPIO215VGND
From e57a607bd99b6b43e019e53684865c4066549c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A1=A9=E5=85=A5=E5=AD=94=E7=AB=A0?= Date: Thu, 27 Dec 2018 16:41:57 +0800 Subject: [PATCH 2/2] add ja btc base --- docs/ja/base/btc_base.md | 47 ++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/docs/ja/base/btc_base.md b/docs/ja/base/btc_base.md index f52545a9..067a5f4e 100644 --- a/docs/ja/base/btc_base.md +++ b/docs/ja/base/btc_base.md @@ -1,4 +1,4 @@ -# BTC Base +# BTC ベース @@ -6,56 +6,51 @@ *** -:memo:**[Description](#Description)**      :octocat:**[Example](#Example)**      🛒**[Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-Stock-Offer-GPS-Module-with-Internal-External-Antenna-MCX-Interface-IoT-Development-Board-for/3226069_32840757048.html?spm=2114.12010615.8148356.2.7c6c2743BZthY3)** +:memo:**[概要](#概要)**      :octocat:**[サンプルコード](#サンプルコード)**      🛒**[購入リンク](https://www.aliexpress.com/store/product/M5Stack-Official-Stock-Offer-GPS-Module-with-Internal-External-Antenna-MCX-Interface-IoT-Development-Board-for/3226069_32840757048.html?spm=2114.12010615.8148356.2.7c6c2743BZthY3)** -# Description +# 概要 -The M5Stack BTC Module is a base including DHT12 module which can detect -temperature and humidity. Your M5Stack Core board can stay as a small -displayer(like a small TV or a small IOT central contronller) after -adding this BTC Module. Absolutely, it is more easier to charge M5Stack -Core via Type-C Cable after adding this BTC Module. +BTCベースはDHT12を内蔵しており、周囲の温度、湿度を検出することが可能です。あなたのM5StackとBTCベースを組み合わせて、情報表示ボード、小型のIoT集中制御デバイスとして置いておくことができます。付属のUSB Type-Cケーブルを利用することで、ベース経由でM5Stackを充電することができます。 -# Feature +# 特徴 -- DHT12 inside +- DHT12内蔵 -# Include +# パッケージ内容 -- Type-C USB Cable -- M3 x 16 -- Tools +- USB Type-C ケーブル +- M3 x 16 ネジ +- ツール -# PinMap +# ピンマップ **DHT12** -| DHT12 | ESP32 | -| :----------: |:------------:| -| SCL | G22 | -| GND | GND | -| SDA | G21 | -| 3V3 | 3V3 | +| DHT12 | ESP32 | +|:------:|:------:| +| SCL | G22 | +| GND | GND | +| SDA | G21 | +| 3V3 | 3V3 | - -# Related Link +# ドキュメント - **[Offical Video](https://www.youtube.com/channel/UCozgFVglWYQXbvTmGyS739w)** - **[Forum](http://forum.m5stack.com/)** -## Example +## サンプルコード ### Arduino IDE ```arduino #include #include "DHT12.h" -#include //The DHT12 uses I2C comunication. +#include // DHT12とのI2C通信で使用 void setup() { M5.begin(); @@ -78,4 +73,4 @@ void loop() { } ``` -For specific example `BTC.ino`, click [here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Base/BTC/Arduino) please. \ No newline at end of file +`BTC.ino`サンプルは[こちら](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Base/BTC/Arduino)から。 \ No newline at end of file
M5Core(GROVE A)GPIO22GPIO215VGND