fixed some bugs

This commit is contained in:
LiHuashen
2019-01-15 18:13:30 +08:00
parent 0f21b275ff
commit f176d329d0
66 changed files with 372 additions and 295 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 222 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 151 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

+50 -1
View File
@@ -1,3 +1,52 @@
# PLC-Base
## (coming soon...)
<img src="assets/img/product_pics/module/module_plc_01.png" width="30%" height="30%"> <img src="assets/img/product_pics/module/module_plc_02.png" width="30%" height="30%">
***
:memo:**[Description](#Description)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:octocat:**[Example](#Example)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:electric_plug:**[Schematic](#Schematic)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;πŸ›’**[Purchase](https://www.aliexpress.com/store/product/M5Stack-PLC-Proto-Industrial-Board-Module-Contains-RS485-ACS712-5B-Programmable-Logic-Controller-Relay-with-Magnet/3226069_32874916056.html?spm=2114.12010615.8148356.2.4c5b68a1WZ8sjd)**
## Description
The M5Stack PLC Module is a prototye industrial board, including RS484
adapter and electricity meter module.
With DC9~24V power input, PLC-Proto motherboard reserved 6Pin or 4Pin
relay output, digital input, communication interface etc.
## Feature
- Free DIY
- Programmable Logic Controller
- Individual package weight: 0.1kg (0.22lb.)
- Package size: 5cm \* 5cm \* 5cm (1.97in \* 1.97in \* 1.97in)
## Include
- 1x PLC-Proto Broad
- 1x RS485 module
- 1x PLC Plastic Enclosure
- 1x Slide Guide
- 1x Magnet
- 1x 6 Pin 3.96 Pitch Terminal
- 1x 4 Pin 3.96 Pitch Terminal
- 3x Hex Key
- 7x Electrical Terminal
- 1x Sticker
## Applications
- Programmable Logic Controller
- Programmable Motion Controller
- Digital Operation Processor
- Strong Electric Controller
## Related Link
- **[Offical Video](https://www.youtube.com/channel/UCozgFVglWYQXbvTmGyS739w)**
- **[Forum](http://forum.m5stack.com/)**
## Schematic
<img src="assets/img/product_pics/base/plc_sch.png">
+48 -42
View File
@@ -1,4 +1,4 @@
# M5Stack LORA Module
# LORA
<img src="assets/img/product_pics/module/module_lora_01.png" width="30%" height="30%"> <img src="assets/img/product_pics/module/module_lora_02.png" width="30%" height="30%"> <img src="assets/img/product_pics/module/module_lora_03.png" width="30%" height="30%">
@@ -54,7 +54,13 @@ account the distance, anti-interference and power consumption
### Arduino IDE
This is point-to-point communication example between two LORA modules. One is transmitter, another is receiver.
This is point-to-point communication example between two LORA modules. Two lora nodes send and receive information to each other.
* If a lora send message successfully, it'll display blue string.
* If a lora receive message from another one successfully, it'll display yellow string.
* If a lora initialize unsuccessfully, it'll display red string.
*If you want the complete code, please click [here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/LORA/Arduino)*
@@ -62,49 +68,49 @@ This is point-to-point communication example between two LORA modules. One is tr
#include <M5Stack.h>
#include <M5LoRa.h>
// declaration
static uint32_t counter;
//declaration
String outgoing; // outgoing message
byte msgCount = 0; // count of outgoing messages
byte localAddress = 0xBB; // address of this device
byte destination = 0xFF; // destination to send to
// initialization
// override the default CS, reset, and IRQ pins (optional)
LoRa.setPins(); // default set CS, reset, IRQ pin
M5.Lcd.println("LoRa Sender");
// frequency in Hz (433E6, 866E6, 915E6)
LoRa.begin(433E6);
// send data
LoRa.beginPacket();
LoRa.print("hello ");
LoRa.print(counter);// lora send data
LoRa.endPacket();
```
```arduino
/*
LoRaReceiver.ino
*/
#include <M5Stack.h>
#include <M5LoRa.h>
// initialization
//initialization
M5.begin();
// override the default CS, reset, and IRQ pins (optional)
LoRa.setPins();// default set CS, reset, IRQ pin
// frequency in Hz (433E6, 866E6, 915E6)
LoRa.begin(433E6);
LoRa.setPins(); // set CS, reset, IRQ pin
LoRa.begin(433E6); // initialize ratio at 915 MHz
// try to parse packet
int packetSize = LoRa.parsePacket();
if (packetSize) {
// read packet
while (LoRa.available()) {
char ch = (char)LoRa.read();
M5.Lcd.print(ch);
}
// print RSSI of packet
M5.Lcd.print("\" with RSSI ");
M5.Lcd.println(LoRa.packetRssi());
//send message
void sendMessage(String outgoing) {
LoRa.beginPacket(); // start packet
LoRa.write(destination); // add destination address
LoRa.write(localAddress); // add sender address
LoRa.write(msgCount); // add message ID
LoRa.write(outgoing.length()); // add payload length
LoRa.print(outgoing); // add payload
LoRa.endPacket(); // finish packet and send it
msgCount++; // increment message ID
}
//receive message
void onReceive(int packetSize) {
if (packetSize == 0) return; // if there's no packet, return
int recipient = LoRa.read(); // recipient address
byte sender = LoRa.read(); // sender address
byte incomingMsgId = LoRa.read(); // incoming msg ID
byte incomingLength = LoRa.read(); // incoming msg length
String incoming = "";
while (LoRa.available()) {
incoming += (char)LoRa.read();
}
}
onReceive(LoRa.parsePacket());
```
<img src="assets/img/product_pics/module/module_example/LORA/example_module_lora_01.png">
<img src="assets/img/product_pics/module/module_example/LORA/example_module_lora_02.png">
## Schematic
<img src="assets/img/product_pics/module/lora_sch.png">
+3 -5
View File
@@ -4,9 +4,7 @@
***
:memo:**[Description](#Description)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:octocat:**[Example](#Example)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;πŸ›’**[Purchase](https://www.aliexpress.com/store/product/M5Stack-New-LoRaWAN-Module-433-470Mhz-868-915MHz-with-Internal-Antenna-and-MCX-External-Antenna-Port/3226069_32953098569.html?spm=a2g1y.12024536.productList_5885011.pic_2)**
<!-- :memo:**[Description](#Description)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:octocat:**[Example](#Example)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:electric_plug:**[Schematic](#Schematic)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;πŸ›’**[Purchase](https://www.aliexpress.com/store/product/M5Stack-New-LoRaWAN-Module-433-470Mhz-868-915MHz-with-Internal-Antenna-and-MCX-External-Antenna-Port/3226069_32953098569.html?spm=a2g1y.12024536.productList_5885011.pic_2)** -->
:memo:**[Description](#Description)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:octocat:**[Example](#Example)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:electric_plug:**[Schematic](#Schematic)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;πŸ›’**[Purchase](https://www.aliexpress.com/store/product/M5Stack-New-LoRaWAN-Module-433-470Mhz-868-915MHz-with-Internal-Antenna-and-MCX-External-Antenna-Port/3226069_32953098569.html?spm=a2g1y.12024536.productList_5885011.pic_2)**
## Description
@@ -132,6 +130,6 @@ void loop() {
}
```
<!-- ## Schematic -->
## Schematic
<!-- <img src="assets/img/product_pics/module/gps_sch.png"> -->
<img src="assets/img/product_pics/module/lorawan_sch.png">
+8 -6
View File
@@ -1,12 +1,10 @@
# M5Stack PLUS
# PLUS
<img src="assets/img/product_pics/module/module_plus_01.png" width="30%" height="30%"> <img src="assets/img/product_pics/module/module_plus_02.png" width="30%" height="30%">
***
:memo:**[Description](#Description)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:octocat:**[Example](#Example)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;πŸ›’**[Purchase](https://www.aliexpress.com/store/product/M5Stack-New-Arrival-PLUS-Module-Encoder-Module-with-MEGA328P-500mAh-Battery-ISP-IR-Transmitter-UART-GPIO/3226069_32949278724.html?spm=a2g1x.12024536.productList_5885013.pic_1)**
<!-- :memo:**[Description](#Description)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:octocat:**[Example](#Example)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:electric_plug:**[Schematic](#Schematic)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;πŸ›’**[Purchase](https://www.aliexpress.com/store/product/M5Stack-New-Arrival-PLUS-Module-Encoder-Module-with-MEGA328P-500mAh-Battery-ISP-IR-Transmitter-UART-GPIO/3226069_32949278724.html?spm=a2g1x.12024536.productList_5885013.pic_1)** -->
:memo:**[Description](#Description)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:octocat:**[Example](#Example)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:electric_plug:**[Schematic](#Schematic)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;πŸ›’**[Purchase](https://www.aliexpress.com/store/product/M5Stack-New-Arrival-PLUS-Module-Encoder-Module-with-MEGA328P-500mAh-Battery-ISP-IR-Transmitter-UART-GPIO/3226069_32949278724.html?spm=a2g1x.12024536.productList_5885013.pic_1)**
## Description
@@ -33,7 +31,7 @@ This a enhanced module including battery(500mAh), gear potentiometer, IR transmi
## Example
### 1. Arduino IDE
### Arduino IDE
*The below code `plus_read_encoder.ino` is incomplete(just for usage). If you want the complete code, please click [here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/PLUS/Arduino).*
@@ -70,4 +68,8 @@ while(Wire.available()) {
press = 1;//encoder was releaed
}
}
```
```
## Schematic
<img src="assets/img/product_pics/module/plus_sch.png">
+4 -4
View File
@@ -4,9 +4,7 @@
***
:memo:**[Description](#Description)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:octocat:**[Example](#Example)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;πŸ›’**[Purchase](https://www.aliexpress.com/store/product/M5Stack-New-SERVO-Module-Board-12-Channels-Servo-Controller-with-MEGA328-Inside-Power-Adapter-6-24V/3226069_32951356502.html?spm=a2g1y.12024536.productList_5885011.pic_0)**
<!-- :memo:**[Description](#Description)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:octocat:**[Example](#Example)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:electric_plug:**[Schematic](#Schematic)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;πŸ›’**[Purchase](https://www.aliexpress.com/store/product/M5Stack-New-SERVO-Module-Board-12-Channels-Servo-Controller-with-MEGA328-Inside-Power-Adapter-6-24V/3226069_32951356502.html?spm=a2g1y.12024536.productList_5885011.pic_0)** -->
:memo:**[Description](#Description)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:octocat:**[Example](#Example)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:electric_plug:**[Schematic](#Schematic)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;πŸ›’**[Purchase](https://www.aliexpress.com/store/product/M5Stack-New-SERVO-Module-Board-12-Channels-Servo-Controller-with-MEGA328-Inside-Power-Adapter-6-24V/3226069_32951356502.html?spm=a2g1y.12024536.productList_5885011.pic_0)**
## Description
@@ -67,4 +65,6 @@ Wire.write(angle);//0-180Β°
Wire.endTransmission();
```
<!-- ## Schematic -->
## Schematic
<img src="assets/img/product_pics/module/servo_sch.png">

Some files were not shown because too many files have changed in this diff Show More