Skip to content

Commit 9e72da1

Browse files
peternewmanpeternewman
committed
Merge branch 'master' of https://github.com/OpenLightingProject/ja-rule into licence_enforcer
2 parents 0b4df9c + 6b4b347 commit 9e72da1

29 files changed

Lines changed: 1525 additions & 775 deletions

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

Lines changed: 373 additions & 60 deletions
Large diffs are not rendered by default.

‎Bootloader/firmware/Bootloader.hconfig‎

Lines changed: 41 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,55 @@
1+
#
2+
# Application configuration file generated by
3+
# Microchip Harmony Configurator (MHC) from Harmony version: 1.04
4+
#
5+
16
mainmenu "MPLAB Harmony & Application Configuration"
27

38
menu "Application Configuration"
49

5-
config APP_IDX_0
6-
bool
7-
default y
8-
config APP_IDX_1
9-
bool
10-
config APP_IDX_2
11-
bool
12-
config APP_IDX_3
13-
bool
14-
config APP_IDX_4
15-
bool
16-
config APP_IDX_5
17-
bool
18-
config APP_IDX_6
19-
bool
20-
config APP_IDX_7
21-
bool
22-
config APP_IDX_8
23-
bool
24-
config APP_IDX_9
25-
bool
26-
config APP_IDX_10
27-
bool
28-
29-
config APP_NAME_0
30-
string
31-
default "app"
32-
config APP_NAME_1
33-
string
34-
default "app1"
35-
config APP_NAME_2
36-
string
37-
default "app2"
38-
config APP_NAME_3
39-
string
40-
default "app3"
41-
config APP_NAME_4
42-
string
43-
default "app4"
44-
config APP_NAME_5
45-
string
46-
default "app5"
47-
config APP_NAME_6
48-
string
49-
default "app6"
50-
config APP_NAME_7
51-
string
52-
default "app7"
53-
config APP_NAME_8
54-
string
55-
default "app8"
56-
config APP_NAME_9
57-
string
58-
default "app9"
59-
6010
config APP_INSTANCES
61-
int "Number of Applications (states)"
11+
int "Number of Applications"
6212
default 1
63-
range 1 10
13+
range 1 10 # Must limit to 10 or application templates will need to be updated.
6414

6515
source "$HARMONY_VERSION_PATH/utilities/mhc/config/app_name_idx.ftl" 10 instances
6616

17+
menu "Exception Handling"
18+
19+
config USE_EXCEPTION_HANDLER
20+
bool "Use MPLAB Harmony Exception Handler Template?"
21+
default y
22+
---help---
23+
Enter 'Y' if you want to include an exception handler template
24+
(system_exceptions.c) in this system configuration. Enter 'N' if
25+
you do not.
26+
---endhelp---
27+
28+
config EXCEPTION_USE_SYS_DEBUG
29+
bool "Use debug services in exception handler?"
30+
depends on USE_EXCEPTION_HANDLER
31+
default y
32+
---help---
33+
Enter 'Y' if you want the exception handler to use the SYS_DEBUG service to
34+
report exception information. Enter 'N' if you do not.
35+
---endhelp---
36+
37+
config EXCEPTION_BREAKPOINT
38+
bool "Hit breakpoint when an exception occurs?"
39+
depends on USE_EXCEPTION_HANDLER && EXCEPTION_USE_SYS_DEBUG
40+
default y
41+
---help---
42+
Enter 'Y' if you want the exception handler to hit a breakpoint when
43+
an exception occurs. Enter 'N' if you do not.
44+
Note: Only works if debugging is enabled.
45+
---endhelp---
46+
47+
endmenu # Exception Handling
48+
6749
#insert application specific configuration here
6850

69-
endmenu
51+
endmenu # Application Configuration
7052

7153
source "$HARMONY_VERSION_PATH/config/harmony.hconfig"
7254

55+

‎Bootloader/firmware/src/bootloader_usb_descriptors.c‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@
2525
#include "dfu_properties.h"
2626
#include "uid.h"
2727
#include "usb/usb_device_cdc.h"
28+
#include "driver/usb/usbfs/drv_usbfs.h"
2829
#include "usb_properties.h"
2930

3031
#include "bootloader_settings.h"
3132

3233
// USB Device Layer Function Driver Registration Table
3334
// ----------------------------------------------------------------------------
3435
static const USB_DEVICE_FUNCTION_REGISTRATION_TABLE g_func_table[1] = {
35-
/* Function 3 - The DFU Interface */
36+
// Function 3 - The DFU Interface
3637
{
3738
.configurationValue = 1,
3839
.interfaceNumber = 0,
@@ -223,22 +224,16 @@ static const USB_DEVICE_MASTER_DESCRIPTOR usbMasterDescriptor = {
223224
NULL, // Pointer to high speed dev qualifier.
224225
};
225226

226-
// Endpoint Table needed by the Device Layer.
227-
// ----------------------------------------------------------------------------
228-
static uint8_t __attribute__((aligned(512)))
229-
g_endpoint_table[USB_DEVICE_ENDPOINT_TABLE_SIZE];
230-
231227
// USB Device Layer Initialization Data
232228
// ----------------------------------------------------------------------------
233229
const USB_DEVICE_INIT usbDevInitData = {
234230
.moduleInit = {SYS_MODULE_POWER_RUN_FULL},
235-
.stopInIdle = false,
236-
.suspendInSleep = false,
237-
.endpointTable = g_endpoint_table,
238231
.registeredFuncCount = 1,
239232
.registeredFunctions = (USB_DEVICE_FUNCTION_REGISTRATION_TABLE*) g_func_table,
240233
.usbMasterDescriptor = (USB_DEVICE_MASTER_DESCRIPTOR*) &usbMasterDescriptor,
241234
.deviceSpeed = USB_SPEED_FULL,
235+
.driverIndex = DRV_USBFS_INDEX_0,
236+
.usbDriverInterface = DRV_USBFS_DEVICE_INTERFACE,
242237
.queueSizeEndpointRead = 1,
243238
.queueSizeEndpointWrite = 1,
244239
};

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

Lines changed: 44 additions & 39 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_02"/>
29+
<HarmonyPath path="/opt/microchip/harmony/v1_06"/>
3030
<ForceOptimization flag="true"/>
3131
</General>
3232
<Manifest>
@@ -35,21 +35,17 @@
3535
<Name>sys_module.h</Name>
3636
<Path>Header Files/framework/system/common</Path>
3737
</File>
38-
<File>
39-
<Name>drv_usb.h</Name>
40-
<Path>Source Files/framework/driver/usb</Path>
41-
</File>
4238
<File>
4339
<Name>sys_int.h</Name>
4440
<Path>Header Files/framework/system/int</Path>
4541
</File>
4642
<File>
47-
<Name>sys_common.h</Name>
48-
<Path>Header Files/framework/system/common</Path>
43+
<Name>drv_usb.h</Name>
44+
<Path>Header Files/framework/driver/usb</Path>
4945
</File>
5046
<File>
51-
<Name>drv_usb.c</Name>
52-
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
47+
<Name>sys_common.h</Name>
48+
<Path>Header Files/framework/system/common</Path>
5349
</File>
5450
<File>
5551
<Name>system.h</Name>
@@ -59,10 +55,6 @@
5955
<Name>sys_ports.c</Name>
6056
<Path>Source Files/framework/system/ports/src</Path>
6157
</File>
62-
<File>
63-
<Name>drv_usb_device.c</Name>
64-
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
65-
</File>
6658
<File>
6759
<Name>usb_device_endpoint_functions.c</Name>
6860
<Path>Source Files/framework/usb/src/dynamic</Path>
@@ -71,6 +63,10 @@
7163
<Name>usb_device.c</Name>
7264
<Path>Source Files/framework/usb/src/dynamic</Path>
7365
</File>
66+
<File>
67+
<Name>drv_usbfs_device.c</Name>
68+
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
69+
</File>
7470
<File>
7571
<Name>bsp_sys_init.c</Name>
7672
<Path>Source Files/bsp/pic32mx_eth_sk2</Path>
@@ -103,68 +99,77 @@
10399
<Name>bsp_config.h</Name>
104100
<Path>Header Files/bsp/pic32mx_eth_sk2</Path>
105101
</File>
102+
<File>
103+
<Name>drv_usbfs.c</Name>
104+
<Path>Source Files/framework/driver/usb/usbfs/src/dynamic</Path>
105+
</File>
106106
</Files>
107107
<Templates>
108108
<Template>
109109
<Name>main.c</Name>
110110
<Path>Source Files/app</Path>
111111
</Template>
112+
<Template>
113+
<Name>system_exceptions.c</Name>
114+
<Path>Source Files/app/system_config/ethernet_sk2</Path>
115+
<Checksum>C111969CA43D6CEA1E9E33A6164E7AE0</Checksum>
116+
</Template>
112117
<Template>
113118
<Name>app.c</Name>
114119
<Path>Source Files/app</Path>
115120
</Template>
116121
<Template>
117-
<Name>system_config.h</Name>
118-
<Path>Header Files/app/system_config/default</Path>
119-
<Checksum>7B4EB25A0D646773E78D2C94C25FBAC4</Checksum>
122+
<Name>system_definitions.h</Name>
123+
<Path>Header Files/app/system_config/ethernet_sk2</Path>
124+
<Checksum>C6785C685DC369BA3FA09D75205BB944</Checksum>
120125
</Template>
121126
<Template>
122-
<Name>system_init.c</Name>
123-
<Path>Source Files/app/system_config/default</Path>
124-
<Checksum>384FC7C8D51A10F30BA4E09309CE53B1</Checksum>
127+
<Name>system_interrupt.c</Name>
128+
<Path>Source Files/app/system_config/ethernet_sk2</Path>
129+
<Checksum>9AC33B2960C8DF72C5EB0E3662303FF4</Checksum>
130+
</Template>
131+
<Template>
132+
<Name>system_tasks.c</Name>
133+
<Path>Source Files/app/system_config/ethernet_sk2</Path>
134+
<Checksum>C051440866B3433982D20908212CADC7</Checksum>
125135
</Template>
126136
<Template>
127137
<Name>app.h</Name>
128138
<Path>Header Files/app</Path>
129139
</Template>
130140
<Template>
131141
<Name>sys_clk_static.h</Name>
132-
<Path>Header Files/app/system_config/default/framework/system/clk</Path>
142+
<Path>Header Files/app/system_config/ethernet_sk2/framework/system/clk</Path>
133143
<Checksum>999179DADE9ECD59953526F5E9F83ACC</Checksum>
134144
</Template>
135-
<Template>
136-
<Name>sys_ports_static.c</Name>
137-
<Path>Source Files/app/system_config/default/framework/system/ports/src</Path>
138-
<Checksum>91CF9ED936A4097E90E3F606508FFFF7</Checksum>
139-
</Template>
140-
<Template>
141-
<Name>system_interrupt.c</Name>
142-
<Path>Source Files/app/system_config/default</Path>
143-
<Checksum>9AC33B2960C8DF72C5EB0E3662303FF4</Checksum>
144-
</Template>
145145
<Template>
146146
<Name>sys_clk_static.c</Name>
147-
<Path>Source Files/app/system_config/default/framework/system/clk/src</Path>
147+
<Path>Source Files/app/system_config/ethernet_sk2/framework/system/clk/src</Path>
148148
<Checksum>1B968DA82B5DD869A6119C3B7628D753</Checksum>
149149
</Template>
150150
<Template>
151-
<Name>system_tasks.c</Name>
152-
<Path>Source Files/app/system_config/default</Path>
153-
<Checksum>2545C461C5FD3CD396C0405A4F248D80</Checksum>
151+
<Name>sys_ports_static.c</Name>
152+
<Path>Source Files/app/system_config/ethernet_sk2/framework/system/ports/src</Path>
153+
<Checksum>195E32D12C5CC6C6829F0E960F41127D</Checksum>
154154
</Template>
155155
<Template>
156-
<Name>system_definitions.h</Name>
157-
<Path>Header Files/app/system_config/default</Path>
158-
<Checksum>876403A29946CD1CF765B663F0391522</Checksum>
156+
<Name>system_init.c</Name>
157+
<Path>Source Files/app/system_config/ethernet_sk2</Path>
158+
<Checksum>F043B6048BFC4EFD9C2245953137BEAC</Checksum>
159+
</Template>
160+
<Template>
161+
<Name>system_config.h</Name>
162+
<Path>Header Files/app/system_config/ethernet_sk2</Path>
163+
<Checksum>ADDFE1EC7123ACD4754E111871F76B83</Checksum>
159164
</Template>
160165
</Templates>
161166
<CompilerItems>
162167
<C32>
163-
<Include value="../../../../../../../opt/microchip/harmony/v1_02/bsp/pic32mx_eth_sk2"/>
168+
<Include value="/opt/microchip/harmony/v1_06/bsp/pic32mx_eth_sk2"/>
164169
</C32>
165170
</CompilerItems>
166171
<Libraries>
167-
<Library value="../../../../../../../opt/microchip/harmony/v1_02/bin/framework/peripheral/PIC32MX795F512L_peripherals.a"/>
172+
<Library value="/opt/microchip/harmony/v1_06/bin/framework/peripheral/PIC32MX795F512L_peripherals.a"/>
168173
</Libraries>
169174
</Manifest>
170175
</configuration>

0 commit comments

Comments
 (0)