Skip to content

Commit 22722bc

Browse files
nomis52nomis52
committed
Port Numer1 & Number8 bootloaders to harmony 1.06
1 parent 8eeb802 commit 22722bc

19 files changed

Lines changed: 827 additions & 528 deletions

File tree

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

Lines changed: 293 additions & 261 deletions
Large diffs are not rendered by default.

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</Schemes>
2727
</Designer>
2828
<General>
29-
<HarmonyPath path="../../../../../opt/microchip/harmony/v1_06"/>
29+
<HarmonyPath path="/opt/microchip/harmony/v1_06"/>
3030
<ForceOptimization flag="true"/>
3131
</General>
3232
<Manifest>
@@ -91,14 +91,14 @@
9191
<Name>sys_devcon.h</Name>
9292
<Path>Header Files/framework/system/devcon</Path>
9393
</File>
94-
<File>
95-
<Name>bsp_config.h</Name>
96-
<Path>Header Files/bsp/pic32mx_eth_sk2</Path>
97-
</File>
9894
<File>
9995
<Name>sys_devcon_pic32mx.c</Name>
10096
<Path>Source Files/framework/system/devcon/src</Path>
10197
</File>
98+
<File>
99+
<Name>bsp_config.h</Name>
100+
<Path>Header Files/bsp/pic32mx_eth_sk2</Path>
101+
</File>
102102
<File>
103103
<Name>drv_usbfs.c</Name>
104104
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
@@ -143,19 +143,19 @@
143143
<Checksum>999179DADE9ECD59953526F5E9F83ACC</Checksum>
144144
</Template>
145145
<Template>
146-
<Name>system_init.c</Name>
147-
<Path>Source Files/app/system_config/ethernet_sk2</Path>
148-
<Checksum>F043B6048BFC4EFD9C2245953137BEAC</Checksum>
146+
<Name>sys_clk_static.c</Name>
147+
<Path>Source Files/app/system_config/ethernet_sk2/framework/system/clk/src</Path>
148+
<Checksum>1B968DA82B5DD869A6119C3B7628D753</Checksum>
149149
</Template>
150150
<Template>
151151
<Name>sys_ports_static.c</Name>
152152
<Path>Source Files/app/system_config/ethernet_sk2/framework/system/ports/src</Path>
153153
<Checksum>195E32D12C5CC6C6829F0E960F41127D</Checksum>
154154
</Template>
155155
<Template>
156-
<Name>sys_clk_static.c</Name>
157-
<Path>Source Files/app/system_config/ethernet_sk2/framework/system/clk/src</Path>
158-
<Checksum>1B968DA82B5DD869A6119C3B7628D753</Checksum>
156+
<Name>system_init.c</Name>
157+
<Path>Source Files/app/system_config/ethernet_sk2</Path>
158+
<Checksum>F043B6048BFC4EFD9C2245953137BEAC</Checksum>
159159
</Template>
160160
<Template>
161161
<Name>system_config.h</Name>
@@ -165,11 +165,11 @@
165165
</Templates>
166166
<CompilerItems>
167167
<C32>
168-
<Include value="../../../../../../../opt/microchip/harmony/v1_06/bsp/pic32mx_eth_sk2"/>
168+
<Include value="/opt/microchip/harmony/v1_06/bsp/pic32mx_eth_sk2"/>
169169
</C32>
170170
</CompilerItems>
171171
<Libraries>
172-
<Library value="../../../../../../../opt/microchip/harmony/v1_06/bin/framework/peripheral/PIC32MX795F512L_peripherals.a"/>
172+
<Library value="/opt/microchip/harmony/v1_06/bin/framework/peripheral/PIC32MX795F512L_peripherals.a"/>
173173
</Libraries>
174174
</Manifest>
175175
</configuration>

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

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<configuration version="1.0.6.12">
33
<General>
4-
<HarmonyPath path="/opt/microchip/harmony/v1_02"/>
4+
<HarmonyPath path="/opt/microchip/harmony/v1_06"/>
55
<ForceOptimization flag="true"/>
66
</General>
77
<Manifest>
@@ -10,33 +10,25 @@
1010
<Name>sys_module.h</Name>
1111
<Path>Header Files/framework/system/common</Path>
1212
</File>
13-
<File>
14-
<Name>drv_usb.h</Name>
15-
<Path>Source Files/framework/driver/usb</Path>
16-
</File>
1713
<File>
1814
<Name>sys_int.h</Name>
1915
<Path>Header Files/framework/system/int</Path>
2016
</File>
2117
<File>
22-
<Name>sys_common.h</Name>
23-
<Path>Header Files/framework/system/common</Path>
24-
</File>
25-
<File>
26-
<Name>drv_usb.c</Name>
27-
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
18+
<Name>drv_usb.h</Name>
19+
<Path>Header Files/framework/driver/usb</Path>
2820
</File>
2921
<File>
30-
<Name>sys_ports.c</Name>
31-
<Path>Source Files/framework/system/ports/src</Path>
22+
<Name>sys_common.h</Name>
23+
<Path>Header Files/framework/system/common</Path>
3224
</File>
3325
<File>
3426
<Name>system.h</Name>
3527
<Path>Header Files/framework/system</Path>
3628
</File>
3729
<File>
38-
<Name>drv_usb_device.c</Name>
39-
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
30+
<Name>sys_ports.c</Name>
31+
<Path>Source Files/framework/system/ports/src</Path>
4032
</File>
4133
<File>
4234
<Name>usb_device_endpoint_functions.c</Name>
@@ -46,6 +38,10 @@
4638
<Name>usb_device.c</Name>
4739
<Path>Source Files/framework/usb/src/dynamic</Path>
4840
</File>
41+
<File>
42+
<Name>drv_usbfs_device.c</Name>
43+
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
44+
</File>
4945
<File>
5046
<Name>sys_devcon.c</Name>
5147
<Path>Source Files/framework/system/devcon/src</Path>
@@ -70,54 +66,63 @@
7066
<Name>sys_devcon_pic32mx.c</Name>
7167
<Path>Source Files/framework/system/devcon/src</Path>
7268
</File>
69+
<File>
70+
<Name>drv_usbfs.c</Name>
71+
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
72+
</File>
7373
</Files>
7474
<Templates>
75-
<Template>
76-
<Name>system_tasks.c</Name>
77-
<Path>Source Files/app/system_config/number1</Path>
78-
<Checksum>2545C461C5FD3CD396C0405A4F248D80</Checksum>
79-
</Template>
8075
<Template>
8176
<Name>main.c</Name>
8277
<Path>Source Files/app</Path>
8378
</Template>
8479
<Template>
85-
<Name>app.c</Name>
86-
<Path>Source Files/app</Path>
80+
<Name>system_tasks.c</Name>
81+
<Path>Source Files/app/system_config/number1</Path>
82+
<Checksum>C051440866B3433982D20908212CADC7</Checksum>
8783
</Template>
8884
<Template>
89-
<Name>system_definitions.h</Name>
90-
<Path>Header Files/app/system_config/number1</Path>
91-
<Checksum>876403A29946CD1CF765B663F0391522</Checksum>
85+
<Name>app.c</Name>
86+
<Path>Source Files/app</Path>
9287
</Template>
9388
<Template>
9489
<Name>sys_clk_static.c</Name>
9590
<Path>Source Files/app/system_config/number1/framework/system/clk/src</Path>
9691
<Checksum>1B968DA82B5DD869A6119C3B7628D753</Checksum>
9792
</Template>
93+
<Template>
94+
<Name>system_definitions.h</Name>
95+
<Path>Header Files/app/system_config/number1</Path>
96+
<Checksum>C6785C685DC369BA3FA09D75205BB944</Checksum>
97+
</Template>
9898
<Template>
9999
<Name>sys_clk_static.h</Name>
100100
<Path>Header Files/app/system_config/number1/framework/system/clk</Path>
101101
<Checksum>999179DADE9ECD59953526F5E9F83ACC</Checksum>
102102
</Template>
103-
<Template>
104-
<Name>system_init.c</Name>
105-
<Path>Source Files/app/system_config/number1</Path>
106-
<Checksum>5A4CE1990904102AF6929659AD19F29B</Checksum>
107-
</Template>
108103
<Template>
109104
<Name>sys_ports_static.c</Name>
110105
<Path>Source Files/app/system_config/number1/framework/system/ports/src</Path>
111-
<Checksum>91CF9ED936A4097E90E3F606508FFFF7</Checksum>
106+
<Checksum>9285B6A1FA58BCB32BF9519086AC0E21</Checksum>
107+
</Template>
108+
<Template>
109+
<Name>system_init.c</Name>
110+
<Path>Source Files/app/system_config/number1</Path>
111+
<Checksum>E86A3AF559615BE1CE1E45A7DE593BDA</Checksum>
112112
</Template>
113113
<Template>
114114
<Name>app.h</Name>
115115
<Path>Header Files/app</Path>
116116
</Template>
117+
<Template>
118+
<Name>system_exceptions.c</Name>
119+
<Path>Source Files/app/system_config/number1</Path>
120+
<Checksum>C111969CA43D6CEA1E9E33A6164E7AE0</Checksum>
121+
</Template>
117122
<Template>
118123
<Name>system_config.h</Name>
119124
<Path>Header Files/app/system_config/number1</Path>
120-
<Checksum>3C7D5EDFCA91D73E66B21181F8101558</Checksum>
125+
<Checksum>EAFA0B1EA2148C986421161F7D687E05</Checksum>
121126
</Template>
122127
<Template>
123128
<Name>system_interrupt.c</Name>
@@ -126,7 +131,7 @@
126131
</Template>
127132
</Templates>
128133
<Libraries>
129-
<Library value="/opt/microchip/harmony/v1_02/bin/framework/peripheral/PIC32MX675F512H_peripherals.a"/>
134+
<Library value="/opt/microchip/harmony/v1_06/bin/framework/peripheral/PIC32MX675F512H_peripherals.a"/>
130135
</Libraries>
131136
</Manifest>
132137
</configuration>

‎Bootloader/firmware/src/system_config/number1/framework/system/ports/src/sys_ports_static.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ void SYS_PORTS_Initialize(void)
6464

6565

6666
/* PORT D Initialization */
67-
PLIB_PORTS_DirectionOutputSet( PORTS_ID_0, PORT_CHANNEL_D, SYS_PORT_D_TRIS ^ 0xFFFF);
6867
PLIB_PORTS_OpenDrainEnable(PORTS_ID_0, PORT_CHANNEL_D, SYS_PORT_D_ODC);
68+
PLIB_PORTS_Write( PORTS_ID_0, PORT_CHANNEL_D, SYS_PORT_D_LAT);
69+
PLIB_PORTS_DirectionOutputSet( PORTS_ID_0, PORT_CHANNEL_D, SYS_PORT_D_TRIS ^ 0xFFFF);
6970

7071
}
7172

0 commit comments

Comments
 (0)