From 8707aa2ca372db26fcbd4ef01c94c8f97364fa63 Mon Sep 17 00:00:00 2001
From: free-x <oroitburd@gmail.com>
Date: Wed, 27 Oct 2021 07:33:02 +0200
Subject: [PATCH 1/4] Add M5StickC+ Again

---
 platformio.ini | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/platformio.ini b/platformio.ini
index c9a569f..70fbdfd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -33,3 +33,10 @@ board = m5stack-atom
 lib_deps =
         ${env.lib_deps}
 build_flags = -D BOARD_M5ATOM_CANUNIT
+
+[env:m5stickc-atom-canunit]
+board = m5stack-atom
+lib_deps =
+        ${env.lib_deps}
+build_flags = -D BOARD_M5ATOM_CANUNIT -D HAS_RTC -D HAS_M5LCD
+

From d4f6b03338b8b0cfb6d24b8d9e04e00540d2bcbc Mon Sep 17 00:00:00 2001
From: free-x <oroitburd@gmail.com>
Date: Wed, 27 Oct 2021 07:36:47 +0200
Subject: [PATCH 2/4] Fix BOARD_M5STICK_CANUNIT

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 70fbdfd..8aff9ca 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -38,5 +38,5 @@ build_flags = -D BOARD_M5ATOM_CANUNIT
 board = m5stack-atom
 lib_deps =
         ${env.lib_deps}
-build_flags = -D BOARD_M5ATOM_CANUNIT -D HAS_RTC -D HAS_M5LCD
+build_flags = -D BOARD_M5STICK_CANUNIT -D HAS_RTC -D HAS_M5LCD
 

From e5eb96cc20a75401df2cb92fda196aa69a3a153b Mon Sep 17 00:00:00 2001
From: free-x <oroitburd@gmail.com>
Date: Wed, 27 Oct 2021 09:03:04 +0200
Subject: [PATCH 3/4] Add udev rule for esp32. Fix upload_port for new boards

---
 platformio.ini            | 3 ++-
 tools/99-usb-serial.rules | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 tools/99-usb-serial.rules

diff --git a/platformio.ini b/platformio.ini
index 8aff9ca..1a75656 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -33,10 +33,11 @@ board = m5stack-atom
 lib_deps =
         ${env.lib_deps}
 build_flags = -D BOARD_M5ATOM_CANUNIT
+upload_port = /dev/esp32
 
 [env:m5stickc-atom-canunit]
 board = m5stack-atom
 lib_deps =
         ${env.lib_deps}
 build_flags = -D BOARD_M5STICK_CANUNIT -D HAS_RTC -D HAS_M5LCD
-
+upload_port = /dev/esp32
diff --git a/tools/99-usb-serial.rules b/tools/99-usb-serial.rules
new file mode 100644
index 0000000..f1f7573
--- /dev/null
+++ b/tools/99-usb-serial.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="tty", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", SYMLINK+="esp32"

From a4e3d19890eb39a5dd9837a0d3e1fff8aed997e5 Mon Sep 17 00:00:00 2001
From: free-x <oroitburd@gmail.com>
Date: Sat, 30 Oct 2021 09:20:25 +0200
Subject: [PATCH 4/4] Better definition of m5 stick and upload protocol

---
 platformio.ini | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 692389f..d5743dd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -32,6 +32,7 @@ build_flags =
 	-D BOARD_M5ATOM
 	${env.build_flags}
 upload_port = /dev/esp32
+upload_protocol = esptool
 
 [env:m5stack-atom-canunit]
 board = m5stack-atom
@@ -41,12 +42,14 @@ build_flags =
   -D BOARD_M5ATOM_CANUNIT
   ${env.build_flags}
 upload_port = /dev/esp32
+upload_protocol = esptool
 
 [env:m5stickc-atom-canunit]
-board = m5stack-atom
+board = m5stick-c
 lib_deps =
         ${env.lib_deps}
 build_flags = 
   -D BOARD_M5STICK_CANUNIT -D HAS_RTC -D HAS_M5LCD
   ${env.build_flags}
 upload_port = /dev/esp32
+upload_protocol = esptool