Skip to content

Commit 90496bc

Browse files
author
David
authored
Merge pull request #9 from MicrochipTech/develop
v1.3.1 Release
2 parents b5637b6 + 6650d2b commit 90496bc

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

‎software/aws-iot-ethernet/firmware/aws-iot-ethernet.X/nbproject/configurations.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@
948948
<property key="enable-unroll-loops" value="false"/>
949949
<property key="exclude-floating-point" value="false"/>
950950
<property key="extra-include-directories"
951-
value="../src/wolfmqttsdk/;../src;../src/system_config/IoT_Ethernet;../src/IoT_Ethernet;../../../../../../../microchip/harmony/v1_08_01/framework;../src/system_config/IoT_Ethernet/framework;../../../../../../../microchip/harmony/v1_08_01/third_party/rtos/FreeRTOS/Source/portable/MPLAB/PIC32MZ;../../../../../../../microchip/harmony/v1_08_01/third_party/rtos/FreeRTOS/Source/include;../../../../../../../microchip/harmony/v1_08_01/third_party/tcpip/wolfssl"/>
951+
value="../src/wolfmqttsdk/;../src;../src/IoT_Ethernet;../../../../../../../microchip/harmony/v1_08_01/framework;../src/system_config/IoT_Ethernet/framework;../src/system_config/IoT_Ethernet;../../../../../../../microchip/harmony/v1_08_01/third_party/rtos/FreeRTOS/Source/portable/MPLAB/PIC32MZ;../../../../../../../microchip/harmony/v1_08_01/third_party/rtos/FreeRTOS/Source/include;../../../../../../../microchip/harmony/v1_08_01/third_party/tcpip/wolfssl"/>
952952
<property key="generate-16-bit-code" value="false"/>
953953
<property key="generate-micro-compressed-code" value="false"/>
954954
<property key="isolate-each-function" value="true"/>
@@ -973,8 +973,7 @@
973973
<property key="enable-symbols" value="true"/>
974974
<property key="exclude-floating-point-library" value="false"/>
975975
<property key="expand-macros" value="false"/>
976-
<property key="extra-include-directories-for-assembler"
977-
value="../../../../../../../microchip/harmony/v1_08_01/third_party/rtos/FreeRTOS/Source/portable/MPLAB/PIC32MZ;../../../../../../../microchip/harmony/v1_08_01/third_party/rtos/FreeRTOS/Source/include;../src/system_config/IoT_Ethernet"/>
976+
<property key="extra-include-directories-for-assembler" value=""/>
978977
<property key="extra-include-directories-for-preprocessor"
979978
value="../../../../../../../microchip/harmony/v1_08_01/third_party/rtos/FreeRTOS/Source/portable/MPLAB/PIC32MZ;../../../../../../../microchip/harmony/v1_08_01/third_party/rtos/FreeRTOS/Source/include;../src/system_config/IoT_Ethernet"/>
980979
<property key="false-conditionals" value="false"/>

‎software/aws-iot-ethernet/firmware/src/app.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ APP_DATA appData;
8585
extern APP1_DATA app1Data;
8686

8787
#define APP_HARDWARE "iot_ethernet_dm990004"
88-
#define APP_FIRMWARE_VERSION "1.3.0"
88+
#define APP_FIRMWARE_VERSION "1.3.1"
8989

9090
char topic_awsUpdate[128];
9191
char topic_awsUpdateDelta[128];

‎software/aws-iot-ethernet/firmware/src/system_config/IoT_Ethernet/IoT_Ethernet.mhc

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ CONFIG_TCPIP_EMAC_ETH_OF_HUGE_PKTS=n
229229
CONFIG_TCPIP_EMAC_ETH_OF_MAC_LOOPBACK=n
230230
CONFIG_TCPIP_EMAC_ETH_OF_PHY_LOOPBACK=n
231231
CONFIG_TCPIP_EMAC_ETH_OF_MDIX_AUTO=n
232-
CONFIG_TCPIP_EMAC_ETH_OF_MDIX_SWAP=n
232+
CONFIG_TCPIP_EMAC_ETH_OF_MDIX_SWAP=y
233233
CONFIG_TCPIP_EMAC_ETH_OF_RMII=y
234234
CONFIG_TCPIP_EMAC_PHY_CONFIG_RMII=y
235235
CONFIG_TCPIP_EMAC_PHY_CONFIG_ALTERNATE=n

‎software/aws-iot-ethernet/firmware/src/system_config/IoT_Ethernet/configuration.xml

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<General>
44
<HarmonyPath path="../../../../../microchip/harmony/v1_08_01"/>
55
<Processor name=""/>
6-
<ForceOptimization flag="true"/>
6+
<ForceOptimization flag="false"/>
77
<MergeStrategy flag="USER_ALL"/>
88
</General>
99
<Manifest>
@@ -2088,7 +2088,7 @@
20882088
<Name>system_interrupt.c</Name>
20892089
<Path>Source Files/app/system_config/IoT_Ethernet</Path>
20902090
<Checksum>86C31D642D3B8E0320764D10DF66F3E7</Checksum>
2091-
<ProjectFileChecksum>33A53CD6D79D1524747AE1F9EE2B70E7</ProjectFileChecksum>
2091+
<ProjectFileChecksum>FD1C1F092F1F05FD568707470D094515</ProjectFileChecksum>
20922092
</Template>
20932093
<Template>
20942094
<Name>rtos_hooks.c</Name>
@@ -2099,13 +2099,13 @@
20992099
<Name>system_init.c</Name>
21002100
<Path>Source Files/app/system_config/IoT_Ethernet</Path>
21012101
<Checksum>05F639BB3CB0FECF9AE0D13A0C844813</Checksum>
2102-
<ProjectFileChecksum>0206F45D1BA7DB4D284E75D3FAAE886C</ProjectFileChecksum>
2102+
<ProjectFileChecksum>978B1705D7F75DE794BCD546B3C18EC2</ProjectFileChecksum>
21032103
</Template>
21042104
<Template>
21052105
<Name>net_pres_enc_glue.c</Name>
21062106
<Path>Source Files/app/system_config/IoT_Ethernet/framework/net/pres</Path>
21072107
<Checksum>1E2631455852A4F9D1A62E2191F1426F</Checksum>
2108-
<ProjectFileChecksum>C43AD4D0F6A2BB19E2FFE2BFA31FB853</ProjectFileChecksum>
2108+
<ProjectFileChecksum>89A4592A3CA344BDBE9E3C25D066D40D</ProjectFileChecksum>
21092109
</Template>
21102110
<Template>
21112111
<Name>app1.h</Name>
@@ -2135,7 +2135,7 @@
21352135
<Name>system_tasks.c</Name>
21362136
<Path>Source Files/app/system_config/IoT_Ethernet</Path>
21372137
<Checksum>89286BCD17243EDA735E0E632FC7D251</Checksum>
2138-
<ProjectFileChecksum>4F75849775C2E52A0978C207FCB68B1C</ProjectFileChecksum>
2138+
<ProjectFileChecksum>B4088088DD64523E1CFE768CCF62BBAE</ProjectFileChecksum>
21392139
</Template>
21402140
<Template>
21412141
<Name>drv_adc_static.h</Name>
@@ -2173,14 +2173,14 @@
21732173
<Template>
21742174
<Name>system_config.h</Name>
21752175
<Path>Header Files/app/system_config/IoT_Ethernet</Path>
2176-
<Checksum>818B50C656AA88E1B46956E27C61A418</Checksum>
2177-
<ProjectFileChecksum>157D24060089CE61D2EE26A71BD78435</ProjectFileChecksum>
2176+
<Checksum>F945AB303D812CCE1B11CD4A8C0AC228</Checksum>
2177+
<ProjectFileChecksum>FA038498C347E22B99A336444F231FB4</ProjectFileChecksum>
21782178
</Template>
21792179
<Template>
21802180
<Name>net_pres_cert_store.c</Name>
21812181
<Path>Source Files/app/system_config/IoT_Ethernet/framework/net/pres</Path>
21822182
<Checksum>289429D111A99E1156D2E176B9D3D725</Checksum>
2183-
<ProjectFileChecksum>1CE0389A2E06849F0CDD17E4E2F847B6</ProjectFileChecksum>
2183+
<ProjectFileChecksum>6C29B88E057357517F4F1EE4A796A1F4</ProjectFileChecksum>
21842184
</Template>
21852185
<Template>
21862186
<Name>sys_clk_static.h</Name>
@@ -2204,11 +2204,11 @@
22042204
<Include value="../src/system_config/IoT_Ethernet"/>
22052205
</C32-AS>
22062206
<C32>
2207-
<Include value="/Users/c14227/Documents/git-projects/aws-iot-firmware-pic32mz/software/aws-iot-ethernet/firmware/src"/>
2208-
<Include value="/Users/c14227/Documents/git-projects/aws-iot-firmware-pic32mz/software/aws-iot-ethernet/firmware/src/system_config/IoT_Ethernet"/>
2209-
<Include value="/Users/c14227/Documents/git-projects/aws-iot-firmware-pic32mz/software/aws-iot-ethernet/firmware/src/IoT_Ethernet"/>
2210-
<Include value="/Users/c14227/microchip/harmony/v1_08_01/framework"/>
2211-
<Include value="/Users/c14227/Documents/git-projects/aws-iot-firmware-pic32mz/software/aws-iot-ethernet/firmware/src/system_config/IoT_Ethernet/framework"/>
2207+
<Include value="/Users/c14848/Documents/git_proj/aws-iot-firmware-pic32mz/software/aws-iot-ethernet/firmware/src"/>
2208+
<Include value="/Users/c14848/Documents/git_proj/aws-iot-firmware-pic32mz/software/aws-iot-ethernet/firmware/src/system_config/IoT_Ethernet"/>
2209+
<Include value="/Users/c14848/Documents/git_proj/aws-iot-firmware-pic32mz/software/aws-iot-ethernet/firmware/src/IoT_Ethernet"/>
2210+
<Include value="/Users/c14848/microchip/harmony/v1_08_01/framework"/>
2211+
<Include value="/Users/c14848/Documents/git_proj/aws-iot-firmware-pic32mz/software/aws-iot-ethernet/firmware/src/system_config/IoT_Ethernet/framework"/>
22122212
<Include value="../../../../../../../microchip/harmony/v1_08_01/third_party/rtos/FreeRTOS/Source/portable/MPLAB/PIC32MZ"/>
22132213
<Include value="../../../../../../../microchip/harmony/v1_08_01/third_party/rtos/FreeRTOS/Source/include"/>
22142214
<Include value="../src/system_config/IoT_Ethernet"/>

‎software/aws-iot-ethernet/firmware/src/system_config/IoT_Ethernet/system_config.h

+1
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,7 @@ extern "C" {
490490
TCPIP_ETH_OPEN_HDUPLEX |\
491491
TCPIP_ETH_OPEN_100 |\
492492
TCPIP_ETH_OPEN_10 |\
493+
TCPIP_ETH_OPEN_MDIX_SWAP |\
493494
TCPIP_ETH_OPEN_RMII |\
494495
0
495496
#define TCPIP_EMAC_PHY_CONFIG_FLAGS \

0 commit comments

Comments
 (0)