hehaoyang/AVS
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 7 Wiki Activity

V1.20 1. 增加红外遥控器待机按钮; 2. 增加红外控制时的等闪烁控制;

Browse Source
This commit is contained in:
hehaoyang 2023-10-18 17:43:02 +08:00
parent b9794010ed
commit 9dcf65ad46
10 changed files with 1102 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -203,3 +203,15 @@ GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/wdgt.d
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/wdgt.o
GD32F103C8T6/Bootloader/Bootloader_Debug.jlink
GD32F103C8T6/App/App_Debug.jlink
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/fmc.d
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/fmc.o
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gpio.d
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gpio.o
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/iap.d
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/iap.o
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/setting.d
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/setting.o
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/spi.d
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/spi.o
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/system.d
GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/system.o

1036
GD32F103C8T6/App.hex Normal file
View File

File diff suppressed because it is too large Load Diff

7
GD32F103C8T6/App/GD32F103CB_MemoryMap.xml Normal file
View File

@ -0,0 +1,7 @@
<!DOCTYPE Board_Memory_Definition_File>
<root name="GD32F103CB">
<MemorySegment name="FLASH1" start="0x08004000" size="0x0000C800" access="ReadOnly" />
<MemorySegment name="RAM1" start="0x20000000" size="0x00005000" access="Read/Write" />
</root>
<!0x08004000 0x00005800>

2
GD32F103C8T6/App/User/Api/api.h
View File

@ -22,7 +22,7 @@
#define API_FRAME_RESPONSE (0x01) /* 响应帧 */
#define API_FRAME_NOTIFICATION (0x02) /* 通知帧 */
#define SOFTWARE_VERSION ("V1.19")
#define SOFTWARE_VERSION ("V1.20")
#define HARDWARE_VERSION ("V1.01")
extern uint8_t api_upgrade_mode;

19
GD32F103C8T6/App/User/app.c
View File

@ -46,6 +46,8 @@ static uint8_t diaodu_upload_status = 0;
/* 频闪灯复位*/
static void strobe_light_reset(void);
/* 频闪灯闪烁*/
static void strobe_light_toggle(uint8_t count);
#ifdef USE_LED
/* LED 指示灯分析任务 */
@ -142,7 +144,7 @@ void app_init(void)
m62429_init();
// ir_init();
ir_init();
/* 主动获取一次IO状态 */
door_front_status = door_front_status_temporary = gpio_input_bit_get(DOOR_FRONT_PERIPH, DOOR_FRONT_PIN);
@ -201,6 +203,17 @@ static void strobe_light_reset(void)
gpio_bit_write(LED_STROBE_PERIPH, LED_STROBE_PIN, RESET);
}
static void strobe_light_toggle(uint8_t count)
{
while(count--)
{
gpio_bit_write(LED_STROBE_PERIPH, LED_STROBE_PIN, SET);
delay_ms(100);
gpio_bit_write(LED_STROBE_PERIPH, LED_STROBE_PIN, RESET);
delay_ms(100);
}
}
#ifdef USE_LED
static void led_parsing_task(uint8_t uuid)
{
@ -736,9 +749,13 @@ void ir_key_triggered(uint8_t key)
level = volume_level - 1;
else if (key == 0x68) /* - */
level = volume_level + 1;
else if(key == 0xA2)
level = 3;
else
return;
strobe_light_toggle(2);
set_volume_level(level);
api_upload_data_forwarding(0x06, level);

4
GD32F103C8T6/App/main.h
View File

@ -5,8 +5,8 @@
#define __weak __WEAK
/* Flash容量 (单位KB) */
#define FMC_CAPACITY_SIZE_64K
//#define FMC_CAPACITY_SIZE_128K
//#define FMC_CAPACITY_SIZE_64K
#define FMC_CAPACITY_SIZE_128K
//#define FMC_CAPACITY_SIZE_512K
/* 是否适用LED状态灯 */

7
GD32F103C8T6/Bootloader/GD32F103CB_MemoryMap.xml Normal file
View File

@ -0,0 +1,7 @@
<!DOCTYPE Board_Memory_Definition_File>
<root name="GD32F103CB">
<MemorySegment name="FLASH1" start="0x08000000" size="0x00004000" access="ReadOnly" />
<MemorySegment name="RAM1" start="0x20000000" size="0x00005000" access="Read/Write" />
</root>
<!0x08004000 0x00005800>

4
GD32F103C8T6/Bootloader/main.h
View File

@ -5,8 +5,8 @@
#define __weak __WEAK
/* Flash容量 (单位KB) */
#define FMC_CAPACITY_SIZE_64K
//#define FMC_CAPACITY_SIZE_128K
//#define FMC_CAPACITY_SIZE_64K
#define FMC_CAPACITY_SIZE_128K
#include "gd32f10x_libopt.h"

20
GD32F103C8T6/GD32F10x.emProject
View File

@ -30,7 +30,7 @@
arm_rtl_variant="SEGGER"
arm_simulator_memory_simulation_parameter="ROM;0x08000000;0x00020000;RAM;0x20000000;0x00005000"
arm_target_debug_interface_type="ADIv5"
arm_target_device_name="GD32F103C8"
arm_target_device_name="GD32F103CB"
arm_target_interface_type="SWD"
c_preprocessor_definitions="ARM_MATH_CM3;GD32F10X_MD;USE_STDPERIPH_DRIVER;__GD32F103_SUBFAMILY;__GD32F10X_FAMILY;__NO_FPU_ENABLE"
c_user_include_directories="$(ProjectDir);$(ProjectDir)/CMSIS_5/CMSIS/Core/Include;$(ProjectDir)/User;$(ProjectDir)/User/Api;$(ProjectDir)/User/Libs/Include;$(ProjectDir)/User/Peripheral/AK517;$(ProjectDir)/User/Peripheral/CAN;$(ProjectDir)/User/Peripheral/DiaoDu;$(ProjectDir)/User/Peripheral/IR;$(ProjectDir)/User/Peripheral/M62429;$(ProjectDir)/User/Peripheral/QGEL50X;$(ProjectDir)/User/Peripheral/V58;$(ProjectDir)/../../../../arm/GD32F10x/Driver/Include;$(ProjectDir)/../../../../arm/GD32F10x/System/Include;$(ProjectDir)/../../../../arm/GD32F10x/Utils/Byte"
@ -40,11 +40,11 @@
debug_target_connection="J-Link"
gcc_entry_point="Reset_Handler"
link_linker_script_file="$(ProjectDir)/GD32F10x_Flash.icf"
linker_memory_map_file="$(ProjectDir)/GD32F103C8_MemoryMap.xml"
linker_output_format="bin"
linker_memory_map_file="$(ProjectDir)/GD32F103CB_MemoryMap.xml"
linker_output_format="hex"
linker_printf_fp_enabled="Float"
linker_section_placements_segments="FLASH1 RX 0x08000000 0x00010000;RAM1 RWX 0x20000000 0x00005000;"
macros="DeviceHeaderFile=$(PackagesDir)/GD32F10x/Device/Include/gd32f10x.h;DeviceSystemFile=$(PackagesDir)/GD32F10x/Device/Source/system_gd32f10x.c;DeviceVectorsFile=$(PackagesDir)/GD32F10x/Source/gd32f10x_md_Vectors.s;DeviceFamily=GD32F10x;DeviceSubFamily=GD32F103;Target=GD32F103C8"
linker_section_placements_segments="FLASH1 RX 0x08000000 0x00020000;RAM1 RWX 0x20000000 0x00005000;"
macros="DeviceHeaderFile=$(PackagesDir)/GD32F10x/Device/Include/gd32f10x.h;DeviceSystemFile=$(PackagesDir)/GD32F10x/Device/Source/system_gd32f10x.c;DeviceVectorsFile=$(PackagesDir)/GD32F10x/Source/gd32f10x_md_Vectors.s;DeviceFamily=GD32F10x;DeviceSubFamily=GD32F103;Target=GD32F103CB"
project_directory="App"
project_type="Executable"
target_reset_script="Reset();"
@ -202,20 +202,20 @@
arm_rtl_variant="SEGGER"
arm_simulator_memory_simulation_parameter="ROM;0x08000000;0x00020000;RAM;0x20000000;0x00005000"
arm_target_debug_interface_type="ADIv5"
arm_target_device_name="GD32F103C8"
arm_target_device_name="GD32F103CB"
arm_target_interface_type="SWD"
c_preprocessor_definitions="ARM_MATH_CM3;GD32F10X_MD;USE_STDPERIPH_DRIVER;__GD32F103_SUBFAMILY;__GD32F10X_FAMILY;__NO_FPU_ENABLE"
c_user_include_directories="$(ProjectDir);$(ProjectDir)/CMSIS_5/CMSIS/Core/Include;$(ProjectDir)/User;$(ProjectDir)/../../../../arm/GD32F10x/Driver/Include;$(ProjectDir)/../../../../arm/GD32F10x/System/Include;$(ProjectDir)/../../../../arm/GD32F10x/Utils/Include"
c_user_include_directories="$(ProjectDir);$(ProjectDir)/CMSIS_5/CMSIS/Core/Include;$(ProjectDir)/User;$(ProjectDir)/../../../../arm/GD32F10x/Driver/Include;$(ProjectDir)/../../../../arm/GD32F10x/System/Include;$(ProjectDir)/../../../../arm/GD32F10x/Utils/Byte"
debug_register_definition_file="$(ProjectDir)/GD32F10x_MD_Registers.xml"
debug_stack_pointer_start="__stack_end__"
debug_start_from_entry_point_symbol="Yes"
debug_target_connection="J-Link"
gcc_entry_point="Reset_Handler"
link_linker_script_file="$(ProjectDir)/GD32F10x_Flash.icf"
linker_memory_map_file="$(ProjectDir)/GD32F103C8_MemoryMap.xml"
linker_memory_map_file="$(ProjectDir)/GD32F103CB_MemoryMap.xml"
linker_output_format="hex"
linker_section_placements_segments="FLASH1 RX 0x08000000 0x00010000;RAM1 RWX 0x20000000 0x00005000;"
macros="DeviceHeaderFile=$(PackagesDir)/GD32F10x/Device/Include/gd32f10x.h;DeviceSystemFile=$(PackagesDir)/GD32F10x/Device/Source/system_gd32f10x.c;DeviceVectorsFile=$(PackagesDir)/GD32F10x/Source/gd32f10x_md_Vectors.s;DeviceFamily=GD32F10x;DeviceSubFamily=GD32F103;Target=GD32F103C8"
linker_section_placements_segments="FLASH1 RX 0x08000000 0x00020000;RAM1 RWX 0x20000000 0x00005000;"
macros="DeviceHeaderFile=$(PackagesDir)/GD32F10x/Device/Include/gd32f10x.h;DeviceSystemFile=$(PackagesDir)/GD32F10x/Device/Source/system_gd32f10x.c;DeviceVectorsFile=$(PackagesDir)/GD32F10x/Source/gd32f10x_md_Vectors.s;DeviceFamily=GD32F10x;DeviceSubFamily=GD32F103;Target=GD32F103CB"
project_directory="Bootloader"
project_type="Executable"
target_reset_script="Reset();"

18
GD32F103C8T6/GD32F10x.emSession
View File

@ -2,8 +2,6 @@
<session>
<Bookmarks/>
<Breakpoints groups="Breakpoints" active_group="Breakpoints">
<BreakpointListItem trigger="" line="480" counter="0" hardwareBreakpoint="" isFunctionBreakpoint="false" action="" expression="" group="Breakpoints" type="Breakpoint" state="2" filename="App/User/app.c" useHWbreakpoint="false"/>
<BreakpointListItem trigger="" line="489" counter="0" hardwareBreakpoint="" isFunctionBreakpoint="false" action="" expression="" group="Breakpoints" type="Breakpoint" state="2" filename="App/User/app.c" useHWbreakpoint="false"/>
<BreakpointListItem trigger="" line="92" counter="0" hardwareBreakpoint="" isFunctionBreakpoint="false" action="" expression="" group="Breakpoints" type="Breakpoint" state="2" filename="../../../arm/GD32F10x/System/Source/task.c" useHWbreakpoint="false"/>
</Breakpoints>
<ExecutionProfileWindow/>
@ -34,8 +32,6 @@
<ProjectSessionItem path="GD32F10x"/>
<ProjectSessionItem path="GD32F10x;App"/>
<ProjectSessionItem path="GD32F10x;App;Device"/>
<ProjectSessionItem path="GD32F10x;App;Device;Driver"/>
<ProjectSessionItem path="GD32F10x;App;Device;Driver;Source"/>
<ProjectSessionItem path="GD32F10x;App;Device;System"/>
<ProjectSessionItem path="GD32F10x;App;Device;System;Source"/>
<ProjectSessionItem path="GD32F10x;App;User"/>
@ -92,12 +88,12 @@
<Watches active="0" update="Never"/>
</Watch4>
<Files>
<SessionOpenFile windowGroup="DockEditLeft" x="57" y="42" useTextEdit="1" path="App/main.c" left="0" top="42" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="16" y="28" useTextEdit="1" openedFrom="F:/Works/Tvis/AVS/GD32F103C8T6/App/User/app.c" path="App/main.h" left="0" top="28" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="44" y="236" useTextEdit="1" openedFrom="F:/Works/Tvis/AVS/GD32F103C8T6(1.1)/App/main.c" path="App/User/app.c" left="0" selected="1" top="222" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="0" y="5" useTextEdit="1" path="App/main.c" left="0" top="0" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="2" y="7" useTextEdit="1" openedFrom="F:/Works/Tvis/AVS/GD32F103C8T6/App/User/app.c" path="App/main.h" left="0" top="63" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="0" y="747" useTextEdit="1" openedFrom="X:/Works/Tvis/AVS/V1.20/App/User/Peripheral/IR/ir.c" path="App/User/app.c" left="0" top="732" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="0" y="56" useTextEdit="1" openedFrom="X:/Works/Tvis/AVS/GD32F103C8T6/App/User/app.c" path="App/User/Peripheral/V58/v58.c" left="0" top="56" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="35" y="18" useTextEdit="1" path="App/User/Api/api.h" left="0" top="18" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="38" y="199" useTextEdit="1" openedFrom="X:/Works/Tvis/AVS/GD32F103C8T6/App/User/Api/api.h" path="App/User/Api/api.c" left="0" top="183" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="49" y="38" useTextEdit="1" path="App/User/Api/api.h" left="0" selected="1" top="18" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="38" y="199" useTextEdit="1" openedFrom="X:/Works/Tvis/AVS/GD32F103C8T6/App/User/Api/api.h" path="App/User/Api/api.c" left="0" top="129" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="0" y="56" useTextEdit="1" openedFrom="F:/Works/Tvis/AVS/GD32F103C8T6(1.1)/App/main.c" path="../../../arm/GD32F10x/System/Source/task.c" left="0" top="55" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="24" y="4" useTextEdit="1" openedFrom="F:/Works/Tvis/AVS/GD32F103C8T6/App/User/Api/api.c" path="../../../arm/GD32F10x/System/Source/setting.c" left="9" top="1" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="8" y="5" useTextEdit="1" openedFrom="F:/Works/arm/GD32F10x/System/Source/setting.c" path="../../../arm/GD32F10x/System/Include/setting.h" left="0" top="1" codecName="UTF-8"/>
@ -105,12 +101,12 @@
<SessionOpenFile windowGroup="DockEditLeft" x="0" y="0" useTextEdit="1" path="App/User/Peripheral/DiaoDu/diaodu.c" left="0" top="0" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="5" y="99" useTextEdit="1" path="App/User/Peripheral/M62429/m62429.c" left="0" top="85" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="0" y="0" useTextEdit="1" path="App/User/Peripheral/IR/ir.h" left="0" top="0" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="0" y="7" useTextEdit="1" path="App/User/Peripheral/IR/ir.c" left="0" top="4" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="55" y="72" useTextEdit="1" path="App/User/Peripheral/IR/ir.c" left="0" top="64" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="35" y="6" useTextEdit="1" path="App/User/Peripheral/M62429/m62429.h" left="20" top="3" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="32" y="16" useTextEdit="1" path="App/User/Peripheral/V58/v58.h" left="17" top="13" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="23" y="198" useTextEdit="1" openedFrom="F:/Works/Tvis/AVS/GD32F103C8T6(1.1)/App/main.c" path="../../../arm/GD32F10x/System/Source/can.c" left="0" top="177" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="0" y="122" useTextEdit="1" openedFrom="F:/Works/arm/GD32F10x/System/Source/can.c" path="../../../arm/GD32F10x/Driver/Source/gd32f10x_rcu.c" left="0" top="119" codecName="UTF-8"/>
<SessionOpenFile windowGroup="DockEditLeft" x="0" y="23" useTextEdit="1" path="Bootloader/main.h" left="0" top="1" codecName="Default"/>
<SessionOpenFile windowGroup="DockEditLeft" x="41" y="36" useTextEdit="1" path="Bootloader/main.h" left="0" top="13" codecName="Default"/>
<SessionOpenFile windowGroup="DockEditLeft" x="8" y="32" useTextEdit="1" path="Bootloader/main.c" left="0" top="14" codecName="Default"/>
<SessionOpenFile windowGroup="DockEditLeft" x="73" y="117" useTextEdit="1" path="GD32F10x.emProject" left="0" top="110" codecName="Default"/>
<SessionOpenFile windowGroup="DockEditLeft" x="9" y="6" useTextEdit="1" path="../../../arm/GD32F10x/System/Include/system.h" left="0" top="0" codecName="Default"/>