From 7496e8c8ba762576d4868a86861f354bc3b220fd Mon Sep 17 00:00:00 2001
From: ZodiusInfuser <christopher.parrott2@gmail.com>
Date: Thu, 19 Aug 2021 15:25:12 +0100
Subject: [PATCH] Renamed plasma mp directory to match module name

---
 micropython/modules/micropython.cmake                        | 2 +-
 micropython/modules/{plasma_2040 => plasma}/README.md        | 0
 .../modules/{plasma_2040 => plasma}/micropython.cmake        | 3 +--
 .../modules/{plasma_2040/plasma_2040.c => plasma/plasma.c}   | 2 +-
 .../{plasma_2040/plasma_2040.cpp => plasma/plasma.cpp}       | 5 +++--
 .../modules/{plasma_2040/plasma_2040.h => plasma/plasma.h}   | 0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename micropython/modules/{plasma_2040 => plasma}/README.md (100%)
 rename micropython/modules/{plasma_2040 => plasma}/micropython.cmake (84%)
 rename micropython/modules/{plasma_2040/plasma_2040.c => plasma/plasma.c} (99%)
 rename micropython/modules/{plasma_2040/plasma_2040.cpp => plasma/plasma.cpp} (99%)
 rename micropython/modules/{plasma_2040/plasma_2040.h => plasma/plasma.h} (100%)

diff --git a/micropython/modules/micropython.cmake b/micropython/modules/micropython.cmake
index b982cec6..30044027 100644
--- a/micropython/modules/micropython.cmake
+++ b/micropython/modules/micropython.cmake
@@ -32,5 +32,5 @@ include(pico_unicorn/micropython)
 include(pico_display/micropython)
 include(pico_explorer/micropython)
 include(pico_wireless/micropython)
-include(plasma_2040/micropython)
+include(plasma/micropython)
 include(ulab/code/micropython)
diff --git a/micropython/modules/plasma_2040/README.md b/micropython/modules/plasma/README.md
similarity index 100%
rename from micropython/modules/plasma_2040/README.md
rename to micropython/modules/plasma/README.md
diff --git a/micropython/modules/plasma_2040/micropython.cmake b/micropython/modules/plasma/micropython.cmake
similarity index 84%
rename from micropython/modules/plasma_2040/micropython.cmake
rename to micropython/modules/plasma/micropython.cmake
index 4cd79faf..c16c3cf3 100644
--- a/micropython/modules/plasma_2040/micropython.cmake
+++ b/micropython/modules/plasma/micropython.cmake
@@ -1,4 +1,4 @@
-set(MOD_NAME plasma_2040)
+set(MOD_NAME plasma)
 string(TOUPPER ${MOD_NAME} MOD_NAME_UPPER)
 add_library(usermod_${MOD_NAME} INTERFACE)
 
@@ -14,7 +14,6 @@ pico_generate_pio_header(usermod_${MOD_NAME} ${CMAKE_CURRENT_LIST_DIR}/../../../
 target_include_directories(usermod_${MOD_NAME} INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}
     ${CMAKE_CURRENT_LIST_DIR}/../../../drivers/plasma/
-    ${CMAKE_CURRENT_LIST_DIR}/../../../libraries/plasma2040/
 )
 
 target_compile_definitions(usermod_${MOD_NAME} INTERFACE
diff --git a/micropython/modules/plasma_2040/plasma_2040.c b/micropython/modules/plasma/plasma.c
similarity index 99%
rename from micropython/modules/plasma_2040/plasma_2040.c
rename to micropython/modules/plasma/plasma.c
index 8429f004..795ca5b6 100644
--- a/micropython/modules/plasma_2040/plasma_2040.c
+++ b/micropython/modules/plasma/plasma.c
@@ -1,4 +1,4 @@
-#include "plasma_2040.h"
+#include "plasma.h"
 
 
 /***** Methods *****/
diff --git a/micropython/modules/plasma_2040/plasma_2040.cpp b/micropython/modules/plasma/plasma.cpp
similarity index 99%
rename from micropython/modules/plasma_2040/plasma_2040.cpp
rename to micropython/modules/plasma/plasma.cpp
index ccd3105f..d3d319c0 100644
--- a/micropython/modules/plasma_2040/plasma_2040.cpp
+++ b/micropython/modules/plasma/plasma.cpp
@@ -1,4 +1,5 @@
-#include "libraries/plasma2040/plasma2040.hpp"
+#include "drivers/plasma/ws2812.hpp"
+#include "drivers/plasma/apa102.hpp"
 #include <cstdio>
 
 #define MP_OBJ_TO_PTR2(o, t) ((t *)(uintptr_t)(o))
@@ -11,7 +12,7 @@
 using namespace plasma;
 
 extern "C" {
-#include "plasma_2040.h"
+#include "plasma.h"
 #include "py/builtin.h"
 
 typedef struct _mp_obj_float_t {
diff --git a/micropython/modules/plasma_2040/plasma_2040.h b/micropython/modules/plasma/plasma.h
similarity index 100%
rename from micropython/modules/plasma_2040/plasma_2040.h
rename to micropython/modules/plasma/plasma.h