Merge pull request #2 from m5stack/master

pull origin

Author: ShashaDDD

docs/M-BUS.jpg

@@ -0,0 +1,31 @@
+/* 
+ *  You only need to format SPIFFS the first time you run a
+   test or else use the SPIFFS plugin to create a partition
+   https://github.com/me-no-dev/arduino-esp32fs-plugin 
+ * put jpg or bmp file in (<project directory>/data)
+ * Select Tools > ESP32 Sketch Data Upload menu item. This should start uploading the files into ESP32 flash file system.
+*/
+
+#include "FS.h"
+#include "SPIFFS.h"
+#include "M5Stack.h"
+
+void setup(){
+    M5.begin(true, false, false, false);
+    Serial.begin(115200);
+    if(!SPIFFS.begin(true)){
+        Serial.println("SPIFFS Mount Failed");
+        return;
+    }
+    M5.Lcd.drawJpgFile(SPIFFS, "/m5_logo.jpg", 0, 0);
+}
+
+void loop(){
+  M5.update();
+  if(M5.BtnA.wasPressed()) {
+    M5.Lcd.drawBmpFile(SPIFFS, "/pcd.bmp", 0, 0);
+  }
+  if(M5.BtnB.wasPressed()) {
+    M5.Lcd.drawJpgFile(SPIFFS, "/m5_logo.jpg", 0, 0);
+  }
+}

examples/Advanced/Display/Bmp_Jpg_SPIFFS_draw/Bmp_Jpg_SPIFFS_draw.ino

@@ -9,16 +9,13 @@ void setup(){
   // Lcd display
   M5.Lcd.println("This is software power off demo");
   M5.Lcd.println("Press the button A to power off.");
-  
-  // Set the wakeup button
-  M5.setWakeupButton(BUTTON_A_PIN);
 }
 
 // the loop routine runs over and over again forever
 void loop() {
 
   if(M5.BtnA.wasPressed()) {
-    M5.powerOFF();
+    M5.Power.powerOFF();
   }
 
   M5.update();

examples/Advanced/Display/Bmp_Jpg_SPIFFS_draw/data/m5_logo.jpg

@@ -0,0 +1,105 @@
+/*
+  Please add MCP_CAN_LIB to your library first........
+  MCP_CAN_LIB file in M5stack lib examples -> modules -> COMMU -> MCP_CAN_lib.rar
+*/
+
+#include <M5Stack.h>
+#include <mcp_can.h>
+#include "m5_logo.h"
+
+/**
+ * variable for loop
+ */
+
+byte data[8] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
+
+
+/**
+ * variable for CAN
+ */
+long unsigned int rxId;
+unsigned char len = 0;
+unsigned char rxBuf[8];
+char msgString[128];                        // Array to store serial string
+
+#define CAN0_INT 15                              // Set INT to pin 2
+MCP_CAN CAN0(12);                               // Set CS to pin 10
+
+void init_can();
+void test_can();
+
+void setup() {
+  M5.begin();
+  Serial.begin(9600);
+  Serial2.begin(9600, SERIAL_8N1, 16, 17);
+
+  M5.Lcd.pushImage(0, 0, 320, 240, (uint16_t *)gImage_logoM5);
+  delay(500);
+  M5.Lcd.setTextColor(BLACK);
+  // M5.Lcd.setTextSize(1);
+
+  init_can();
+  Serial.println("Test CAN...");
+}
+
+void loop() {
+  if(M5.BtnA.wasPressed())
+  {
+    M5.Lcd.clear();
+    M5.Lcd.printf("CAN Test A!\n");
+    M5.Lcd.pushImage(0, 0, 320, 240, (uint16_t *)gImage_logoM5);
+    init_can();
+    Serial.println("Test CAN...");
+  }
+  test_can();
+  M5.update();
+}
+
+void init_can(){
+  M5.Lcd.setTextSize(1);
+  M5.Lcd.setCursor(0, 10);
+  M5.Lcd.pushImage(0, 0, 320, 240, (uint16_t *)gImage_logoM5);
+  delay(500);
+
+  M5.Lcd.printf("CAN Test A!\n");
+  M5.Lcd.printf("Receive first, then testing for sending function!\n");
+
+  // Initialize MCP2515 running at 16MHz with a baudrate of 500kb/s and the masks and filters disabled.
+  if(CAN0.begin(MCP_ANY, CAN_1000KBPS, MCP_8MHZ) == CAN_OK)
+    Serial.println("MCP2515 Initialized Successfully!");
+  else
+    Serial.println("Error Initializing MCP2515...");
+
+  CAN0.setMode(MCP_NORMAL);                     // Set operation mode to normal so the MCP2515 sends acks to received data.
+
+  pinMode(CAN0_INT, INPUT);                            // Configuring pin for /INT input
+
+  Serial.println("MCP2515 Library Receive Example...");
+}
+
+void test_can(){
+  if(!digitalRead(CAN0_INT))                         // If CAN0_INT pin is low, read receive buffer
+  {
+    CAN0.readMsgBuf(&rxId, &len, rxBuf);      // Read data: len = data length, buf = data byte(s)
+
+    if((rxId & 0x80000000) == 0x80000000)     // Determine if ID is standard (11 bits) or extended (29 bits)
+      sprintf(msgString, "Extended ID: 0x%.8lX  DLC: %1d  Data:", (rxId & 0x1FFFFFFF), len);
+    else
+      sprintf(msgString, "Standard ID: 0x%.3lX       DLC: %1d  Data:", rxId, len);
+
+    Serial.print(msgString);
+    M5.Lcd.printf(msgString);
+    if((rxId & 0x40000000) == 0x40000000){    // Determine if message is a remote request frame.
+      sprintf(msgString, " REMOTE REQUEST FRAME");
+      Serial.print(msgString);
+    } else {
+      for(byte i = 0; i<len; i++){
+        sprintf(msgString, " 0x%.2X", rxBuf[i]);
+        Serial.print(msgString);
+        M5.Lcd.printf(msgString);
+      }
+    }
+    M5.Lcd.printf("\n");
+    Serial.println();
+  }
+}

examples/Advanced/Display/Bmp_Jpg_SPIFFS_draw/data/pcd.bmp

@@ -0,0 +1,81 @@
+/*
+  please add MCP_CAN_LIB to your library first........
+  MCP_CAN_LIB file in M5stack lib examples -> modules -> COMMU -> MCP_CAN_lib.rar
+*/
+
+#include <M5Stack.h>
+#include <mcp_can.h>
+#include "m5_logo.h"
+
+/**
+ * variable for loop
+ */
+
+byte data[8] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
+
+/**
+ * variable for CAN
+ */
+long unsigned int rxId;
+unsigned char len = 0;
+unsigned char rxBuf[8];
+char msgString[128];
+
+#define CAN0_INT 15                              // Set INT to pin 2
+MCP_CAN CAN0(12);     // Set CS to pin 10
+
+void init_can();
+void test_can();
+
+
+void setup() {
+  M5.begin();
+  Serial.begin(9600);
+  Serial2.begin(9600, SERIAL_8N1, 16, 17);
+
+  M5.Lcd.pushImage(0, 0, 320, 240, (uint16_t *)gImage_logoM5);
+  delay(500);
+  M5.Lcd.setTextColor(BLACK);
+  // M5.Lcd.setTextSize(1);
+
+    init_can();
+    Serial.println("Test CAN...");
+}
+
+void loop() {
+  if(M5.BtnA.wasPressed())
+  {
+    M5.Lcd.clear();
+    M5.Lcd.printf("CAN Test B!\n");
+    M5.Lcd.pushImage(0, 0, 320, 240, (uint16_t *)gImage_logoM5);
+    init_can();
+  }
+  test_can();
+  M5.update();
+}
+
+void init_can(){
+  M5.Lcd.setTextSize(1);
+  M5.Lcd.setCursor(0, 10);
+  M5.Lcd.pushImage(0, 0, 320, 240, (uint16_t *)gImage_logoM5);
+  M5.Lcd.printf("CAN Test B!\n");
+
+  // Initialize MCP2515 running at 16MHz with a baudrate of 500kb/s and the masks and filters disabled.
+  if(CAN0.begin(MCP_ANY, CAN_1000KBPS, MCP_8MHZ) == CAN_OK) Serial.println("MCP2515 Initialized Successfully!");
+  else Serial.println("Error Initializing MCP2515...");
+
+  CAN0.setMode(MCP_NORMAL);   // Change to normal mode to allow messages to be transmitted
+}
+
+void test_can(){
+  // send data:  ID = 0x100, Standard CAN Frame, Data length = 8 bytes, 'data' = array of data bytes to send
+  byte sndStat = CAN0.sendMsgBuf(0x100, 0, 8, data);
+  if(sndStat == CAN_OK){
+    Serial.println("Message Sent Successfully!");
+    M5.Lcd.printf("Message Sent Successfully!\n");
+  } else {
+    Serial.println("Error Sending Message...");
+    M5.Lcd.printf("Error Sending Message...\n");
+  }
+  delay(200);   // send data per 200ms
+}