From 826e1aefd507fbd0aba75175dcab1995a7c13128 Mon Sep 17 00:00:00 2001
From: aixiao <aixiao@aixiao.me>
Date: Thu, 6 Jun 2024 09:43:33 +0800
Subject: [PATCH] change directory

---
 .gitmodules                                      |   3 ---
 README.md                                        |   4 ++--
 {SOFTWARE/Server => SERVER}/hc-12/Makefile       |   0
 {SOFTWARE/Server => SERVER}/hc-12/hc-12          | Bin
 {SOFTWARE/Server => SERVER}/hc-12/hc-12.c        |   0
 {SOFTWARE/Server => SERVER}/hc-12/hc-12.conf     |   0
 {SOFTWARE/Server => SERVER}/hc-12/hc-12.h        |   0
 {SOFTWARE/Server => SERVER}/hc-12/mysql.c        |   0
 {SOFTWARE/Server => SERVER}/hc-12/mysql.h        |   0
 {SOFTWARE/Server => SERVER}/hc-12/tables/gas.sql |   0
 10 files changed, 2 insertions(+), 5 deletions(-)
 rename {SOFTWARE/Server => SERVER}/hc-12/Makefile (100%)
 rename {SOFTWARE/Server => SERVER}/hc-12/hc-12 (100%)
 rename {SOFTWARE/Server => SERVER}/hc-12/hc-12.c (100%)
 rename {SOFTWARE/Server => SERVER}/hc-12/hc-12.conf (100%)
 rename {SOFTWARE/Server => SERVER}/hc-12/hc-12.h (100%)
 rename {SOFTWARE/Server => SERVER}/hc-12/mysql.c (100%)
 rename {SOFTWARE/Server => SERVER}/hc-12/mysql.h (100%)
 rename {SOFTWARE/Server => SERVER}/hc-12/tables/gas.sql (100%)

diff --git a/.gitmodules b/.gitmodules
index 2ee3eab..ff9413d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "SOFTWARE/Lib/pico-onewire"]
 	path = SOFTWARE/Lib/pico-onewire
 	url = https://github.com/adamboardman/pico-onewire.git
-[submodule "SOFTWARE/Server/libconf"]
-	path = SOFTWARE/Server/libconf
-	url = https://git.aixiao.me/aixiao/libconf.git
 [submodule "SOFTWARE-FreeRTOS/FreeRTOS-Kernel"]
 	path = SOFTWARE-FreeRTOS/FreeRTOS-Kernel
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
diff --git a/README.md b/README.md
index bf2d1f5..e87f0c0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 基于 Raspberry Pico / Pico W 的厨房危险(火灾)报警  （Pico W WiFi传输暂时不玩）
+# 基于 Raspberry Pico / Pico W (RP2040 FreeRTOS) 的厨房危险(火灾)报警  （Pico W WiFi传输暂时不玩）
 
 * 使用 DS18B20温度传感器  
 * 使用 CH4 N55A甲烷气体传感器(进口) (弃用)  
@@ -36,7 +36,7 @@
     git clone https://github.com/WiringPi/WiringPi.git
     cd WiringPi
     ./build
-    cd ~/Danger-alarm/SOFTWARE/Server/hc-12
+    cd ~/Danger-alarm/SERVER/hc-12
     make clean; make
     ./hc-12
     
diff --git a/SOFTWARE/Server/hc-12/Makefile b/SERVER/hc-12/Makefile
similarity index 100%
rename from SOFTWARE/Server/hc-12/Makefile
rename to SERVER/hc-12/Makefile
diff --git a/SOFTWARE/Server/hc-12/hc-12 b/SERVER/hc-12/hc-12
similarity index 100%
rename from SOFTWARE/Server/hc-12/hc-12
rename to SERVER/hc-12/hc-12
diff --git a/SOFTWARE/Server/hc-12/hc-12.c b/SERVER/hc-12/hc-12.c
similarity index 100%
rename from SOFTWARE/Server/hc-12/hc-12.c
rename to SERVER/hc-12/hc-12.c
diff --git a/SOFTWARE/Server/hc-12/hc-12.conf b/SERVER/hc-12/hc-12.conf
similarity index 100%
rename from SOFTWARE/Server/hc-12/hc-12.conf
rename to SERVER/hc-12/hc-12.conf
diff --git a/SOFTWARE/Server/hc-12/hc-12.h b/SERVER/hc-12/hc-12.h
similarity index 100%
rename from SOFTWARE/Server/hc-12/hc-12.h
rename to SERVER/hc-12/hc-12.h
diff --git a/SOFTWARE/Server/hc-12/mysql.c b/SERVER/hc-12/mysql.c
similarity index 100%
rename from SOFTWARE/Server/hc-12/mysql.c
rename to SERVER/hc-12/mysql.c
diff --git a/SOFTWARE/Server/hc-12/mysql.h b/SERVER/hc-12/mysql.h
similarity index 100%
rename from SOFTWARE/Server/hc-12/mysql.h
rename to SERVER/hc-12/mysql.h
diff --git a/SOFTWARE/Server/hc-12/tables/gas.sql b/SERVER/hc-12/tables/gas.sql
similarity index 100%
rename from SOFTWARE/Server/hc-12/tables/gas.sql
rename to SERVER/hc-12/tables/gas.sql