diff --git a/APP_Framework/Applications/app_test/Kconfig b/APP_Framework/Applications/app_test/Kconfig index 55f0ad243..c978db145 100644 --- a/APP_Framework/Applications/app_test/Kconfig +++ b/APP_Framework/Applications/app_test/Kconfig @@ -240,8 +240,49 @@ menu "test app" bool "Config test soft timer" default n + menuconfig USER_TEST_HASH + bool "Config test hash" + default n + + menuconfig USER_TEST_RADIX + bool "Config test radix tree" + default n + + menuconfig USER_TEST_RBTREE + bool "Config test red black tree" + default n + menuconfig USER_TEST_MODBUS_TCP bool "Config test modbus_tcp" default n + + menuconfig USER_TEST_WEBSERVER + bool "Config test webserver" + default n + + menuconfig USER_TEST_MQTTCLIENT + bool "Config test mqtt client" + default n + + menuconfig USER_TEST_FTPCLIENT + bool "Config test ftp client" + default n + + menuconfig USER_TEST_LORA_P2P + bool "Config test lora p2p" + default n + + menuconfig USER_TEST_LORAWAN_SINGLEGW + bool "Config test lorawan single channel gateway" + default n + + menuconfig USER_TEST_CANOPEN + bool "Config test CanOpen" + default n + + menuconfig USER_TEST_USB_CAMERA + bool "Config test usb camera" + default n + endif endmenu diff --git a/APP_Framework/Applications/app_test/Makefile b/APP_Framework/Applications/app_test/Makefile index b4408d781..47e42af7c 100644 --- a/APP_Framework/Applications/app_test/Makefile +++ b/APP_Framework/Applications/app_test/Makefile @@ -99,11 +99,51 @@ ifeq ($(CONFIG_ADD_XIZI_FEATURES),y) ifeq ($(CONFIG_USER_TEST_TIMER),y) SRC_FILES += test_timer.c + endif + + ifeq ($(CONFIG_USER_TEST_HASH),y) + SRC_FILES += test_hash/test_hash.c + endif + + ifeq ($(CONFIG_USER_TEST_RADIX),y) + SRC_FILES += test_radix_tree/test_radix_tree.c + endif + + ifeq ($(CONFIG_USER_TEST_RBTREE),y) + SRC_FILES += test_rbtree/test_rbtree.c endif ifeq ($(CONFIG_USER_TEST_MODBUS_TCP),y) SRC_DIR += test_modbus_tcp + endif + + ifeq ($(CONFIG_USER_TEST_WEBSERVER),y) + SRC_FILES += + endif + + ifeq ($(CONFIG_USER_TEST_MQTTCLIENT),y) + SRC_FILES += + endif + + ifeq ($(CONFIG_USER_TEST_FTPCLIENT),y) + SRC_FILES += + endif + + ifeq ($(CONFIG_USER_TEST_LORA_P2P),y) + SRC_FILES += + endif + + ifeq ($(CONFIG_USER_TEST_LORAWAN_SINGLEGW),y) + SRC_FILES += + endif + + ifeq ($(CONFIG_USER_TEST_CANOPEN),y) + SRC_FILES += endif + ifeq ($(CONFIG_USER_TEST_USB_CAMERA),y) + SRC_FILES += + endif + include $(KERNEL_ROOT)/compiler.mk endif diff --git a/APP_Framework/Applications/app_test/test_gpio.c b/APP_Framework/Applications/app_test/test_gpio.c index 16bbfbb89..6e53c1999 100644 --- a/APP_Framework/Applications/app_test/test_gpio.c +++ b/APP_Framework/Applications/app_test/test_gpio.c @@ -25,7 +25,7 @@ #ifdef BOARD_EDU_RISCV64_EVB #define BSP_LED_PIN 29 #define BSP_KEY_PIN 31 -#elif defined BOARD_HC32F4A0_EVB +#elif defined BOARD_EDU_ARM32_EVB #define BSP_LED_PIN 134 #define BSP_KEY_PIN 176 #endif diff --git a/APP_Framework/Applications/app_test/test_hash/CompileSuccess.png b/APP_Framework/Applications/app_test/test_hash/CompileSuccess.png new file mode 100644 index 000000000..04caae4d1 Binary files /dev/null and b/APP_Framework/Applications/app_test/test_hash/CompileSuccess.png differ diff --git a/APP_Framework/Applications/app_test/test_hash/ConfigOpen.png b/APP_Framework/Applications/app_test/test_hash/ConfigOpen.png new file mode 100644 index 000000000..b62acec61 Binary files /dev/null and b/APP_Framework/Applications/app_test/test_hash/ConfigOpen.png differ diff --git a/APP_Framework/Applications/app_test/test_hash/README.md b/APP_Framework/Applications/app_test/test_hash/README.md new file mode 100644 index 000000000..876cd5d08 --- /dev/null +++ b/APP_Framework/Applications/app_test/test_hash/README.md @@ -0,0 +1,58 @@ +# 基于cortex-m3-emulator实现哈希表并测试验证## + +## 1. 简介 +利用c语言实现了哈希表(HashMap),包括添加键值对(Put),获取键对应的值(Get), 删除健(Delete),清空哈希表(Clear), 迭代遍历哈希表(hashMapIterator)等功能 +操作。 + +利用数组(Entry)作为存储空间,利用链表(*next)解决冲突。当哈希表的大小超过数组大小后,为避免发生冲突过多的情况,可以对哈希表扩容。 + +## 2. 数据结构设计说明 +键值对结构 +typedef struct entry { + void * key; // 键 + void * value; // 值 + struct entry * next; // 冲突链表 +}*Entry; + +哈希结构 +typedef struct hashMap { + int size; // 当前大小 + int listSize; // 有效空间大小 + HashCode hashCode; // 哈希函数 + Equal equal; // 判等函数 + Entry list; // 存储区域 + Put put; // 添加键的函数 + Get get; // 获取键对应值的函数 + Remove remove; // 删除键 + Clear clear; // 清空Map + Exists exists; // 判断键是否存在 + Boolean autoAssign; // 设定是否根据当前数据量动态调整内存大小,默认开启 +}*HashMap; + +包括以下函数功能,分别为: +`createHashMap`:创建一个哈希结构 +`defaultPut`:添加键值对 +`defaultGet`:获取键对应值 +`defaultRemove`:删除指定键的键值对 +`defaultExists`:判断键值是否存在 +`defaultClear`:清空Map的函数类型 +`resetHashMap`:重新构建哈希表 + + +## 3. 测试程序说明 +测试了哈希表的插入键值对(Put),判断键是否存在(Exist),获取键对应的值(Get), 删除健(Delete),迭代遍历哈希表(hashMapIterator),清空哈希表(Clear)等操作。 +并展示了利用链地址法解决哈希冲突的示例, 两个不同的人(Bob和Li Ming)的hashcode相同。 + +## 4. 运行结果(##需结合运行测试截图按步骤说明##) +![image](ConfigOpen.png) +打开menuconfig之后,将test_hash_map开启(y),保存后退出 + +![image](CompileSuccess.png) +编译XiZi-cortex-m3-emulator.elf成功 + +![image](ShellCommand.png) +启动qemu模拟Xiuos操作系统,验证TestHash注册Shell命令 + +![image](TestHash.png) +执行TestHash命令,打印测试结果。 + diff --git a/APP_Framework/Applications/app_test/test_hash/ShellCommand.png b/APP_Framework/Applications/app_test/test_hash/ShellCommand.png new file mode 100644 index 000000000..f9338e7e1 Binary files /dev/null and b/APP_Framework/Applications/app_test/test_hash/ShellCommand.png differ diff --git a/APP_Framework/Applications/app_test/test_hash/TestHash.png b/APP_Framework/Applications/app_test/test_hash/TestHash.png new file mode 100644 index 000000000..3170edfef Binary files /dev/null and b/APP_Framework/Applications/app_test/test_hash/TestHash.png differ diff --git a/APP_Framework/Applications/app_test/test_hash/test_hash.c b/APP_Framework/Applications/app_test/test_hash/test_hash.c new file mode 100644 index 000000000..d6eabc4c7 --- /dev/null +++ b/APP_Framework/Applications/app_test/test_hash/test_hash.c @@ -0,0 +1,323 @@ + +/** +* @file: test_hash.c +* @brief: a application of test hash function +* @version: 3.0 +* @author: Yao wenying +* @date: 2023/05/26 +*/ + +#include +#include"test_hash.h" + +int defaultHashCode(HashMap hashMap, let key) { + char * k = (char *)key; + unsigned long h = 0; + while (*k) { + h = (h << 4) + *k++; + unsigned long g = h & 0xF0000000L; + if (g) { + h ^= g >> 24; + } + h &= ~g; + } + return h % hashMap->listSize; +} + +Boolean defaultEqual(let key1, let key2) { + return strcmp((string)key1, (string)key2) ? False : True; +} + +void resetHashMap(HashMap hashMap, int listSize) { + + if (listSize < 8) return; + + // 键值对临时存储空间 + Entry tempList = newEntryList(hashMap->size); + + HashMapIterator iterator = createHashMapIterator(hashMap); + int length = hashMap->size; + for (int index = 0; hasNextHashMapIterator(iterator); index++) { + // 迭代取出所有键值对 + iterator = nextHashMapIterator(iterator); + tempList[index].key = iterator->entry->key; + tempList[index].value = iterator->entry->value; + tempList[index].next = NULL; + } + freeHashMapIterator(&iterator); + + // 清除原有键值对数据 + hashMap->size = 0; + for (int i = 0; i < hashMap->listSize; i++) { + Entry current = &hashMap->list[i]; + current->key = NULL; + current->value = NULL; + if (current->next != NULL) { + while (current->next != NULL) { + Entry temp = current->next->next; + free(current->next); + current->next = temp; + } + } + } + + // 更改内存大小 + hashMap->listSize = listSize; + Entry relist = (Entry)realloc(hashMap->list, hashMap->listSize * sizeof(struct entry)); + if (relist != NULL) { + hashMap->list = relist; + relist = NULL; + } + + // 初始化数据 + for (int i = 0; i < hashMap->listSize; i++) { + hashMap->list[i].key = NULL; + hashMap->list[i].value = NULL; + hashMap->list[i].next = NULL; + } + + // 将所有键值对重新写入内存 + for (int i = 0; i < length; i++) { + hashMap->put(hashMap, tempList[i].key, tempList[i].value); + } + free(tempList); +} + +void defaultPut(HashMap hashMap, let key, let value) { + // 获取哈希值 + int index = hashMap->hashCode(hashMap, key); + + if (hashMap->list[index].key == NULL) { + hashMap->size++; + // 该地址为空时直接存储 + hashMap->list[index].key = key; + hashMap->list[index].value = value; + } + else { + + Entry current = &hashMap->list[index]; + while (current != NULL) { + if (hashMap->equal(key, current->key)) { + // 对于键值已经存在的直接覆盖 + current->value = value; + return; + } + current = current->next; + }; + + // 发生冲突则创建节点挂到相应位置的next上 + Entry entry = newEntry(); + entry->key = key; + entry->value = value; + entry->next = hashMap->list[index].next; + hashMap->list[index].next = entry; + hashMap->size++; + } + + if (hashMap->autoAssign && hashMap->size >= hashMap->listSize) { + + // 内存扩充至原来的两倍 + // *注: 扩充时考虑的是当前存储元素数量与存储空间的大小关系,而不是存储空间是否已经存满, + // 例如: 存储空间为10,存入了10个键值对,但是全部冲突了,所以存储空间空着9个,其余的全部挂在一个上面, + // 这样检索的时候和遍历查询没有什么区别了,可以简单这样理解,当我存入第11个键值对的时候一定会发生冲突, + // 这是由哈希函数本身的特性(取模)决定的,冲突就会导致检索变慢,所以这时候扩充存储空间,对原有键值对进行 + // 再次散列,会把冲突的数据再次分散开,加快索引定位速度。 + resetHashMap(hashMap, hashMap->listSize * 2); + } +} + +let defaultGet(HashMap hashMap, let key) { + if (hashMap->exists(hashMap, key)) { + int index = hashMap->hashCode(hashMap, key); + Entry entry = &hashMap->list[index]; + while (entry != NULL) { + if (hashMap->equal(entry->key, key)) { + return entry->value; + } + entry = entry->next; + } + } + return NULL; +} + +let defaultRemove(HashMap hashMap, let key) { + int index = hashMap->hashCode(hashMap, key); + Entry entry = &hashMap->list[index]; + if (entry->key == NULL) { + return NULL; + } + let entryKey = entry->key; + Boolean result = False; + if (hashMap->equal(entry->key, key)) { + hashMap->size--; + if (entry->next != NULL) { + Entry temp = entry->next; + entry->key = temp->key; + entry->value = temp->value; + entry->next = temp->next; + free(temp); + } + else { + entry->key = NULL; + entry->value = NULL; + } + result = True; + } + else { + Entry p = entry; + entry = entry->next; + while (entry != NULL) { + if (hashMap->equal(entry->key, key)) { + hashMap->size--; + p->next = entry->next; + free(entry); + result = True; + break; + } + p = entry; + entry = entry->next; + }; + } + + // 如果空间占用不足一半,则释放多余内存 + if (result && hashMap->autoAssign && hashMap->size < hashMap->listSize / 2) { + resetHashMap(hashMap, hashMap->listSize / 2); + } + return entryKey; +} + +Boolean defaultExists(HashMap hashMap, let key) { + int index = hashMap->hashCode(hashMap, key); + Entry entry = &hashMap->list[index]; + if (entry->key == NULL) { + return False; + } + else { + while (entry != NULL) { + if (hashMap->equal(entry->key, key)) { + return True; + } + entry = entry->next; + } + return False; + } +} + +void defaultClear(HashMap hashMap) { + for (int i = 0; i < hashMap->listSize; i++) { + // 释放冲突值内存 + Entry entry = hashMap->list[i].next; + while (entry != NULL) { + Entry next = entry->next; + free(entry); + entry = next; + } + hashMap->list[i].next = NULL; + } + // 释放存储空间 + free(hashMap->list); + hashMap->list = NULL; + hashMap->size = -1; + hashMap->listSize = 0; +} + +HashMap createHashMap(HashCode hashCode, Equal equal) { + HashMap hashMap = newHashMap(); + if (hashMap == NULL) { + return NULL; + } + hashMap->size = 0; + hashMap->listSize = 8; + hashMap->hashCode = hashCode == NULL ? defaultHashCode : hashCode; + hashMap->equal = equal == NULL ? defaultEqual : equal; + hashMap->exists = defaultExists; + hashMap->get = defaultGet; + hashMap->put = defaultPut; + hashMap->remove = defaultRemove; + hashMap->clear = defaultClear; + hashMap->autoAssign = True; + + // 起始分配8个内存空间,溢出时会自动扩充 + hashMap->list = newEntryList(hashMap->listSize); + if (hashMap->list == NULL) { + return NULL; + } + Entry p = hashMap->list; + for (int i = 0; i < hashMap->listSize; i++) { + p[i].key = p[i].value = p[i].next = NULL; + } + return hashMap; +} + +HashMapIterator createHashMapIterator(HashMap hashMap) { + HashMapIterator iterator = newHashMapIterator(); + if (iterator == NULL) { + return NULL; + } + iterator->hashMap = hashMap; + iterator->count = 0; + iterator->hashCode = -1; + iterator->entry = NULL; + return iterator; +} + +Boolean hasNextHashMapIterator(HashMapIterator iterator) { + return iterator->count < iterator->hashMap->size ? True : False; +} + +HashMapIterator nextHashMapIterator(HashMapIterator iterator) { + if (hasNextHashMapIterator(iterator)) { + if (iterator->entry != NULL && iterator->entry->next != NULL) { + iterator->count++; + iterator->entry = iterator->entry->next; + return iterator; + } + while (++iterator->hashCode < iterator->hashMap->listSize) { + Entry entry = &iterator->hashMap->list[iterator->hashCode]; + if (entry->key != NULL) { + iterator->count++; + iterator->entry = entry; + break; + } + } + } + return iterator; +} + +void freeHashMapIterator(HashMapIterator * iterator) { + free(*iterator); + *iterator = NULL; +} + +#define Put(map, key, value) map->put(map, (void *)key, (void *)value); +#define Get(map, key) (char *)map->get(map, (void *)key) +#define Remove(map, key) map->remove(map, (void *)key) +#define Existe(map, key) map->exists(map, (void *)key) + +void TestHash() { + HashMap map = createHashMap(NULL, NULL); + Put(map, "000123", "Annie"); + Put(map, "000245", "Bob"); + Put(map, "000284", "Daniel"); + Put(map, "000281", "Luna"); + Put(map, "000587", "Yao"); + Put(map, "000985", "Li Ming"); + Put(map, "000852", "Janne"); + + printf("print the key-values in hashmap:\n"); + HashMapIterator iterator = createHashMapIterator(map); + while (hasNextHashMapIterator(iterator)) { + iterator = nextHashMapIterator(iterator); + printf("{ key: %s, key: %s, hashcode: %d }\n", + (char *)iterator->entry->key, (char *)iterator->entry->value, iterator->hashCode); + } + printf("key: 000852, exists: %s\n", Existe(map, "000852") ? "true" : "false"); + printf("000852: %s\n", Get(map, "000852")); + printf("remove 000852 %s\n", Remove(map, "000852") ? "true" : "false"); + printf("key: 000852, exists: %s\n", Existe(map, "000852") ? "true" : "false"); + + map->clear(map); + freeHashMapIterator(&iterator); +} + +PRIV_SHELL_CMD_FUNCTION(TestHash, Implement hash_map, PRIV_SHELL_CMD_MAIN_ATTR); \ No newline at end of file diff --git a/APP_Framework/Applications/app_test/test_hash/test_hash.h b/APP_Framework/Applications/app_test/test_hash/test_hash.h new file mode 100644 index 000000000..3f7358411 --- /dev/null +++ b/APP_Framework/Applications/app_test/test_hash/test_hash.h @@ -0,0 +1,129 @@ + +/** +* @file: test_hash.h +* @brief: a application of test hash function +* @version: 3.0 +* @author: Yao wenying +* @date: 2023/05/26 +*/ + + +#ifndef __HASHMAP_H__ +#define __HASHMAP_H__ + +#include +#include +#include + + +// 实现数据的基本类型 +// 字符串类型 +#define string char * +#define newString(str) strcpy((char *)malloc(strlen(str) + 1), str) +#define NEW(type) (type *)malloc(sizeof(type)) + +// 布尔类型 +enum _Boolean { True = 1, False = 0 }; +typedef enum _Boolean Boolean; + +#define let void * + +typedef struct entry { + let key; // 键 + let value; // 值 + struct entry * next; // 冲突链表 +}*Entry; + +#define newEntry() NEW(struct entry) +#define newEntryList(length) (Entry)malloc(length * sizeof(struct entry)) + +// 哈希结构 +typedef struct hashMap *HashMap; + +#define newHashMap() NEW(struct hashMap) + +// 哈希函数类型 +typedef int(*HashCode)(HashMap, let key); + +// 判等函数类型 +typedef Boolean(*Equal)(let key1, let key2); + +// 添加键函数类型 +typedef void(*Put)(HashMap hashMap, let key, let value); + +// 获取键对应值的函数类型 +typedef let(*Get)(HashMap hashMap, let key); + +// 删除键的函数类型 +typedef let(*Remove)(HashMap hashMap, let key); + +// 清空Map的函数类型 +typedef void(*Clear)(HashMap hashMap); + +// 判断键值是否存在的函数类型 +typedef Boolean(*Exists)(HashMap hashMap, let key); + +typedef struct hashMap { + int size; // 当前大小 + int listSize; // 有效空间大小 + HashCode hashCode; // 哈希函数 + Equal equal; // 判等函数 + Entry list; // 存储区域 + Put put; // 添加键的函数 + Get get; // 获取键对应值的函数 + Remove remove; // 删除键 + Clear clear; // 清空Map + Exists exists; // 判断键是否存在 + Boolean autoAssign; // 设定是否根据当前数据量动态调整内存大小,默认开启 +}*HashMap; + +// 迭代器结构 +typedef struct hashMapIterator { + Entry entry; // 迭代器当前指向 + int count; // 迭代次数 + int hashCode; // 键值对的哈希值 + HashMap hashMap; +}*HashMapIterator; + +#define newHashMapIterator() NEW(struct hashMapIterator) + +// 默认哈希函数 +static int defaultHashCode(HashMap hashMap, let key); + +// 默认判断键值是否相等 +static Boolean defaultEqual(let key1, let key2); + +// 默认添加键值对 +static void defaultPut(HashMap hashMap, let key, let value); + +// 默认获取键对应值 +static let defaultGet(HashMap hashMap, let key); + +// 默认删除键 +static let defaultRemove(HashMap hashMap, let key); + +// 默认判断键是否存在 +static Boolean defaultExists(HashMap hashMap, let key); + +// 默认清空Map +static void defaultClear(HashMap hashMap); + +// 重新构建 +static void resetHashMap(HashMap hashMap, int listSize); + +// 创建一个哈希结构 +HashMap createHashMap(HashCode hashCode, Equal equal); + +// 创建哈希结构迭代器 +HashMapIterator createHashMapIterator(HashMap hashMap); + +// 迭代器是否有下一个 +Boolean hasNextHashMapIterator(HashMapIterator iterator); + +// 迭代到下一次 +HashMapIterator nextHashMapIterator(HashMapIterator iterator); + +// 释放迭代器内存 +void freeHashMapIterator(HashMapIterator * iterator); + +#endif // !__HASHMAP_H__ \ No newline at end of file diff --git a/APP_Framework/Applications/app_test/test_radix_tree/README.md b/APP_Framework/Applications/app_test/test_radix_tree/README.md new file mode 100644 index 000000000..b2bfe9cb9 --- /dev/null +++ b/APP_Framework/Applications/app_test/test_radix_tree/README.md @@ -0,0 +1,67 @@ +# 基于k210-emulator实现基数树并测试验证 + +## 1. 简介 + +基于矽璓模拟器k210-emulator,实现基数树,并编写测试程序在shell终端打印结果。 + +## 2. 数据结构设计说明 + +基数树节点设计为: + +```c +typedef struct _node { +​ void* value; +​ struct _node* next[NODE_SIZE]; +} node; +``` + +其中,节点在树中的路径即为键,`value` 存储值,`NODE_SIZE` 定义为 128,足以容纳所有 ASCII 值。 + +一共实现了 5 个函数,分别为: + +- `CreateNode`:创建一个基数树节点 +- `InsertNode`:将一对键值对插入基数树 +- `DeleteNode`:删除指定键的键值对 +- `FindNode`:查找指定键对应的值 +- `DestroyTree`:销毁整个基数树 + +## 3. 测试程序说明 + +测试程序 `TestRadix` 已经注册为 shell 命令,可以调用执行。 + +测试程序定义了以下键值对: + +```c +char keys[][MAX_WORD_LEN] = { + "what", + "where", + "why", + "how", + "hello!", + "apple", + "12345" +}; +int values[] = {1, 2, 3, 4, 5, 6, 7}; +``` + +1. 程序的第一部分创建了基数树,并且将定义的 7 个键值对的前 6 个插入了基数树,然后分别查找 7 个键,前 6 个均可以找到对应的值,最后一个未插入,因此无法找到 +2. 程序的第二部分从基数树中删除了 `where` 和 `how` 两个键,再次分别查找 7 个键,删除的键值对和未插入的键值对均无法找到 +3. 程序的第三部分重新插入了已删除的 `where` 和未插入过的 `12345` ,再次分别查找 7 个键,新插入的值可以检索到 +4. 程序的第四部分将基数树销毁,再次分别查找 7 个键,所有的键值对均无法找到 + +## 4. 运行结果(##需结合运行测试截图按步骤说明##) + +1. 在工作区终端中输入命令:`make BOARD=k210-emulator menuconfig`,进入配置页面 +![fig1](fig1.png) +2. 依次进入 `APP_Framework` -> `Applications` -> `test app` 目录,将 `Enable application test function` 选项置为 `Y` +![fig2](fig2.png) +3. 进入 `Enable application test function` 将 `Config test radix tree` 选项置为 `Y` +![fig3](fig3.png) +4. 一直选择 `Exit` 退出配置,在最后需要确认的页面选择 `Yes` 保存配置 +![fig4](fig4.png) +5. 执行编译命令:`make BOARD=k210-emulator`,正常情况下应当编译无误 +![fig5](fig5.png) +6. 在 `qemu` 中运行:`qemu-system-riscv64 -nographic -machine sifive_u -bios build/XiZi-k210-emulator.elf` +![fig6](fig6.png) +7. 在 shell 中运行命令 `TestRadix`,执行结果与预期一致,验证完成。 +![fig7](fig7.png) \ No newline at end of file diff --git a/APP_Framework/Applications/app_test/test_radix_tree/fig1.png b/APP_Framework/Applications/app_test/test_radix_tree/fig1.png new file mode 100644 index 000000000..ce51222cb Binary files /dev/null and b/APP_Framework/Applications/app_test/test_radix_tree/fig1.png differ diff --git a/APP_Framework/Applications/app_test/test_radix_tree/fig2.png b/APP_Framework/Applications/app_test/test_radix_tree/fig2.png new file mode 100644 index 000000000..b35f3ecb6 Binary files /dev/null and b/APP_Framework/Applications/app_test/test_radix_tree/fig2.png differ diff --git a/APP_Framework/Applications/app_test/test_radix_tree/fig3.png b/APP_Framework/Applications/app_test/test_radix_tree/fig3.png new file mode 100644 index 000000000..5d5fa2276 Binary files /dev/null and b/APP_Framework/Applications/app_test/test_radix_tree/fig3.png differ diff --git a/APP_Framework/Applications/app_test/test_radix_tree/fig4.png b/APP_Framework/Applications/app_test/test_radix_tree/fig4.png new file mode 100644 index 000000000..3df214d59 Binary files /dev/null and b/APP_Framework/Applications/app_test/test_radix_tree/fig4.png differ diff --git a/APP_Framework/Applications/app_test/test_radix_tree/fig5.png b/APP_Framework/Applications/app_test/test_radix_tree/fig5.png new file mode 100644 index 000000000..99cd9ec2e Binary files /dev/null and b/APP_Framework/Applications/app_test/test_radix_tree/fig5.png differ diff --git a/APP_Framework/Applications/app_test/test_radix_tree/fig6.png b/APP_Framework/Applications/app_test/test_radix_tree/fig6.png new file mode 100644 index 000000000..80bf28136 Binary files /dev/null and b/APP_Framework/Applications/app_test/test_radix_tree/fig6.png differ diff --git a/APP_Framework/Applications/app_test/test_radix_tree/fig7.png b/APP_Framework/Applications/app_test/test_radix_tree/fig7.png new file mode 100644 index 000000000..7fad83c9e Binary files /dev/null and b/APP_Framework/Applications/app_test/test_radix_tree/fig7.png differ diff --git a/APP_Framework/Applications/app_test/test_radix_tree/test_radix_tree.c b/APP_Framework/Applications/app_test/test_radix_tree/test_radix_tree.c new file mode 100644 index 000000000..c54a49805 --- /dev/null +++ b/APP_Framework/Applications/app_test/test_radix_tree/test_radix_tree.c @@ -0,0 +1,187 @@ +/** +* @file: test_radix_tree.c +* @brief: Implement a simple radix tree +* @version: 1.0 +* @date: 2023/5/24 +*/ + +#include +#include "test_radix_tree.h" + +/** + * @description: Create a radix tree node + * @return node pointer + */ +node* CreateNode() +{ + node* n = (node*)malloc(sizeof(node)); + n->value = NULL; + for (int i = 0; i < NODE_SIZE; i++) { + n->next[i] = NULL; + } + return n; +} + +/** + * @description: Insert a new node to radix tree + * @param root - radix tree root + * @param key - new node key + * @param value - new node value + * @return void + */ +void InsertNode(node* root, const char* key, void* value) +{ + if (root == NULL) { + return; + } + node* cur = root; + size_t len = strlen(key); + for (size_t i = 0; i < len; i++) { + uint8_t b = (uint8_t)key[i]; + if (cur->next[b] == NULL) { + cur->next[b] = CreateNode(); + } + cur = cur->next[b]; + } + cur->value = value; +} + +/** + * @description: Delete a node from radix tree + * @param root - radix tree root + * @param key - key which is needed to delete + * @return void + */ +void DeleteNode(node* root, const char* key) +{ + if (root == NULL) { + return; + } + node** cur = &root; + size_t len = strlen(key); + for (size_t i = 0; i < len; i++) { + uint8_t b = (uint8_t)key[i]; + if ((*cur)->next[b] == NULL) { + return; + } + cur = &((*cur)->next[b]); + } + + if ((*cur)->value == NULL) { + return; + } + + (*cur)->value = NULL; + + int has_children = 0; + for (int i = 0; i < NODE_SIZE; i++) { + if ((*cur)->next[i] != NULL) { + has_children = 1; + break; + } + } + if (!has_children) { + free(*cur); + (*cur) = NULL; + } +} + +/** + * @description: find a node by key + * @param root - radix tree root + * @param key - key which is needed to find + * @return value pointer corresponding to key + */ +void* FindNode(node* root, const char* key) +{ + if (root == NULL) { + return NULL; + } + node* cur = root; + size_t len = strlen(key); + for (size_t i = 0; i < len; i++) { + uint8_t b = (uint8_t)key[i]; + if (cur->next[b] == NULL) { + return NULL; + } + cur = cur->next[b]; + } + return cur->value; +} + +/** + * @description: Destroy the radix tree + * @param root - radix tree root + * @return void + */ +void DestroyTree(node* root) +{ + if (root == NULL) { + return; + } + for (int i = 0; i < NODE_SIZE; i++) { + DestroyTree(root->next[i]); + } + free(root); +} + +void TestRadix() +{ + char keys[][MAX_WORD_LEN] = { + "what", + "where", + "why", + "how", + "hello!", + "apple", + "12345" + }; + int values[] = {1, 2, 3, 4, 5, 6, 7}; + + printf("\nCreate tree and add key & value:\n"); + node* root = CreateNode(); + if (!root) printf("Create node failed.\n"); + + int num = sizeof(keys) / sizeof(keys[0]); + for (int i = 0; i < num - 1; ++i) { + InsertNode(root, keys[i], &values[i]); + } + + for (int i = 0; i < num; ++i) { + int* v = (int*)FindNode(root, keys[i]); + if (v) printf("keys[%d] \"%s\"'v = %d, values[%d] = %d\n", i, keys[i], *v, i, values[i]); + else printf("keys[%d] \"%s\" not found\n", i, keys[i]); + } + + printf("\nDelete \"where\" and \"how\":\n"); + DeleteNode(root, keys[1]); + DeleteNode(root, keys[3]); + + for (int i = 0; i < num; ++i) { + int* v = (int*)FindNode(root, keys[i]); + if (v) printf("keys[%d] \"%s\"'v = %d, values[%d] = %d\n", i, keys[i], *v, i, values[i]); + else printf("keys[%d] \"%s\" not found\n", i, keys[i]); + } + + printf("\nInsert \"where\" and \"12345\":\n"); + InsertNode(root, keys[1], &values[1]); + InsertNode(root, keys[6], &values[6]); + + for (int i = 0; i < num; ++i) { + int* v = (int*)FindNode(root, keys[i]); + if (v) printf("keys[%d] \"%s\"'v = %d, values[%d] = %d\n", i, keys[i], *v, i, values[i]); + else printf("keys[%d] \"%s\" not found\n", i, keys[i]); + } + + printf("\nDestroy tree:\n"); + DestroyTree(root); + root = NULL; + + for (int i = 0; i < num; ++i) { + int* v = (int*)FindNode(root, keys[i]); + if (v) printf("keys[%d] \"%s\"'v = %d, values[%d] = %d\n", i, keys[i], *v, i, values[i]); + else printf("keys[%d] \"%s\" not found\n", i, keys[i]); + } +} + +PRIV_SHELL_CMD_FUNCTION(TestRadix, Implement a simple radix tree, PRIV_SHELL_CMD_MAIN_ATTR); \ No newline at end of file diff --git a/APP_Framework/Applications/app_test/test_radix_tree/test_radix_tree.h b/APP_Framework/Applications/app_test/test_radix_tree/test_radix_tree.h new file mode 100644 index 000000000..ea9e7b7fa --- /dev/null +++ b/APP_Framework/Applications/app_test/test_radix_tree/test_radix_tree.h @@ -0,0 +1,20 @@ +/** +* @file: test_radix_tree.h +* @brief: Implement a simple radix tree +* @version: 1.0 +* @date: 2023/5/24 +*/ + +#define NODE_SIZE 128 +#define MAX_WORD_LEN 128 + +typedef struct _node { + void* value; + struct _node* next[NODE_SIZE]; +} node; + +node* CreateNode(); +void InsertNode(node* root, const char* key, void* value); +void DeleteNode(node* root, const char* key); +void* FindNode(node* root, const char* key); +void DestroyTree(node* root); \ No newline at end of file diff --git a/APP_Framework/Applications/app_test/test_rbtree/README.md b/APP_Framework/Applications/app_test/test_rbtree/README.md new file mode 100644 index 000000000..4841e4ed0 --- /dev/null +++ b/APP_Framework/Applications/app_test/test_rbtree/README.md @@ -0,0 +1,69 @@ +# 基于cortex-m4-emulator实现红黑树并测试验证 + +## 1. 简介 +红黑树是一种自平衡的二叉查找树,具有良好的插入、删除和查找性能,本次提交结果为红黑树数据结构的简单实现。test_rbtree.h中定义了红黑树的数据结构和声明插入、删除、查找相关操作函数;test_rbtree.c中为操作函数的定义,并提供了测试函数TestRBTree用于验证红黑树的正确性。 + + +## 2. 数据结构设计说明 + +**RBNodeType 结构体** +用来存储一个红黑树结点的相关信息 +- key:节点的键值 +- left_child:指向左子节点的指针 +- right_child:指向右子节点的指针 +- parent:指向父节点的指针 +- is_red:表示节点的颜色,true表示红色,false表示黑色 + +**RBTreeType 结构体** +用来存储一个红黑树的相关信息 +- root:指向红黑树的根节点的指针 +- leaf:红黑树的叶节点,由于叶节点并不需要存储数据,故每棵树只分配一个叶节点 + + +**RBTreeTraversal 函数** +该函数用于遍历红黑树并打印节点的键值。采用中序遍历的方式,递归地遍历左子树、当前节点和右子树。 + +**RBTreeLeftRotate 函数** +该函数实现红黑树的左旋转操作。接受一个当前节点指针作为参数,并按照左旋转的规则调整节点和子树的位置。 + +**RBTreeRightRotate 函数** +该函数实现红黑树的右旋转操作。接受一个当前节点指针作为参数,并按照右旋转的规则调整节点和子树的位置。 + +**InsertFixup 函数** +该函数用于插入节点后修复红黑树的平衡性。接受一个当前节点指针作为参数,并根据红黑树的性质进行旋转和着色操作,以恢复平衡。 + +**RBTreeInsert 函数** +该函数用于向红黑树中插入一个新节点。接受一个新节点指针作为参数,并根据新节点的键值插入到适当的位置,然后调用 InsertFixup 进行修复。 + +**DeleteFixup 函数** +该函数用于删除节点后修复红黑树的平衡性。接受一个当前节点指针作为参数,并根据红黑树的性质进行旋转和着色操作,以恢复平衡。 + +**RBTreeDelete 函数** +该函数用于从红黑树中删除指定节点。接受一个目标节点指针作为参数,并根据不同的情况进行节点的替换和删除操作,然后调用 DeleteFixup 进行修复。 + +**FindSuccessor 函数** +该函数用于查找给定节点的后继节点。接受一个当前节点指针作为参数,并在红黑树中找到当前节点的后继节点。 + +**RBTreeSearch 函数** +该函数用于在红黑树中查找指定键值的节点。接受一个键值作为参数,并在红黑树中进行查找,返回找到的节点指针。 + +## 3. 测试程序说明 +TestRBTree用于验证红黑树的功能和正确性,下面是该程序的使用步骤和说明: +- 函数中定义一个默认关键字数组,其中包含了20个整数关键字,运行时自动遍历数组构建红黑树,构建完成后中序遍历输出结果,可以根据输出结果验证红黑树的节点顺序以及颜色是否符合预期。 +- 对关键字数组中的每个关键字,在红黑树中进行搜索,并输出找到节点的父节点、左子节点和右子节点的关键字,随后删除该节点。 +- 在每次删除操作后,程序会询问是否显示当前的红黑树。如果输入 "Y" 或 "y",将再次进行中序遍历,并输出当前红黑树中的结点,可以根据输出结果查看结点是否符合预期。当树空时结束程序。 + + +## 4. 运行结果(##需结合运行测试截图按步骤说明##) + +根据默认关键字数组构建红黑树 + +![Alt text](image.png) + +根据键值查找结点,输出相关信息并删除,可以输入'Y'或'y'展示删除后的红黑树 + +![Alt text](image-1.png) + +到达空树,退出程序 + +![Alt text](image-2.png) diff --git a/APP_Framework/Applications/app_test/test_rbtree/image-1.png b/APP_Framework/Applications/app_test/test_rbtree/image-1.png new file mode 100644 index 000000000..48ed6fb1a Binary files /dev/null and b/APP_Framework/Applications/app_test/test_rbtree/image-1.png differ diff --git a/APP_Framework/Applications/app_test/test_rbtree/image-2.png b/APP_Framework/Applications/app_test/test_rbtree/image-2.png new file mode 100644 index 000000000..578024325 Binary files /dev/null and b/APP_Framework/Applications/app_test/test_rbtree/image-2.png differ diff --git a/APP_Framework/Applications/app_test/test_rbtree/image.png b/APP_Framework/Applications/app_test/test_rbtree/image.png new file mode 100644 index 000000000..40d78288f Binary files /dev/null and b/APP_Framework/Applications/app_test/test_rbtree/image.png differ diff --git a/APP_Framework/Applications/app_test/test_rbtree/test_rbtree.c b/APP_Framework/Applications/app_test/test_rbtree/test_rbtree.c new file mode 100644 index 000000000..6f25376df --- /dev/null +++ b/APP_Framework/Applications/app_test/test_rbtree/test_rbtree.c @@ -0,0 +1,341 @@ +/* +* Copyright (c) 2023 AIIT XUOS Lab +* XiUOS is licensed under Mulan PSL v2. +* You can use this software according to the terms and conditions of the Mulan PSL v2. +* You may obtain a copy of Mulan PSL v2 at: +* http://license.coscl.org.cn/MulanPSL2 +* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +* See the Mulan PSL v2 for more details. +*/ + +/** +* @file: test_rbtree.c +* @brief: a application of red-black tree function +* @version: 1.0 +* @author: AIIT XUOS Lab +* @date: 2023/6/23 +*/ +#include +#include +#include"test_rbtree.h" +#ifdef ADD_XIZI_FEATURES + +void RBTreeTraversal(RBTreeType *tree, RBNodeType *node) +{ + if (node != tree->leaf) { + RBTreeTraversal(tree, node->left_child); + printf("key:%d, color:%s\n", node->key, (node->is_red ? "Red" : "Black")); + RBTreeTraversal(tree, node->right_child); + } +} + +RBNodeType* RBTreeSearch(RBTreeType *tree, int key) +{ + RBNodeType* current_node = tree->root; + while (current_node != tree->leaf){ + if (key < current_node->key) + current_node = current_node->left_child; + else if (key > current_node->key) + current_node = current_node->right_child; + else + return current_node; + } + + return tree->leaf; +} + +void RBTreeLeftRotate(RBTreeType *tree, RBNodeType *current_node) +{ + RBNodeType* child_node = current_node->right_child; + + current_node->right_child = child_node->left_child; + if (child_node->left_child != tree->leaf) + child_node->left_child->parent = current_node; + + child_node->parent = current_node->parent; + if (current_node->parent == tree->leaf) + tree->root = child_node; + else if (current_node == current_node->parent->left_child) + current_node->parent->left_child = child_node; + else + current_node->parent->right_child = child_node; + + child_node->left_child = current_node; + current_node->parent = child_node; +} + +void RBTreeRightRotate(RBTreeType *tree, RBNodeType* current_node) +{ + RBNodeType* child_node = current_node->left_child; + + current_node->left_child = child_node->right_child; + if (child_node->right_child != tree->leaf) + child_node->right_child->parent = current_node; + + child_node->parent = current_node->parent; + if (current_node->parent == tree->leaf) + tree->root = child_node; + else if (current_node == current_node->parent->right_child) + current_node->parent->right_child = child_node; + else + current_node->parent->left_child = child_node; + + child_node->right_child = current_node; + current_node->parent = child_node; +} + +void InsertFixup(RBTreeType *tree, RBNodeType* current_node) +{ + while (current_node->parent->is_red){ + /* The parent of current_node is the left subtree of the grandfather */ + if (current_node->parent == current_node->parent->parent->left_child){ + RBNodeType * uncle_node = current_node->parent->parent->right_child; + if (uncle_node->is_red){ /* case1:red uncle and red parent, change color */ + uncle_node->is_red = false; + current_node->parent->is_red = false; + current_node->parent->parent->is_red = true; + + current_node = current_node->parent->parent; + }else{ /* case2:black uncle and red parent, need rotation */ + if (current_node->parent->right_child == current_node){ + current_node = current_node->parent; + RBTreeLeftRotate(tree, current_node); + } + + current_node->parent->is_red = false; + current_node->parent->parent->is_red = true; + RBTreeRightRotate(tree, current_node->parent->parent); + } + /* The parent of current_node is the right subtree of the grandfather, same with left subtree */ + }else{ + RBNodeType * uncle_node = current_node->parent->parent->left_child; + if (uncle_node->is_red){ + uncle_node->is_red = false; + current_node->parent->is_red = false; + current_node->parent->parent->is_red = true; + + current_node = current_node->parent->parent; + }else{ + if (current_node->parent->left_child == current_node){ + current_node = current_node->parent; + RBTreeRightRotate(tree, current_node); + } + + current_node->parent->is_red = false; + current_node->parent->parent->is_red = true; + RBTreeLeftRotate(tree, current_node->parent->parent); + } + } + } + tree->root->is_red = false; +} + +void RBTreeInsert(RBTreeType *tree, RBNodeType* new_node) +{ + RBNodeType* previous_node = tree->root; + RBNodeType* current_node = tree->root; + + while (current_node != tree->leaf){ + previous_node = current_node; + if (new_node->key > current_node->key) + current_node = current_node->right_child; + else if (new_node->key < current_node->key) + current_node = current_node->left_child; + else + return; + } + + if (previous_node == tree->leaf){ + tree->root = new_node; + tree->root->parent = tree->leaf; + }else{ + new_node->parent = previous_node; + + if (previous_node->key > new_node->key) + previous_node->left_child = new_node; + else + previous_node->right_child = new_node; + } + + InsertFixup(tree, new_node); +} + +RBNodeType* FindSuccessor(RBTreeType *tree, RBNodeType* current_node) +{ + RBNodeType* parent_node = current_node->parent; + if (current_node->right_child != tree->leaf){ + current_node = current_node->right_child; + while (current_node->left_child != tree->leaf) + current_node = current_node->left_child; + return current_node; + } + + while ((parent_node != tree->leaf) && (current_node == parent_node->right_child)){ + current_node = parent_node; + parent_node = parent_node->parent; + } + return parent_node; +} + +void DeleteFixup(RBTreeType *tree, RBNodeType* current_node) +{ + while ((current_node != tree->root) && (current_node->is_red == false)){ + if (current_node == current_node->parent->left_child){ + + RBNodeType* brother_node = current_node->parent->right_child; + if (brother_node->is_red){ + brother_node->is_red = false; + current_node->parent->is_red = true; + RBTreeLeftRotate(tree, current_node->parent); + brother_node = current_node->parent->right_child; + } + + if ((brother_node->left_child->is_red == false) && (brother_node->right_child->is_red == false)){ + brother_node->is_red = true; + current_node = current_node->parent; + }else{ + if (brother_node->right_child->is_red == false){ + brother_node->left_child->is_red = false; + brother_node->is_red = true; + RBTreeRightRotate(tree, brother_node); + brother_node = current_node->parent->right_child; + } + + brother_node->is_red = current_node->parent->is_red; + current_node->parent->is_red = false; + brother_node->right_child->is_red = false; + RBTreeLeftRotate(tree, current_node->parent); + current_node = tree->root; + } + }else{ + RBNodeType* brother_node = current_node->parent->left_child; + if (brother_node->is_red){ + brother_node->is_red = false; + current_node->parent->is_red = true; + RBTreeRightRotate(tree, current_node->parent); + brother_node = current_node->parent->left_child; + } + + if ((brother_node->left_child->is_red == false) && (brother_node->right_child->is_red == false)){ + brother_node->is_red = true; + current_node = current_node->parent; + }else{ + if (brother_node->left_child->is_red == false){ + brother_node->right_child->is_red = false; + brother_node->is_red = true; + RBTreeLeftRotate(tree, brother_node); + brother_node = current_node->parent->left_child; + } + + brother_node->is_red = current_node->parent->is_red; + current_node->parent->is_red = false; + brother_node->left_child->is_red = false; + RBTreeRightRotate(tree, current_node->parent); + current_node = tree->root; + } + } + } + current_node->is_red = false; +} + +void RBTreeDelete(RBTreeType *tree, RBNodeType* target_node) +{ + RBNodeType* delete_node = tree->leaf; + RBNodeType* replace_node = tree->leaf; + + if ((target_node->left_child == tree->leaf) || (target_node->right_child == tree->leaf)) + delete_node = target_node; + else + delete_node = FindSuccessor(tree, target_node); + + if (delete_node->left_child != tree->leaf) /* successor still has subtree */ + replace_node = delete_node->left_child; + else if (delete_node->right_child != tree->leaf) + replace_node = delete_node->right_child; + + replace_node->parent = delete_node->parent; + + if (delete_node->parent == tree->leaf) /* delete a root node */ + tree->root = replace_node; + else if (delete_node == delete_node->parent->left_child) + delete_node->parent->left_child = replace_node; + else + delete_node->parent->right_child = replace_node; + + if (delete_node != target_node) + target_node->key = delete_node->key; + + if (delete_node->is_red == false) + DeleteFixup(tree, replace_node); + + free(delete_node); +} + + +void TestRBTree(void) +{ + int default_key[] = { 16, 25, 23, 5, 2, 6, 17, 37, 38, 98, 20, 19, 47, 49, 12, 21, 9, 18, 14, 15 }; + int array_size = sizeof(default_key) / sizeof(default_key[0]); + + printf("Test Red Black Tree\n"); + printf("default_key array: "); + for (int i = 0; i < array_size; i++) + printf("%d ", default_key[i]); + printf("\n%d elements\n", array_size); + + RBTreeType *tree = (RBTreeType *)malloc(sizeof(RBTreeType)); + if (tree == NULL) { + printf("malloc failed\n"); + return; + } + + tree->leaf = (RBNodeType*)malloc(sizeof(RBNodeType)); + tree->leaf->left_child = NULL; + tree->leaf->right_child = NULL; + tree->leaf->parent = NULL; + tree->leaf->is_red = false; + tree->leaf->key = -1; + tree->root = tree->leaf; + + RBNodeType *node = tree->leaf; + + for (int i = 0; i < array_size; i++) { + node = (RBNodeType*)malloc(sizeof(RBNodeType)); + node->left_child = tree->leaf; + node->right_child = tree->leaf; + node->parent = NULL; + node->is_red = true; + node->key = default_key[i]; + printf("insert key[%d]=%d\n",i,default_key[i]); + RBTreeInsert(tree, node); + } + + printf("------------------Inorder Traversal------------------\n"); + RBTreeTraversal(tree, tree->root); + + for (int i = 0; i < array_size; i++) { + printf("search key = %d\n", default_key[i]); + node = RBTreeSearch(tree, default_key[i]); + printf("search succeeded, parent node: %d, left-child: %d, right-child: %d\n", node->parent->key, node->left_child->key, node->right_child->key); + + printf("delete key = %d\n", node->key); + RBTreeDelete(tree, node); + + printf("Show current tree?Y/N \n"); + char ch; + scanf("%c", &ch); + if (ch == 'Y' || ch == 'y') { + printf("------------------Inorder Traversal Tree After Deletion------------------\n"); + if (tree->root != tree->leaf) + RBTreeTraversal(tree, tree->root); + else + printf("the tree is empty.\n"); + } + } +} + +PRIV_SHELL_CMD_FUNCTION(TestRBTree, a red-black tree test sample, PRIV_SHELL_CMD_MAIN_ATTR); + +#endif \ No newline at end of file diff --git a/APP_Framework/Applications/app_test/test_rbtree/test_rbtree.h b/APP_Framework/Applications/app_test/test_rbtree/test_rbtree.h new file mode 100644 index 000000000..b9592ac82 --- /dev/null +++ b/APP_Framework/Applications/app_test/test_rbtree/test_rbtree.h @@ -0,0 +1,60 @@ +/* +* Copyright (c) 2023 AIIT XUOS Lab +* XiUOS is licensed under Mulan PSL v2. +* You can use this software according to the terms and conditions of the Mulan PSL v2. +* You may obtain a copy of Mulan PSL v2 at: +* http://license.coscl.org.cn/MulanPSL2 +* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +* See the Mulan PSL v2 for more details. +*/ + +/** +* @file: test_rbtree.h +* @brief: a head file of red-black tree structure +* @version: 1.0 +* @author: AIIT XUOS Lab +* @date: 2023/6/23 +*/ +#ifndef REDBLACKTREE_H_ +#define REDBLACKTREE_H_ +#include +#include + +typedef struct RedBlackNode +{ + int key; + struct RedBlackNode *left_child; + struct RedBlackNode *right_child; + struct RedBlackNode *parent; + bool is_red; +} RBNodeType; + +typedef struct RedBlackTree +{ + RBNodeType *root; + RBNodeType *leaf; +} RBTreeType; + +void TestRBTree(void); + +void RBTreeTraversal(RBTreeType *tree, RBNodeType *node); + +void RBTreeLeftRotate(RBTreeType *tree, RBNodeType *current_node); + +void RBTreeRightRotate(RBTreeType *tree, RBNodeType* current_node); + +void InsertFixup(RBTreeType *tree, RBNodeType* current_node); + +void RBTreeInsert(RBTreeType *tree, RBNodeType* new_node); + +void DeleteFixup(RBTreeType *tree, RBNodeType* current_node); + +void RBTreeDelete(RBTreeType *tree, RBNodeType* target_node); + +RBNodeType* FindSuccessor(RBTreeType *tree, RBNodeType* current_node); + +RBNodeType* RBTreeSearch(RBTreeType *tree, int key); + +#endif \ No newline at end of file diff --git a/APP_Framework/Applications/control_app/plc_demo/keyence/README.md b/APP_Framework/Applications/control_app/plc_demo/keyence/README.md old mode 100644 new mode 100755 index 547da53c4..7bbf03277 --- a/APP_Framework/Applications/control_app/plc_demo/keyence/README.md +++ b/APP_Framework/Applications/control_app/plc_demo/keyence/README.md @@ -1,4 +1,4 @@ -# KEYENCE 通信测试 +# keyence通信测试 [TOC] @@ -12,11 +12,55 @@ - 存储区ZF区。 +## JSON配方设计 + +* 共测试INT16共1种类型数据,以下为JSON文件解释。 + + - ```json + { + "device_id": 1, //设备ID默认是1,此参数无效 + "device_name": "KV8000", //设备名称,自定义 + "communication_type": 0, //通讯协议类型 0是以太网,1是串口 + "socket_config": { //以太网配置 + "plc_ip": "192.168.250.40", //PLC的IP地址 + "local_ip": "192.168.250.233", //矽达通IP地址设定 + "gateway": "192.168.250.1", //矽达通的网关地址设定 + "netmask": "255.255.255.0", //矽达通子网掩码设定 + "port":502 //端口号设定 + }, + "protocol_type": 3, //通讯协议,3代表modbus-tcp协议 + "read_period": 100, //交互周期ms + "read_item_list": [ + { + "value_name": "ZF0", //变量名称,自定义 + "value_type": 3, //变量类型,BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9 + "function_code": 3, //功能码。3是读 + "start_address": 0, //起始地址 + "data_length": 1 //BOOL长度,默认是1,代表读取1个BOOL长度 + }, + { + "value_name": "ZF2", //变量名称,自定义 + "value_type": 3, //变量类型,BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9 + "function_code": 3, //功能码。3/6是读 + "start_address": 2, //起始地址偏移1位 + "data_length": 1 //BOOL长度,默认是1,代表读取1个BOOL长度 + } + ] + } + ``` + ## 通信测试 -(1)共测试INT16类型数据。 + (1) 新增1个通信demo,命名为keyence_KV8000.c; -(2)测试ZF区数据。 + (2) 复制样例代码程序到keyence_KV8000.c文件中; -(3)D区数据测试,用功能码03和06,以字为单位读写。如读写ZF1,则配方文件中起始地址则直接写1即可。 + (3) void **ControlKV8000Test**(void) 更改函数名; + (4) PRIV_SHELL_CMD_FUNCTION(**ControKV8000Test**, keyence plc KV8000 Demo**, PRIV_SHELL_CMD_MAIN_ATTR);更改测试指令; + + (5) 剪裁配置完成后,用过烧写器下载至矽达通中,重启后完成测试。 + + + + \ No newline at end of file diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/README.md b/APP_Framework/Applications/control_app/plc_demo/omron/README.md index b7dd8af5e..6f080c669 100755 --- a/APP_Framework/Applications/control_app/plc_demo/omron/README.md +++ b/APP_Framework/Applications/control_app/plc_demo/omron/README.md @@ -1,12 +1,14 @@ -# OMRON_CP1L通信测试 +# OMRON_CP1L/H通信测试 [TOC] ## 通信接线及参数设置 -* 本体无接口,增加CP1W-CIF41网络板卡 - +* CP1L本体无接口,增加CP1W-CIF41网络板卡,CP1H自带网口,采用网线直连的方式 * FINS协议,PLC IP:192.168.250.31,Port:9600 +* ![CP1H](./image/CP1H.jpg) +* ![CP1L](./image/CP1L.jpg) +* ![xidatong](./image/xidatong.jpg) ## 存储区 diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/image/CP1H.jpg b/APP_Framework/Applications/control_app/plc_demo/omron/image/CP1H.jpg new file mode 100644 index 000000000..97d8a8d32 Binary files /dev/null and b/APP_Framework/Applications/control_app/plc_demo/omron/image/CP1H.jpg differ diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/image/CP1L.jpg b/APP_Framework/Applications/control_app/plc_demo/omron/image/CP1L.jpg new file mode 100644 index 000000000..1368bb29f Binary files /dev/null and b/APP_Framework/Applications/control_app/plc_demo/omron/image/CP1L.jpg differ diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/image/xidatong.jpg b/APP_Framework/Applications/control_app/plc_demo/omron/image/xidatong.jpg new file mode 100644 index 000000000..0b130b592 Binary files /dev/null and b/APP_Framework/Applications/control_app/plc_demo/omron/image/xidatong.jpg differ diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/test_recipe_CP1H.json b/APP_Framework/Applications/control_app/plc_demo/omron/json/test_recipe_CP1H.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/omron/test_recipe_CP1H.json rename to APP_Framework/Applications/control_app/plc_demo/omron/json/test_recipe_CP1H.json diff --git a/APP_Framework/Applications/control_app/plc_demo/omron/test_recipe_CP1L.json b/APP_Framework/Applications/control_app/plc_demo/omron/json/test_recipe_CP1L.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/omron/test_recipe_CP1L.json rename to APP_Framework/Applications/control_app/plc_demo/omron/json/test_recipe_CP1L.json diff --git a/APP_Framework/Applications/control_app/plc_demo/schneider/README.md b/APP_Framework/Applications/control_app/plc_demo/schneider/README.md old mode 100644 new mode 100755 index 46f0558bf..d054136d0 --- a/APP_Framework/Applications/control_app/plc_demo/schneider/README.md +++ b/APP_Framework/Applications/control_app/plc_demo/schneider/README.md @@ -1,21 +1,65 @@ -# SCHNEIDER M241通信测试 +# SCHNEIDER M241L通信测试 [TOC] ## 通信接线及参数设置 * 串口 - * M241支持2路485串口,本次采用的是serial2。波特率:9600,数据位:8位,停止位:1位,校验:偶校验 +* M241支持2路485串口,本次采用的是serial2。波特率:9600,数据位:8位,停止位:1位,校验:偶校验 ## 存储区 - 存储区MW区。 +## JSON配方设计 + +* 共测试BOOL,INT16共2种类型数据,以下为JSON文件解释。 + + - ```json + { + "device_id": 1, //设备ID默认是1,此参数无效 + "device_name": "m241", //设备名称,自定义 + "communication_type": 1, //通讯协议类型 0是以太网,1是串口 + "serial_config": { //串口配置 + "station": 1, //站号 + "baud_rate": 9600, //波特率 + "data_bits": 8, //数据位 + "stop_bits": 1, //停止位 + "check_mode": 3 //1无校验,2校验,3偶校验 + }, + "protocol_type": 3, //通讯协议,3代表modbus-tcp协议 + "read_period": 100, //交互周期ms + "read_item_list": [ + { + "value_name": "MW0", //变量名称,自定义 + "value_type": 3, //变量类型,BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9 + "function_code": 3, //功能码。3是读 + "start_address": 0, //起始地址 + "data_length": 1 //BOOL长度,默认是1,代表读取1个BOOL长度 + }, + { + "value_name": "MW1", //变量名称,自定义 + "value_type": 3, //变量类型,BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9 + "function_code": 3, //功能码。3是读 + "start_address": 1, //起始地址偏移1位 + "data_length": 1 //BOOL长度,默认是1,代表读取1个BOOL长度 + } + ] + } + ``` + ## 通信测试 -(1)共测试INT16共1种类型数据。 + (1) 新增1个通信demo,命名为schneider_m241.c; -(2)测试MW区数据。 + (2) 复制样例代码程序到schneider_m241.c文件中; -(3)MW区数据测试,用功能码03,以字为单位读取。如读MW100,则配方文件中起始地址则直接写100即可。 + (3) void **ControlSCHNEIDERM241Test**(void) 更改函数名; + (4) PRIV_SHELL_CMD_FUNCTION(**ControlM241Test**, **Schneider M241 Demo**, PRIV_SHELL_CMD_MAIN_ATTR);更改测试指令; + + (5) 剪裁配置完成后,用过烧写器下载至矽达通中,重启后完成测试。 + + + + \ No newline at end of file diff --git a/APP_Framework/Applications/control_app/plc_demo/schneider/m241_recipe.json b/APP_Framework/Applications/control_app/plc_demo/schneider/json/m241_recipe.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/schneider/m241_recipe.json rename to APP_Framework/Applications/control_app/plc_demo/schneider/json/m241_recipe.json diff --git a/APP_Framework/Applications/control_app/plc_demo/siemens/test_recipe_S7_1512.json b/APP_Framework/Applications/control_app/plc_demo/siemens/json/test_recipe_S7_1512.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/siemens/test_recipe_S7_1512.json rename to APP_Framework/Applications/control_app/plc_demo/siemens/json/test_recipe_S7_1512.json diff --git a/APP_Framework/Applications/control_app/plc_demo/xinje/README.md b/APP_Framework/Applications/control_app/plc_demo/xinje/README.md old mode 100644 new mode 100755 index bd9d268a9..c2c58dc4b --- a/APP_Framework/Applications/control_app/plc_demo/xinje/README.md +++ b/APP_Framework/Applications/control_app/plc_demo/xinje/README.md @@ -1,4 +1,4 @@ -# XINJIE 通信测试 +# XINJE通信测试 [TOC] @@ -12,12 +12,55 @@ - 存储区M、D区。 +## JSON配方设计 + +* 共测试BOOL,INT16共2种类型数据,以下为JSON文件解释。 + + - ```json + { + "device_id": 1, //设备ID默认是1,此参数无效 + "device_name": "XDH", //设备名称,自定义 + "communication_type": 0, //通讯协议类型 0是以太网,1是串口 + "socket_config": { //以太网配置 + "plc_ip": "192.168.250.32", //PLC的IP地址 + "local_ip": "192.168.250.233", //矽达通IP地址设定 + "gateway": "192.168.250.1", //矽达通的网关地址设定 + "netmask": "255.255.255.0", //矽达通子网掩码设定 + "port":502 //端口号设定 + }, + "protocol_type": 3, //通讯协议,3代表modbus-tcp协议 + "read_period": 100, //交互周期ms + "read_item_list": [ + { + "value_name": "MW0", //变量名称,自定义 + "value_type": 3, //变量类型,BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9 + "function_code": 3, //功能码。3是读 + "start_address": 0, //起始地址 + "data_length": 1 //BOOL长度,默认是1,代表读取1个BOOL长度 + }, + { + "value_name": "MW1", //变量名称,自定义 + "value_type": 3, //变量类型,BOOL = 1,INT8 = 2,INT16,INT32,UINT8,UINT16,UINT32,DOUBLE,FLOAT = 9 + "function_code": 3, //功能码。3是读 + "start_address": 1, //起始地址偏移1位 + "data_length": 1 //BOOL长度,默认是1,代表读取1个BOOL长度 + } + ] + } + ``` + ## 通信测试 -(1)共测试BOOL,INT16共2种类型数据。 + (1) 新增1个通信demo,命名为xinje_xdh.c; -(2)测试M区及D区数据。 + (2) 复制样例代码程序到xinje_xdh.c文件中; -(3)D区数据测试,用功能码03和06,以字为单位读写。如读写D500,则配方文件中起始地址则直接写500即可。 + (3) void **ControlXINJEXDHTest**(void) 更改函数名; -(4)M区数据测试,用功能码01和05,以位为单位读写。如读写M19,则配方文件中起始地址则直接写19即可。 + (4) PRIV_SHELL_CMD_FUNCTION(**ControlXINJEXDHTest**, **Omron Plc Cp1l Demo**, PRIV_SHELL_CMD_MAIN_ATTR);更改测试指令; + + (5) 剪裁配置完成后,用过烧写器下载至矽达通中,重启后完成测试。 + + + + diff --git a/APP_Framework/Applications/control_app/plc_demo/xinje/test_recipe_xdh_60t4-e.json b/APP_Framework/Applications/control_app/plc_demo/xinje/json/test_recipe_xdh_60t4-e.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/xinje/test_recipe_xdh_60t4-e.json rename to APP_Framework/Applications/control_app/plc_demo/xinje/json/test_recipe_xdh_60t4-e.json diff --git a/APP_Framework/Applications/control_app/plc_demo/xinje/test_recipe_xsdh-60a32-e.json b/APP_Framework/Applications/control_app/plc_demo/xinje/json/test_recipe_xsdh-60a32-e.json similarity index 100% rename from APP_Framework/Applications/control_app/plc_demo/xinje/test_recipe_xsdh-60a32-e.json rename to APP_Framework/Applications/control_app/plc_demo/xinje/json/test_recipe_xsdh-60a32-e.json diff --git a/Ubiquitous/XiZi_IIoT/Makefile b/Ubiquitous/XiZi_IIoT/Makefile index 251cd08de..c41b4eda9 100755 --- a/Ubiquitous/XiZi_IIoT/Makefile +++ b/Ubiquitous/XiZi_IIoT/Makefile @@ -6,7 +6,7 @@ MAKEFLAGS += --no-print-directory riscv_support := kd233 maix-go hifive1-rev-B gapuino gd32vf103-rvstar rv32m1-vega aiit-riscv64-board xidatong-riscv64 edu-riscv64 -arm_support += stm32f407-st-discovery stm32f407zgt6 stm32f103-nano nuvoton-m2354 ok1052-c imxrt1176-sbc aiit-arm32-board xidatong-arm32 xiwangtong-arm32 hc32f4a0 +arm_support += stm32f407-st-discovery stm32f407zgt6 stm32f103-nano nuvoton-m2354 ok1052-c imxrt1176-sbc aiit-arm32-board xidatong-arm32 xiwangtong-arm32 edu-arm32 emulator_support += hifive1-emulator k210-emulator cortex-m0-emulator cortex-m3-emulator cortex-m4-emulator support := $(riscv_support) $(arm_support) $(emulator_support) SRC_DIR := @@ -62,10 +62,6 @@ PART += COMPILE_KERNEL else ifeq ($(CONFIG_COMPILER_APP)_$(CONFIG_COMPILER_KERNEL),y_y) PART := COMPILE_APP COMPILE_KERNEL -else ifeq ($(CONFIG_MCUBOOT_BOOTLOADER), y) -PART := COMPILE_BOOTLOADER -else ifeq ($(CONFIG_MCUBOOT_APPLICATION), y) -PART := COMPILE_APPLICATION else PART := @@ -77,9 +73,16 @@ ifeq ($(CONFIG_RESOURCES_LWIP), y) PART += COMPILE_LWIP endif +ifeq ($(CONFIG_MCUBOOT_BOOTLOADER), y) +PART += COMPILE_BOOTLOADER +else ifeq ($(CONFIG_MCUBOOT_APPLICATION), y) +PART += COMPILE_APPLICATION +else PART += COMPILE_ALL endif +endif + all: $(PART) diff --git a/Ubiquitous/XiZi_IIoT/README.md b/Ubiquitous/XiZi_IIoT/README.md index 12cb57a16..bdad447fb 100644 --- a/Ubiquitous/XiZi_IIoT/README.md +++ b/Ubiquitous/XiZi_IIoT/README.md @@ -23,13 +23,13 @@ ARM架构系列的开发板有 - aiit-arm32-board nuvoton-m2354 ok1052-c stm32f103-nano stm32f407-st-discovery stm32f407zgt6 xidatong-arm32 + aiit-arm32-board nuvoton-m2354 ok1052-c stm32f103-nano stm32f407-st-discovery stm32f407zgt6 xidatong-arm32 edu-arm32 ### RISC-V RISC-V架构系列的开发板有 - aiit-riscv64-board gapuino gd32vf103-rvstar hifive1-rev-B kd233 maix-go rv32m1-vega + aiit-riscv64-board gapuino gd32vf103-rvstar hifive1-rev-B kd233 maix-go rv32m1-vega edu-riscv64 ## 开发环境 diff --git a/Ubiquitous/XiZi_IIoT/arch/arm/Makefile b/Ubiquitous/XiZi_IIoT/arch/arm/Makefile index c612d35b7..f923b359c 100644 --- a/Ubiquitous/XiZi_IIoT/arch/arm/Makefile +++ b/Ubiquitous/XiZi_IIoT/arch/arm/Makefile @@ -25,7 +25,7 @@ SRC_DIR := shared SRC_DIR += cortex-m4 endif -ifeq ($(CONFIG_BOARD_HC32F4A0_EVB),y) +ifeq ($(CONFIG_BOARD_EDU_ARM32_EVB),y) SRC_DIR := shared SRC_DIR += cortex-m4 endif diff --git a/Ubiquitous/XiZi_IIoT/arch/arm/cortex-m4/Makefile b/Ubiquitous/XiZi_IIoT/arch/arm/cortex-m4/Makefile index c314ad140..12d565825 100644 --- a/Ubiquitous/XiZi_IIoT/arch/arm/cortex-m4/Makefile +++ b/Ubiquitous/XiZi_IIoT/arch/arm/cortex-m4/Makefile @@ -14,7 +14,7 @@ SRC_FILES += svc_handle.c mpu.c endif endif -ifeq ($(CONFIG_BOARD_HC32F4A0_EVB),y) +ifeq ($(CONFIG_BOARD_EDU_ARM32_EVB),y) SRC_DIR += hc32f4a0 endif diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/.defconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/.defconfig similarity index 98% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/.defconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/.defconfig index aff17c060..c49acf577 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/.defconfig +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/.defconfig @@ -2,7 +2,7 @@ # Automatically generated file; DO NOT EDIT. # XiZi_IIoT Project Configuration # -CONFIG_BOARD_HC32F4A0_EVB=y +CONFIG_BOARD_EDU_ARM32_EVB=y CONFIG_ARCH_ARM=y # @@ -25,7 +25,7 @@ CONFIG_SERIAL_6_DEVICE_NAME_0="usart6_dev6" # # config board app name # -CONFIG_BOARD_APP_NAME="/XiUOS_hc32f4a0_app.bin" +CONFIG_BOARD_APP_NAME="/XiUOS_edu_arm32_app.bin" # # Hardware feature diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/Kconfig similarity index 87% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/Kconfig index 71d3f01cf..ff3bd5b09 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/Kconfig +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/Kconfig @@ -10,21 +10,21 @@ config KERNEL_DIR option env="KERNEL_ROOT" default "../.." -config BOARD_HC32F4A0_EVB +config BOARD_EDU_ARM32_EVB bool select ARCH_ARM default y source "$KERNEL_DIR/arch/Kconfig" -menu "hc32f4a0 feature" +menu "edu-arm32 feature" source "$BSP_DIR/third_party_driver/Kconfig" menu "config default board resources" menu "config board app name" config BOARD_APP_NAME string "config board app name" - default "/XiUOS_hc32f4a0_app.bin" + default "/XiUOS_edu_arm32_app.bin" endmenu endmenu diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/README.md b/Ubiquitous/XiZi_IIoT/board/edu-arm32/README.md similarity index 92% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/README.md rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/README.md index aa53e8265..a94c95d26 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/README.md +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/README.md @@ -1,4 +1,4 @@ -# 从零开始构建矽璓工业物联操作系统:使用ARM架构的HC32F4A0开发板 +# 从零开始构建矽璓工业物联操作系统:使用ARM架构的edu-arm32开发板 [XiUOS](http://xuos.io/) (X Industrial Ubiquitous Operating System) 矽璓工业物联操作系统是一款面向工业物联场景的泛在操作系统,来自泛在操作系统研究计划。所谓泛在操作系统(UOS: Ubiquitous Operating Systems),是支持互联网时代人机物融合泛在计算应用模式的新型操作系统,是传统操作系统概念的泛化与延伸。在泛在操作系统技术体系中,不同的泛在计算设备和泛在应用场景需要符合各自特性的不同UOS,XiUOS即是面向工业物联场景的一种UOS,主要由一个极简的微型实时操作系统(RTOS)内核和其上的智能工业物联框架构成,支持工业物联网(IIoT: Industrial Internet of Things)应用。 @@ -101,7 +101,7 @@ ARM: arm-none-eabi(`gcc version 6.3.1`),默认安装到Ubuntu的/usr/bin/arm $ sudo apt install gcc-arm-none-eabi ``` -# 在HC32F4A0上创建第一个应用 --helloworld +# 在edu-arm32上创建第一个应用 --helloworld ## 1. 简介 @@ -133,8 +133,8 @@ XiUOS板级驱动当前支持使用UART。 ```c cd ./Ubiquitous/XiZi -make BOARD=hc32f4a0 distclean -make BOARD=hc32f4a0 menuconfig +make BOARD=edu-arm32 distclean +make BOARD=edu-arm32 menuconfig ``` 2.在menuconfig界面配置需要关闭和开启的功能,按回车键进入下级菜单,按Y键选中需要开启的功能,按N键选中需要关闭的功能,配置结束后保存并退出(本例旨在演示简单的输出例程,所以没有需要配置的选项,双击快捷键ESC退出配置) @@ -148,15 +148,15 @@ make BOARD=hc32f4a0 menuconfig 3.继续执行以下命令,进行编译 ```c -make BOARD=hc32f4a0 +make BOARD=edu-arm32 ``` -4.如果编译正确无误,会产生XiZi_hc32f4a0.elf、XiZi_hc32f4a0.bin文件。其中XiZi_shc32f4a0.bin需要烧写到设备中进行运行。 +4.如果编译正确无误,会产生XiZi-edu-arm32.elf、XiZi-edu-arm32.bin文件。其中XiZi-edu-arm32.bin需要烧写到设备中进行运行。 ## 3. 烧写及执行 ### 3.1 烧写 -将BOARD=hc32f4a0开发板通过TYPE-C接口转接到PC,然后使用华大官方HDSC ISP工具进行烧写bin文件。 +将BOARD=edu-arm32开发板通过TYPE-C接口转接到PC,然后使用华大官方HDSC ISP工具进行烧写bin文件。 1、烧写工具:HDSC ISP,可参考[https://www.hdsc.com.cn/Category83-1496](https://www.hdsc.com.cn/Category83-1496) @@ -167,6 +167,6 @@ make BOARD=hc32f4a0 ### 3.2 运行结果 -如果编译 & 烧写无误,将会在串口终端上看到信息打印输出,(终端串口引脚为UART3)。 +如果编译 & 烧写无误,将会在串口终端上看到信息打印输出,(终端TYPE-C串口引脚为UART3)。 ![terminal](img/terminal.png) diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/board.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/board.c similarity index 97% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/board.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/board.c index 4abb10aac..82d8e3c64 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/board.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/board.c @@ -12,7 +12,7 @@ /** * @file board.c -* @brief support hc32f4a0-board init configure and start-up +* @brief support edu-arm32-board init configure and start-up * @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-08 @@ -20,13 +20,13 @@ /************************************************* File name: board.c -Description: support hc32f4a0-board init configure and driver/task/... init +Description: support edu-arm32-board init configure and driver/task/... init Others: History: 1. Date: 2022-09-08 Author: AIIT XUOS Lab Modification: -1. support hc32f4a0-board InitBoardHardware +1. support edu-arm32-board InitBoardHardware *************************************************/ #include diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/board.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/board.h similarity index 83% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/board.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/board.h index 802b79aa0..83abadd0c 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/board.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/board.h @@ -12,7 +12,7 @@ /** * @file board.h -* @brief define hc32f4a0-board init configure and start-up function +* @brief define edu-arm32-board init configure and start-up function * @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-08 @@ -20,14 +20,14 @@ /************************************************* File name: board.h -Description: define hc32f4a0-board board init function and struct +Description: define edu-arm32-board board init function and struct Others: History: 1. Date: 2021-04-25 Author: AIIT XUOS Lab Modification: -1. define hc32f4a0-board InitBoardHardware -2. define hc32f4a0-board data and bss struct +1. define edu-arm32-board InitBoardHardware +2. define edu-arm32-board data and bss struct *************************************************/ #ifndef BOARD_H diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/config.mk b/Ubiquitous/XiZi_IIoT/board/edu-arm32/config.mk similarity index 76% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/config.mk rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/config.mk index ef43289d2..cf681ac77 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/config.mk +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/config.mk @@ -2,10 +2,10 @@ export CROSS_COMPILE ?=/usr/bin/arm-none-eabi- export CFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -fgnu89-inline -Wa,-mimplicit-it=thumb -Werror export AFLAGS := -c -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -x assembler-with-cpp -Wa,-mimplicit-it=thumb -gdwarf-2 -export LFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_hc32f4a0.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds +export LFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-edu-arm32.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds export CXXFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -Werror -export APPLFLAGS := -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi_app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds +export APPLFLAGS := export DEFINES := -DHAVE_CCONFIG_H -DHC32F4A0 -DUSE_DDL_DRIVER -DHAVE_SIGINFO diff --git a/Ubiquitous/XiZi_IIoT/board/edu-arm32/img/HDSC_ISP.png b/Ubiquitous/XiZi_IIoT/board/edu-arm32/img/HDSC_ISP.png new file mode 100644 index 000000000..059d331af Binary files /dev/null and b/Ubiquitous/XiZi_IIoT/board/edu-arm32/img/HDSC_ISP.png differ diff --git a/Ubiquitous/XiZi_IIoT/board/edu-arm32/img/menuconfig1.png b/Ubiquitous/XiZi_IIoT/board/edu-arm32/img/menuconfig1.png new file mode 100644 index 000000000..f4f5f1b26 Binary files /dev/null and b/Ubiquitous/XiZi_IIoT/board/edu-arm32/img/menuconfig1.png differ diff --git a/Ubiquitous/XiZi_IIoT/board/edu-arm32/img/menuconfig2.png b/Ubiquitous/XiZi_IIoT/board/edu-arm32/img/menuconfig2.png new file mode 100644 index 000000000..00b72372e Binary files /dev/null and b/Ubiquitous/XiZi_IIoT/board/edu-arm32/img/menuconfig2.png differ diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/img/terminal.png b/Ubiquitous/XiZi_IIoT/board/edu-arm32/img/terminal.png similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/img/terminal.png rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/img/terminal.png diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/include/hc32f4a0.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/include/hc32f4a0.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/include/hc32f4a0.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/include/hc32f4a0.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/include/system_hc32f4a0.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/include/system_hc32f4a0.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/include/system_hc32f4a0.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/include/system_hc32f4a0.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/link.lds b/Ubiquitous/XiZi_IIoT/board/edu-arm32/link.lds similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/link.lds rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/link.lds diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/CMSIS/include/cmsis_compiler.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/CMSIS/include/cmsis_compiler.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/CMSIS/include/cmsis_compiler.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/CMSIS/include/cmsis_compiler.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/CMSIS/include/cmsis_gcc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/CMSIS/include/cmsis_gcc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/CMSIS/include/cmsis_gcc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/CMSIS/include/cmsis_gcc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/CMSIS/include/cmsis_version.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/CMSIS/include/cmsis_version.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/CMSIS/include/cmsis_version.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/CMSIS/include/cmsis_version.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/CMSIS/include/core_cm4.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/CMSIS/include/core_cm4.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/CMSIS/include/core_cm4.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/CMSIS/include/core_cm4.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/CMSIS/include/mpu_armv7.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/CMSIS/include/mpu_armv7.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/CMSIS/include/mpu_armv7.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/CMSIS/include/mpu_armv7.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/adc/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/adc/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/adc/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/adc/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/adc/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/adc/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/adc/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/adc/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/adc/connect_adc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/adc/connect_adc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/adc/connect_adc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/adc/connect_adc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/can/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/can/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/can/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/can/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/can/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/can/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/can/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/can/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/can/connect_can.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/can/connect_can.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/can/connect_can.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/can/connect_can.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hardware_irq.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hardware_irq.c similarity index 96% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hardware_irq.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hardware_irq.c index 8fa5187a4..61f730f14 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hardware_irq.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hardware_irq.c @@ -11,7 +11,7 @@ /** * @file hardware_irq.c -* @brief support hc32f4a0-board irq configure +* @brief support edu-arm32-board irq configure * @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-13 @@ -19,13 +19,13 @@ /************************************************* File name: hardware_irq.c -Description: support hc32f4a0-board irq configure +Description: support edu-arm32-board irq configure Others: History: 1. Date: 2022-09-13 Author: AIIT XUOS Lab Modification: -1. support hc32f4a0-board irq +1. support edu-arm32-board irq *************************************************/ /******************************************************************************* diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_adc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_adc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_adc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_adc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_aes.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_aes.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_aes.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_aes.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_aos.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_aos.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_aos.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_aos.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_can.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_can.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_can.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_can.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_clk.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_clk.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_clk.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_clk.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_cmp.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_cmp.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_cmp.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_cmp.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_crc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_crc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_crc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_crc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_ctc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_ctc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_ctc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_ctc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dac.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dac.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dac.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dac.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dcu.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dcu.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dcu.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dcu.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_def.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_def.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_def.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_def.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dma.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dma.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dma.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dma.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dmc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dmc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dmc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dmc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dvp.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dvp.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dvp.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_dvp.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_efm.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_efm.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_efm.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_efm.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_emb.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_emb.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_emb.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_emb.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_eth.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_eth.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_eth.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_eth.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_event_port.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_event_port.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_event_port.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_event_port.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fcg.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fcg.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fcg.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fcg.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fcm.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fcm.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fcm.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fcm.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fmac.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fmac.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fmac.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_fmac.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_gpio.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_gpio.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_gpio.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_gpio.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_hash.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_hash.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_hash.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_hash.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_hrpwm.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_hrpwm.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_hrpwm.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_hrpwm.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_i2c.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_i2c.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_i2c.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_i2c.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_i2s.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_i2s.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_i2s.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_i2s.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_icg.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_icg.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_icg.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_icg.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_interrupts.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_interrupts.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_interrupts.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_interrupts.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_keyscan.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_keyscan.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_keyscan.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_keyscan.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_mau.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_mau.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_mau.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_mau.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_mpu.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_mpu.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_mpu.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_mpu.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_nfc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_nfc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_nfc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_nfc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_ots.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_ots.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_ots.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_ots.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_pwc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_pwc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_pwc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_pwc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_qspi.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_qspi.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_qspi.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_qspi.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_rmu.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_rmu.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_rmu.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_rmu.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_rtc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_rtc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_rtc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_rtc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_sdioc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_sdioc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_sdioc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_sdioc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_smc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_smc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_smc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_smc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_spi.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_spi.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_spi.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_spi.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_sram.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_sram.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_sram.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_sram.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_swdt.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_swdt.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_swdt.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_swdt.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr0.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr0.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr0.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr0.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr2.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr2.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr2.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr2.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr4.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr4.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr4.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr4.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr6.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr6.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr6.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmr6.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmra.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmra.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmra.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_tmra.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_trng.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_trng.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_trng.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_trng.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_usart.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_usart.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_usart.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_usart.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_usb.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_usb.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_usb.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_usb.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_utility.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_utility.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_utility.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_utility.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_wdt.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_wdt.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_wdt.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32_ll_wdt.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32f4a0_ll_interrupts_share.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32f4a0_ll_interrupts_share.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32f4a0_ll_interrupts_share.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32f4a0_ll_interrupts_share.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32f4xx.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32f4xx.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32f4xx.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32f4xx.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32f4xx_conf.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32f4xx_conf.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/inc/hc32f4xx_conf.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/inc/hc32f4xx_conf.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_adc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_adc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_adc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_adc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_aes.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_aes.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_aes.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_aes.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_aos.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_aos.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_aos.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_aos.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_can.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_can.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_can.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_can.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_clk.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_clk.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_clk.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_clk.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_cmp.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_cmp.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_cmp.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_cmp.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_crc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_crc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_crc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_crc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_ctc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_ctc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_ctc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_ctc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dac.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dac.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dac.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dac.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dcu.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dcu.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dcu.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dcu.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dma.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dma.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dma.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dma.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dmc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dmc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dmc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dmc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dvp.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dvp.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dvp.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_dvp.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_efm.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_efm.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_efm.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_efm.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_emb.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_emb.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_emb.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_emb.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_eth.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_eth.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_eth.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_eth.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_event_port.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_event_port.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_event_port.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_event_port.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fcg.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fcg.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fcg.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fcg.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fcm.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fcm.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fcm.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fcm.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fmac.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fmac.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fmac.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_fmac.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_gpio.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_gpio.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_gpio.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_gpio.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_hash.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_hash.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_hash.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_hash.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_hrpwm.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_hrpwm.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_hrpwm.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_hrpwm.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_i2c.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_i2c.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_i2c.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_i2c.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_i2s.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_i2s.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_i2s.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_i2s.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_icg.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_icg.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_icg.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_icg.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_interrupts.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_interrupts.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_interrupts.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_interrupts.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_keyscan.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_keyscan.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_keyscan.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_keyscan.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_mau.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_mau.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_mau.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_mau.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_mpu.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_mpu.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_mpu.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_mpu.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_nfc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_nfc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_nfc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_nfc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_ots.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_ots.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_ots.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_ots.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_pwc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_pwc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_pwc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_pwc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_qspi.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_qspi.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_qspi.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_qspi.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_rmu.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_rmu.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_rmu.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_rmu.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_rtc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_rtc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_rtc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_rtc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_sdioc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_sdioc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_sdioc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_sdioc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_smc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_smc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_smc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_smc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_spi.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_spi.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_spi.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_spi.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_sram.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_sram.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_sram.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_sram.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_swdt.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_swdt.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_swdt.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_swdt.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr0.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr0.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr0.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr0.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr2.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr2.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr2.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr2.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr4.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr4.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr4.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr4.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr6.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr6.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr6.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmr6.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmra.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmra.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmra.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_tmra.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_trng.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_trng.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_trng.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_trng.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_usart.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_usart.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_usart.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_usart.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_usb.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_usb.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_usb.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_usb.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_utility.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_utility.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_utility.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_utility.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_wdt.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_wdt.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32_ll_wdt.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32_ll_wdt.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32f4a0_ll_interrupts_share.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32f4a0_ll_interrupts_share.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/hc32_ll_driver/src/hc32f4a0_ll_interrupts_share.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/hc32_ll_driver/src/hc32f4a0_ll_interrupts_share.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/system_hc32f4a0.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/system_hc32f4a0.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/common/system_hc32f4a0.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/common/system_hc32f4a0.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/dac/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/dac/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/dac/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/dac/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/dac/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/dac/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/dac/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/dac/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/dac/connect_dac.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/dac/connect_dac.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/dac/connect_dac.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/dac/connect_dac.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/ethernet/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/ethernet/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/ethernet/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/ethernet/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/ethernet/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/ethernet/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/ethernet/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/ethernet/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/ethernet/eth_driver.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/ethernet/eth_driver.c similarity index 99% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/ethernet/eth_driver.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/ethernet/eth_driver.c index ea8cf81c3..69a76fa0a 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/ethernet/eth_driver.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/ethernet/eth_driver.c @@ -1,6 +1,6 @@ /** * @file ethernetif.c -* @brief support hc32f4a0-board ethernetif function and register to Lwip +* @brief support edu-arm32-board ethernetif function and register to Lwip * @version 3.0 * @author AIIT XUOS Lab * @date 2022-12-05 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/ethernet/ethernetif.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/ethernet/ethernetif.c similarity index 96% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/ethernet/ethernetif.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/ethernet/ethernetif.c index c5d8fc1dd..1e50cdfab 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/ethernet/ethernetif.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/ethernet/ethernetif.c @@ -20,7 +20,7 @@ /** * @file ethernetif.c -* @brief support hc32f4a0-board ethernetif function and register to Lwip +* @brief support edu-arm32-board ethernetif function and register to Lwip * @version 3.0 * @author AIIT XUOS Lab * @date 2022-12-05 @@ -28,7 +28,7 @@ /************************************************* File name: ethernetif.c -Description: support hc32f4a0-board ethernetif configure and register to Lwip +Description: support edu-arm32-board ethernetif configure and register to Lwip Others: take projects\ev_hc32f4a0_lqfp176\examples\eth\eth_loopback\source\ethernetif.c for references History: 1. Date: 2022-12-05 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/gpio/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/gpio/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/gpio/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/gpio/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/gpio/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/gpio/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/gpio/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/gpio/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/gpio/connect_gpio.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/gpio/connect_gpio.c similarity index 98% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/gpio/connect_gpio.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/gpio/connect_gpio.c index d22f24925..b2a76c7f1 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/gpio/connect_gpio.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/gpio/connect_gpio.c @@ -13,7 +13,7 @@ /** * @file connect_gpio.c -* @brief support hc32f4a0-board gpio function using bus driver framework +* @brief support edu-arm32-board gpio function using bus driver framework * @version 3.0 * @author AIIT XUOS Lab * @date 2022-12-05 @@ -21,14 +21,14 @@ /************************************************* File name: connect_gpio.c -Description: support hc32f4a0-board gpio configure and gpio bus register function +Description: support edu-arm32-board gpio configure and gpio bus register function Others: take projects/ev_hc32f4a0_lqfp176/examples/gpio/gpio_output/source/main.c for references History: 1. Date: 2022-12-05 Author: AIIT XUOS Lab Modification: -1. support hc32f4a0-board gpio configure, write and read -2. support hc32f4a0-board gpio bus device and driver register +1. support edu-arm32-board gpio configure, write and read +2. support edu-arm32-board gpio bus device and driver register *************************************************/ #include diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/i2c/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/i2c/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/i2c/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/i2c/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/i2c/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/i2c/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/i2c/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/i2c/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/i2c/connect_i2c.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/i2c/connect_i2c.c similarity index 97% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/i2c/connect_i2c.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/i2c/connect_i2c.c index 4285425f4..d59f7b98b 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/i2c/connect_i2c.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/i2c/connect_i2c.c @@ -12,7 +12,7 @@ /** * @file connect_i2c.c -* @brief support hc32f4a0-board i2c function and register to bus framework +* @brief support edu-arm32-board i2c function and register to bus framework * @version 3.0 * @author AIIT XUOS Lab * @date 2022-12-05 @@ -20,14 +20,14 @@ /************************************************* File name: connect_i2c.c -Description: support hc32f4a0-board i2c configure and i2c bus register function +Description: support edu-arm32-board i2c configure and i2c bus register function Others: take projects/ev_hc32f4a0_lqfp176/examples/i2c/i2c_master_polling/source/main.c for references History: 1. Date: 2022-12-05 Author: AIIT XUOS Lab Modification: -1. support hc32f4a0-board i2c configure, write and read -2. support hc32f4a0-board i2c bus device and driver register +1. support edu-arm32-board i2c configure, write and read +2. support edu-arm32-board i2c bus device and driver register *************************************************/ #include @@ -304,7 +304,7 @@ static int BoardI2cDevBend(void) return ret; } -/* HC32F4A0 BOARD I2C INIT*/ +/* EDU-ARM32 BOARD I2C INIT*/ int HwI2cInit(void) { x_err_t ret = EOK; diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_adc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_adc.h similarity index 93% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_adc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_adc.h index abadd5410..d961b5611 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_adc.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_adc.h @@ -12,7 +12,7 @@ /** * @file connect_uart.h -* @brief define hc32f4a0-board usart function and struct +* @brief define edu-arm32-board usart function and struct * @version 2.0 * @author AIIT XUOS Lab * @date 2023-02-09 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_can.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_can.h similarity index 93% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_can.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_can.h index 0982db925..2a7369c42 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_can.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_can.h @@ -12,7 +12,7 @@ /** * @file connect_can.h -* @brief define hc32f4a0-board can function and struct +* @brief define edu-arm32-board can function and struct * @version 2.0 * @author AIIT XUOS Lab * @date 2023-02-21 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_dac.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_dac.h similarity index 94% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_dac.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_dac.h index 201dec23f..1108fcfdb 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_dac.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_dac.h @@ -12,7 +12,7 @@ /** * @file connect_uart.h -* @brief define hc32f4a0-board usart function and struct +* @brief define edu-arm32-board usart function and struct * @version 2.0 * @author AIIT XUOS Lab * @date 2023-02-09 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_ethernet.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_ethernet.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_ethernet.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_ethernet.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_flash.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_flash.h similarity index 93% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_flash.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_flash.h index 1f2962665..63d59eb16 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_flash.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_flash.h @@ -12,7 +12,7 @@ /** * @file connect_flash.h -* @brief define hc32f4a0-board qspi-flash function and struct +* @brief define edu-arm32-board qspi-flash function and struct * @version 2.0 * @author AIIT XUOS Lab * @date 2022-10-17 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_gpio.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_gpio.h similarity index 99% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_gpio.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_gpio.h index b6f27b1ce..1ef238671 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_gpio.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_gpio.h @@ -12,7 +12,7 @@ /** * @file connect_gpio.h -* @brief define hc32f4a0-board gpio function and struct +* @brief define edu-arm32-board gpio function and struct * @version 3.0 * @author AIIT XUOS Lab * @date 2022-12-05 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_hwtimer.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_hwtimer.h similarity index 93% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_hwtimer.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_hwtimer.h index d988c73ba..0ec541003 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_hwtimer.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_hwtimer.h @@ -12,7 +12,7 @@ /** * @file connect_hwtimer.h -* @brief define hc32f4a0-board hwtimer function and struct +* @brief define edu-arm32-board hwtimer function and struct * @version 2.0 * @author AIIT XUOS Lab * @date 2023-02-16 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_i2c.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_i2c.h similarity index 94% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_i2c.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_i2c.h index 2da6b2683..3b0ab7c45 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_i2c.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_i2c.h @@ -12,7 +12,7 @@ /** * @file connect_i2c.h -* @brief define hc32f4a0-board i2c function and struct +* @brief define edu-arm32-board i2c function and struct * @version 3.0 * @author AIIT XUOS Lab * @date 2022-12-05 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_rtc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_rtc.h similarity index 88% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_rtc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_rtc.h index 54d684929..fc0512bd8 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_rtc.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_rtc.h @@ -12,14 +12,14 @@ /** * @file connect_rtc.h -* @brief define hc32f4a0-board rtc function and struct +* @brief define edu-arm32-board rtc function and struct * @version 3.0 * @author AIIT XUOS Lab * @date 2023-02-02 */ -#ifndef CONNECT_I2C_H -#define CONNECT_I2C_H +#ifndef CONNECT_RTC_H +#define CONNECT_RTC_H #include #include diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_sdio.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_sdio.h similarity index 94% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_sdio.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_sdio.h index 38c72db94..bee72d44a 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_sdio.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_sdio.h @@ -12,7 +12,7 @@ /** * @file connect_sdio.h -* @brief define hc32f4a0-board sdio function and struct +* @brief define edu-arm32-board sdio function and struct * @version 2.0 * @author AIIT XUOS Lab * @date 2022-03-15 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_spi.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_spi.h similarity index 93% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_spi.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_spi.h index 08489b93b..63d64b127 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_spi.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_spi.h @@ -12,7 +12,7 @@ /** * @file connect_spi.h -* @brief define hc32f4a0-board spi function and struct +* @brief define edu-arm32-board spi function and struct * @version 2.0 * @author AIIT XUOS Lab * @date 2022-10-17 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_spi_lora.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_spi_lora.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_spi_lora.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_spi_lora.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_usart.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_usart.h similarity index 96% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_usart.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_usart.h index 8e277da82..3def9ee43 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_usart.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_usart.h @@ -12,7 +12,7 @@ /** * @file connect_uart.h -* @brief define hc32f4a0-board usart function and struct +* @brief define edu-arm32-board usart function and struct * @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-13 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_usb.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_usb.h similarity index 95% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_usb.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_usb.h index 71c58a043..2d17a181f 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_usb.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_usb.h @@ -12,7 +12,7 @@ /** * @file connect_usb.h -* @brief define hc32f4a0-board usb function and struct +* @brief define edu-arm32-board usb function and struct * @version 2.0 * @author AIIT XUOS Lab * @date 2022-11-07 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_wdt.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_wdt.h similarity index 87% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_wdt.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_wdt.h index 8c7c8499d..c0c7b3cd6 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/connect_wdt.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/connect_wdt.h @@ -12,14 +12,14 @@ /** * @file connect_wdt.h -* @brief define hc32f4a0-board watchdog function and struct +* @brief define edu-arm32-board watchdog function and struct * @version 3.0 * @author AIIT XUOS Lab * @date 2023-02-02 */ -#ifndef CONNECT_I2C_H -#define CONNECT_I2C_H +#ifndef CONNECT_WDT_H +#define CONNECT_WDT_H #include #include diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/hardware_ethernetif.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/hardware_ethernetif.h similarity index 99% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/hardware_ethernetif.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/hardware_ethernetif.h index a366fd075..95a7a52e4 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/hardware_ethernetif.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/hardware_ethernetif.h @@ -20,7 +20,7 @@ /** * @file hardware_ethernetif.h -* @brief define hc32f4a0-board ethernetif function and struct +* @brief define edu-arm32-board ethernetif function and struct * @version 3.0 * @author AIIT XUOS Lab * @date 2022-12-05 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/hardware_irq.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/hardware_irq.h similarity index 99% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/hardware_irq.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/hardware_irq.h index 2df7cb669..6da7e9084 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/hardware_irq.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/hardware_irq.h @@ -11,7 +11,7 @@ /** * @file hardware_irq.h -* @brief define hc32f4a0-board irq function and struct +* @brief define edu-arm32-board irq function and struct * @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-13 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/hardware_sdio.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/hardware_sdio.h similarity index 97% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/hardware_sdio.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/hardware_sdio.h index a94380164..c98833550 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/include/hardware_sdio.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/include/hardware_sdio.h @@ -21,7 +21,7 @@ /** * @file hardware_sdio.h -* @brief define hc32f4a0-board sdio function and struct +* @brief define edu-arm32-board sdio function and struct * @version 2.0 * @author AIIT XUOS Lab * @date 2022-10-18 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/rtc/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/rtc/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/rtc/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/rtc/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/rtc/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/rtc/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/rtc/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/rtc/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/rtc/connect_rtc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/rtc/connect_rtc.c similarity index 98% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/rtc/connect_rtc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/rtc/connect_rtc.c index a5bedccfa..14b7b2378 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/rtc/connect_rtc.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/rtc/connect_rtc.c @@ -12,7 +12,7 @@ /** * @file connect_rtc.c -* @brief support aiit-hc32f4a0-board rtc function and register to bus framework +* @brief support aiit-edu-arm32-board rtc function and register to bus framework * @version 1.0 * @author AIIT XUOS Lab * @date 2023-02-02 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/sdio/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/sdio/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/sdio/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/sdio/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/sdio/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/sdio/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/sdio/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/sdio/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/sdio/connect_sdio.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/sdio/connect_sdio.c similarity index 97% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/sdio/connect_sdio.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/sdio/connect_sdio.c index 32ae8ac8d..ead99a2ac 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/sdio/connect_sdio.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/sdio/connect_sdio.c @@ -28,14 +28,14 @@ /************************************************* File name: connect_sdio.c -Description: support hc32f4a0-board sd card configure and sdio bus register function +Description: support edu-arm32-board sd card configure and sdio bus register function Others: History: 1. Date: 2022-01-24 Author: AIIT XUOS Lab Modification: -1. support hc32f4a0-board sdio configure, write and read -2. support hc32f4a0-board sdio bus device and driver register +1. support edu-arm32-board sdio configure, write and read +2. support edu-arm32-board sdio bus device and driver register *************************************************/ #include diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/sdio/hardware_sdio.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/sdio/hardware_sdio.c similarity index 97% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/sdio/hardware_sdio.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/sdio/hardware_sdio.c index b56d151fb..fcf28c185 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/sdio/hardware_sdio.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/sdio/hardware_sdio.c @@ -28,7 +28,7 @@ /************************************************* File name: hardware_sdio.c -Description: support hc32f4a0-board sd card configure +Description: support edu-arm32-board sd card configure Others: History: 1. Date: 2022-10-18 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_flash.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/connect_flash.c similarity index 98% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_flash.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/connect_flash.c index 89438cc21..27fe601ef 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_flash.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/connect_flash.c @@ -12,7 +12,7 @@ /** * @file connect_flash.c -* @brief support hc32f4a0-board qspi-flash function and register to bus framework +* @brief support edu-arm32-board qspi-flash function and register to bus framework * @version 2.0 * @author AIIT XUOS Lab * @date 2023-02-16 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_lora_spi.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/connect_lora_spi.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_lora_spi.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/connect_lora_spi.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_spi.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/connect_spi.c similarity index 98% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_spi.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/connect_spi.c index 6a7d8620c..24dc5e8ef 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_spi.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/connect_spi.c @@ -12,7 +12,7 @@ /** * @file connect_spi.c -* @brief support hc32f4a0-board spi function and register to bus framework +* @brief support edu-arm32-board spi function and register to bus framework * @version 2.0 * @author AIIT XUOS Lab * @date 2022-10-17 @@ -20,14 +20,14 @@ /************************************************* File name: connect_spi.c -Description: support hc32f4a0-board spi function and register to bus framework +Description: support edu-arm32-board spi function and register to bus framework Others: History: 1. Date: 2022-10-17 Author: AIIT XUOS Lab Modification: -1. support hc32f4a0-board spi configure, write and read -2. support hc32f4a0-board spi bus device and driver register +1. support edu-arm32-board spi configure, write and read +2. support edu-arm32-board spi bus device and driver register 3. SPI1 for LoRa, SPI6 using J12-pin-header to connect *************************************************/ diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/inc/spi_lora_sx12xx.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/inc/spi_lora_sx12xx.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/inc/spi_lora_sx12xx.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/inc/spi_lora_sx12xx.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/platform.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/platform.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/platform.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/platform.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/radio.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/radio.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/radio.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/radio.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/radio.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/radio.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/radio.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/radio.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Fsk.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Fsk.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Fsk.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Fsk.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Fsk.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Fsk.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Fsk.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Fsk.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-FskMisc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-FskMisc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-FskMisc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-FskMisc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-FskMisc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-FskMisc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-FskMisc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-FskMisc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Hal.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Hal.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Hal.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-Hal.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRa.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRa.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRa.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRa.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRa.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRa.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRa.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRa.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRaMisc.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRaMisc.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRaMisc.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRaMisc.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRaMisc.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRaMisc.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRaMisc.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276-LoRaMisc.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/spi/third_party_spi_lora/sx12xx/src/radio/sx1276.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/timer/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/timer/Kconfig similarity index 72% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/timer/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/timer/Kconfig index 62af5e3e9..2ec110cac 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/timer/Kconfig +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/timer/Kconfig @@ -1,9 +1,9 @@ -menuconfig BSP_USING_TIMER_0 -bool "Using timer 0" -default n -select RESOURCES_HWTIMER +menuconfig BSP_USING_HWTIMER + bool "Using hwtimer" + default y + select RESOURCES_HWTIMER -if BSP_USING_TIMER_0 +if BSP_USING_HWTIMER config HWTIMER_BUS_NAME_0 string "timer 0 bus 0 name" default "timer0" diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/timer/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/timer/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/timer/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/timer/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/timer/connect_hwtimer.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/timer/connect_hwtimer.c similarity index 96% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/timer/connect_hwtimer.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/timer/connect_hwtimer.c index 37ad87ec6..dec5de52e 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/timer/connect_hwtimer.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/timer/connect_hwtimer.c @@ -12,7 +12,7 @@ /** * @file connect_hwtimer.c -* @brief support aiit-riscv64-board hwtimer function and register to bus framework +* @brief support edu-arm32-board hwtimer function and register to bus framework * @version 1.0 * @author AIIT XUOS Lab * @date 2021-04-25 @@ -23,8 +23,8 @@ #define TMR0_CMP_VAL 1000 #define TMR0x ((CM_TMR0_TypeDef *)CM_TMR0_1_BASE) #define TMR0_CH_x (TMR0_CH_A) -#define INTSEL_REG ((uint32_t)(&CM_INTC->SEL0)) -#define TIMER0_IRQn (18) +#define INTSEL_REG ((uint32_t)(&CM_INTC->SEL0)) +#define TIMER0_IRQn (18) void (*callback_function)(void *) ; @@ -163,7 +163,7 @@ static int BoardHwtimerDevBend(void) return ret; } -/*HC32F4A0 BOARD HWTIMER INIT*/ +/*EDU-ARM32 BOARD HWTIMER INIT*/ int HwTimerInit(void) { x_err_t ret = EOK; diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usart/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usart/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usart/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usart/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usart/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usart/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usart/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usart/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usart/connect_usart.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usart/connect_usart.c similarity index 98% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usart/connect_usart.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usart/connect_usart.c index 6552514ec..47a9ca68a 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usart/connect_usart.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usart/connect_usart.c @@ -21,7 +21,7 @@ /** * @file connect_usart.c -* @brief support hc32f4a0-board usart function and register to bus framework +* @brief support edu-arm32-board usart function and register to bus framework * @version 2.0 * @author AIIT XUOS Lab * @date 2022-09-13 @@ -29,14 +29,14 @@ /************************************************* File name: connect_usart.c -Description: support hc32f4a0-board usart configure and usart bus register function +Description: support edu-arm32-board usart configure and usart bus register function Others: take projects\ev_hc32f4a0_lqfp176\examples\usart\usart_uart_int\source\main.c for references History: 1. Date: 2022-09-13 Author: AIIT XUOS Lab Modification: -1. support hc32f4a0-board usart configure, write and read -2. support hc32f4a0-board usart bus device and driver register +1. support edu-arm32-board usart configure, write and read +2. support edu-arm32-board usart bus device and driver register *************************************************/ #include diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/connect_usb.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/connect_usb.c similarity index 95% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/connect_usb.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/connect_usb.c index 3c1853b10..e92d7a338 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/connect_usb.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/connect_usb.c @@ -12,7 +12,7 @@ /** * @file connect_usb.c -* @brief support hc32f4a0-board usb function and register to bus framework +* @brief support edu-arm32-board usb function and register to bus framework * @version 2.0 * @author AIIT XUOS Lab * @date 2022-11-07 @@ -20,14 +20,14 @@ /************************************************* File name: connect_usb.c -Description: support hc32f4a0-board usb function and register to bus framework +Description: support edu-arm32-board usb function and register to bus framework Others: History: 1. Date: 2022-11-07 Author: AIIT XUOS Lab Modification: -1. support hc32f4a0-board usb configure, write and read -2. support hc32f4a0-board usb bus device and driver register +1. support edu-arm32-board usb configure, write and read +2. support edu-arm32-board usb bus device and driver register *************************************************/ #include diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_app_conf.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_app_conf.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_app_conf.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_app_conf.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_bsp.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_bsp.c similarity index 95% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_bsp.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_bsp.c index 7e4f4c981..9f15e24e9 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_bsp.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_bsp.c @@ -20,7 +20,7 @@ /** * @file usb_bsp.c -* @brief support hc32f4a0-board usb bsp function +* @brief support edu-arm32-board usb bsp function * @version 2.0 * @author AIIT XUOS Lab * @date 2022-11-08 @@ -28,14 +28,14 @@ /************************************************* File name: usb_bsp.c -Description: support hc32f4a0-board usb bsp function +Description: support edu-arm32-board usb bsp function Others: History: 1. Date: 2022-11-08 Author: AIIT XUOS Lab Modification: -1. support hc32f4a0-board usb IO configure -2. support hc32f4a0-board usb irq define +1. support edu-arm32-board usb IO configure +2. support edu-arm32-board usb irq define *************************************************/ #include #include "usb_bsp.h" diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_bsp.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_bsp.h similarity index 96% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_bsp.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_bsp.h index d09cd20a3..794ad0551 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_bsp.h +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_bsp.h @@ -20,7 +20,7 @@ /** * @file usb_bsp.h -* @brief support hc32f4a0-board usb bsp function +* @brief support edu-arm32-board usb bsp function * @version 2.0 * @author AIIT XUOS Lab * @date 2022-11-08 @@ -28,7 +28,7 @@ /************************************************* File name: usb_bsp.h -Description: support hc32f4a0-board usb bsp function +Description: support edu-arm32-board usb bsp function Others: History: 1. Date: 2022-11-08 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_bot.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_bot.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_bot.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_bot.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_bot.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_bot.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_bot.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_bot.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_class.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_class.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_class.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_class.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_class.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_class.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_class.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_class.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_fatfs.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_fatfs.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_fatfs.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_fatfs.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_scsi.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_scsi.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_scsi.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_scsi.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_scsi.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_scsi.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_scsi.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_class/msc/usb_host_msc_scsi.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_cfgch.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_cfgch.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_cfgch.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_cfgch.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_cfgch.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_cfgch.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_cfgch.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_cfgch.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_core.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_core.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_core.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_core.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_core.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_core.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_core.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_core.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_ctrltrans.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_ctrltrans.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_ctrltrans.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_ctrltrans.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_ctrltrans.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_ctrltrans.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_ctrltrans.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_ctrltrans.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_def.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_def.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_def.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_def.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_driver.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_driver.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_driver.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_driver.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_driver.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_driver.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_driver.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_driver.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_int.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_int.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_int.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_int.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_int.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_int.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_int.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_int.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_stdreq.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_stdreq.c similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_stdreq.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_stdreq.c diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_stdreq.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_stdreq.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_stdreq.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/host_core/usb_host_stdreq.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/usb_lib.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/usb_lib.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_lib/usb_lib.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_lib/usb_lib.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_user.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_user.c similarity index 95% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_user.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_user.c index d3ceadb1f..244559d5e 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_user.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_user.c @@ -20,7 +20,7 @@ /** * @file usb_host_user.c -* @brief support hc32f4a0-board usb function +* @brief support edu-arm32-board usb function * @version 2.0 * @author AIIT XUOS Lab * @date 2022-11-07 @@ -28,7 +28,7 @@ /************************************************* File name: usb_host_user.c -Description: support hc32f4a0-board usb function +Description: support edu-arm32-board usb function Others: History: 1. Date: 2022-11-07 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_user.h b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_user.h similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/usb/hc32_usb_driver/usb_host_user.h rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/usb/hc32_usb_driver/usb_host_user.h diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/watchdog/Kconfig b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/watchdog/Kconfig similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/watchdog/Kconfig rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/watchdog/Kconfig diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/watchdog/Makefile b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/watchdog/Makefile similarity index 100% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/watchdog/Makefile rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/watchdog/Makefile diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/watchdog/connect_wdt.c b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/watchdog/connect_wdt.c similarity index 97% rename from Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/watchdog/connect_wdt.c rename to Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/watchdog/connect_wdt.c index d0271264d..afb8d68d7 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/watchdog/connect_wdt.c +++ b/Ubiquitous/XiZi_IIoT/board/edu-arm32/third_party_driver/watchdog/connect_wdt.c @@ -12,7 +12,7 @@ /** * @file connect_wdt.c -* @brief support hc32f4a0-board watchdog function and register to bus framework +* @brief support edu-arm32-board watchdog function and register to bus framework * @version 1.0 * @author AIIT XUOS Lab * @date 2023-02-02 diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/img/HDSC_ISP.png b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/img/HDSC_ISP.png deleted file mode 100644 index e79dff29d..000000000 Binary files a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/img/HDSC_ISP.png and /dev/null differ diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/img/menuconfig1.png b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/img/menuconfig1.png deleted file mode 100644 index 3aed06191..000000000 Binary files a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/img/menuconfig1.png and /dev/null differ diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/img/menuconfig2.png b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/img/menuconfig2.png deleted file mode 100644 index 8bfe533ee..000000000 Binary files a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/img/menuconfig2.png and /dev/null differ diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/config.mk b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/config.mk index 4da08fe5c..4085d6c06 100644 --- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/config.mk +++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/config.mk @@ -1,8 +1,8 @@ export CROSS_COMPILE ?=/usr/bin/arm-none-eabi- -export CFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g -fgnu89-inline -Wa,-mimplicit-it=thumb +export CFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Dgcc -O1 -fgnu89-inline -Wa,-mimplicit-it=thumb -export AFLAGS := -c -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -x assembler-with-cpp -Wa,-mimplicit-it=thumb -gdwarf-2 +export AFLAGS := -c -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -x assembler-with-cpp -Wa,-mimplicit-it=thumb ### if use USB function, use special lds file because USB uses ITCM ifeq ($(CONFIG_LIB_MUSLLIB), y) @@ -25,7 +25,7 @@ else export LFLAGS += -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-xidatong-arm32.map,-cref,-u,Reset_Handler -T $(BSP_ROOT)/link.lds endif -export CXXFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Dgcc -O0 -gdwarf-2 -g +export CXXFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Dgcc -O1 export APPLFLAGS := -mcpu=cortex-m7 -mthumb -ffunction-sections -fdata-sections -Wl,--gc-sections,-Map=XiZi-app.map,-cref,-u, -T $(BSP_ROOT)/link_userspace.lds diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link-application.lds b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link-application.lds index 6769453e6..c0467d14b 100644 --- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link-application.lds +++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link-application.lds @@ -56,7 +56,7 @@ MEMORY m_interrupts (RX) : ORIGIN = 0x60100000, LENGTH = 0x00000400 m_text (RX) : ORIGIN = 0x60100400, LENGTH = 0x000FFC00 - m_data (RW) : ORIGIN = 0x20000000, LENGTH = 0x00020000 + m_data (RW) : ORIGIN = 0x20000000, LENGTH = 0x00060000 m_data2 (RW) : ORIGIN = 0x20200000, LENGTH = 0x00060000 m_sdram (RW) : ORIGIN = 0x80000000, LENGTH = 0x01E00000 diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link-bootloader.lds b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link-bootloader.lds index 4ce000519..448b35d98 100644 --- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link-bootloader.lds +++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link-bootloader.lds @@ -60,7 +60,7 @@ MEMORY m_interrupts (RX) : ORIGIN = 0x60002000, LENGTH = 0x00000400 m_text (RX) : ORIGIN = 0x60002400, LENGTH = 0x0007DC00 - m_data (RW) : ORIGIN = 0x20000000, LENGTH = 0x00020000 + m_data (RW) : ORIGIN = 0x20000000, LENGTH = 0x00060000 m_data2 (RW) : ORIGIN = 0x20200000, LENGTH = 0x00060000 m_sdram (RW) : ORIGIN = 0x80000000, LENGTH = 0x01E00000 diff --git a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link.lds b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link.lds index 0147853db..73c2c72fd 100644 --- a/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link.lds +++ b/Ubiquitous/XiZi_IIoT/board/xidatong-arm32/link.lds @@ -58,7 +58,7 @@ MEMORY m_interrupts (RX) : ORIGIN = 0x60002000, LENGTH = 0x00000400 m_text (RX) : ORIGIN = 0x60002400, LENGTH = 0x03FFDC00 - m_data (RW) : ORIGIN = 0x20000000, LENGTH = 0x00020000 + m_data (RW) : ORIGIN = 0x20000000, LENGTH = 0x00060000 m_data2 (RW) : ORIGIN = 0x20200000, LENGTH = 0x00060000 m_sdram (RW) : ORIGIN = 0x80000000, LENGTH = 0x01E00000 diff --git a/Ubiquitous/XiZi_IIoT/path_kernel.mk b/Ubiquitous/XiZi_IIoT/path_kernel.mk index d97b59204..df84837ca 100755 --- a/Ubiquitous/XiZi_IIoT/path_kernel.mk +++ b/Ubiquitous/XiZi_IIoT/path_kernel.mk @@ -391,7 +391,7 @@ KERNELPATHS += \ -I$(BSP_ROOT)/include # endif -ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/hc32f4a0) +ifeq ($(BSP_ROOT),$(KERNEL_ROOT)/board/edu-arm32) KERNELPATHS += \ -I$(KERNEL_ROOT)/arch/arm/cortex-m4/hc32f4a0 \ -I$(KERNEL_ROOT)/arch/arm/cortex-m4 \