Skip to content

Commit c0c8ca4

Browse files
nomis52nomis52
committed
Merge pull request #218 from nomis52/1_06
Port the main app to Harmony 1.06.
2 parents 6e669ae + 11dd6f1 commit c0c8ca4

40 files changed

Lines changed: 1678 additions & 1070 deletions

‎Bootloader/firmware/Bootloader.X/nbproject/configurations.xml‎

Lines changed: 66 additions & 58 deletions
Large diffs are not rendered by default.

‎Bootloader/firmware/src/system_config/ethernet_sk2/configuration.xml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
<Name>sys_common.h</Name>
4848
<Path>Header Files/framework/system/common</Path>
4949
</File>
50-
<File>
51-
<Name>system.h</Name>
52-
<Path>Header Files/framework/system</Path>
53-
</File>
5450
<File>
5551
<Name>sys_ports.c</Name>
5652
<Path>Source Files/framework/system/ports/src</Path>
5753
</File>
54+
<File>
55+
<Name>system.h</Name>
56+
<Path>Header Files/framework/system</Path>
57+
</File>
5858
<File>
5959
<Name>usb_device_endpoint_functions.c</Name>
6060
<Path>Source Files/framework/usb/src/dynamic</Path>
@@ -67,6 +67,10 @@
6767
<Name>drv_usbfs_device.c</Name>
6868
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
6969
</File>
70+
<File>
71+
<Name>sys_reset.c</Name>
72+
<Path>Source Files/framework/system/reset/src</Path>
73+
</File>
7074
<File>
7175
<Name>bsp_sys_init.c</Name>
7276
<Path>Source Files/bsp/pic32mx_eth_sk2</Path>
@@ -103,6 +107,10 @@
103107
<Name>drv_usbfs.c</Name>
104108
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
105109
</File>
110+
<File>
111+
<Name>sys_reset.h</Name>
112+
<Path>Header Files/framework/system/reset</Path>
113+
</File>
106114
</Files>
107115
<Templates>
108116
<Template>
@@ -121,7 +129,7 @@
121129
<Template>
122130
<Name>system_definitions.h</Name>
123131
<Path>Header Files/app/system_config/ethernet_sk2</Path>
124-
<Checksum>C6785C685DC369BA3FA09D75205BB944</Checksum>
132+
<Checksum>4C15FF48ED162717B757C2A8EB16A04B</Checksum>
125133
</Template>
126134
<Template>
127135
<Name>system_interrupt.c</Name>

‎Bootloader/firmware/src/system_config/ethernet_sk2/ethernet_sk2.mhc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ CONFIG_USE_SYS_RANDOM=n
272272
#
273273
# from $HARMONY_VERSION_PATH/framework/system/reset/config/sys_reset.hconfig
274274
#
275-
CONFIG_USE_SYS_RESET=n
275+
CONFIG_USE_SYS_RESET=y
276276
#
277277
# from $HARMONY_VERSION_PATH/framework/system/touch/config/sys_touch.hconfig
278278
#

‎Bootloader/firmware/src/system_config/ethernet_sk2/system_definitions.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
5656
#include "system/clk/sys_clk_static.h"
5757
#include "system/devcon/sys_devcon.h"
5858
#include "system/int/sys_int.h"
59+
#include "system/reset/sys_reset.h"
5960
#include "system/ports/sys_ports.h"
6061
#include "driver/usb/usbfs/drv_usbfs.h"
6162
#include "usb/usb_device.h"

‎Bootloader/firmware/src/system_config/number1/configuration.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
<Name>drv_usbfs_device.c</Name>
4343
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
4444
</File>
45+
<File>
46+
<Name>sys_reset.c</Name>
47+
<Path>Source Files/framework/system/reset/src</Path>
48+
</File>
4549
<File>
4650
<Name>sys_devcon.c</Name>
4751
<Path>Source Files/framework/system/devcon/src</Path>
@@ -70,6 +74,10 @@
7074
<Name>drv_usbfs.c</Name>
7175
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
7276
</File>
77+
<File>
78+
<Name>sys_reset.h</Name>
79+
<Path>Header Files/framework/system/reset</Path>
80+
</File>
7381
</Files>
7482
<Templates>
7583
<Template>
@@ -93,7 +101,7 @@
93101
<Template>
94102
<Name>system_definitions.h</Name>
95103
<Path>Header Files/app/system_config/number1</Path>
96-
<Checksum>C6785C685DC369BA3FA09D75205BB944</Checksum>
104+
<Checksum>4C15FF48ED162717B757C2A8EB16A04B</Checksum>
97105
</Template>
98106
<Template>
99107
<Name>sys_clk_static.h</Name>

‎Bootloader/firmware/src/system_config/number1/number1.mhc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ CONFIG_USE_SYS_RANDOM=n
260260
#
261261
# from $HARMONY_VERSION_PATH/framework/system/reset/config/sys_reset.hconfig
262262
#
263-
CONFIG_USE_SYS_RESET=n
263+
CONFIG_USE_SYS_RESET=y
264264
#
265265
# from $HARMONY_VERSION_PATH/framework/system/touch/config/sys_touch.hconfig
266266
#

‎Bootloader/firmware/src/system_config/number1/system_definitions.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
5656
#include "system/clk/sys_clk_static.h"
5757
#include "system/devcon/sys_devcon.h"
5858
#include "system/int/sys_int.h"
59+
#include "system/reset/sys_reset.h"
5960
#include "system/ports/sys_ports.h"
6061
#include "driver/usb/usbfs/drv_usbfs.h"
6162
#include "usb/usb_device.h"

‎Bootloader/firmware/src/system_config/number8/configuration.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
<Name>drv_usbfs_device.c</Name>
4343
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
4444
</File>
45+
<File>
46+
<Name>sys_reset.c</Name>
47+
<Path>Source Files/framework/system/reset/src</Path>
48+
</File>
4549
<File>
4650
<Name>sys_devcon.c</Name>
4751
<Path>Source Files/framework/system/devcon/src</Path>
@@ -70,6 +74,10 @@
7074
<Name>drv_usbfs.c</Name>
7175
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
7276
</File>
77+
<File>
78+
<Name>sys_reset.h</Name>
79+
<Path>Header Files/framework/system/reset</Path>
80+
</File>
7381
</Files>
7482
<Templates>
7583
<Template>
@@ -112,7 +120,7 @@
112120
<Template>
113121
<Name>system_definitions.h</Name>
114122
<Path>Header Files/app/system_config/number8</Path>
115-
<Checksum>C6785C685DC369BA3FA09D75205BB944</Checksum>
123+
<Checksum>4C15FF48ED162717B757C2A8EB16A04B</Checksum>
116124
</Template>
117125
<Template>
118126
<Name>system_config.h</Name>

‎Bootloader/firmware/src/system_config/number8/number8.mhc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ CONFIG_USE_SYS_RANDOM=n
260260
#
261261
# from $HARMONY_VERSION_PATH/framework/system/reset/config/sys_reset.hconfig
262262
#
263-
CONFIG_USE_SYS_RESET=n
263+
CONFIG_USE_SYS_RESET=y
264264
#
265265
# from $HARMONY_VERSION_PATH/framework/system/touch/config/sys_touch.hconfig
266266
#

‎Bootloader/firmware/src/system_config/number8/system_definitions.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
5656
#include "system/clk/sys_clk_static.h"
5757
#include "system/devcon/sys_devcon.h"
5858
#include "system/int/sys_int.h"
59+
#include "system/reset/sys_reset.h"
5960
#include "system/ports/sys_ports.h"
6061
#include "driver/usb/usbfs/drv_usbfs.h"
6162
#include "usb/usb_device.h"

0 commit comments

Comments
 (0)