Skip to content

Commit be0f563

Browse files
author
Microchip Technology
committed
Merging into the (master) branch
1 parent 408eaff commit be0f563

File tree

11 files changed

+26587
-237
lines changed

11 files changed

+26587
-237
lines changed

‎.main-meta/main.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"content": {
55
"metaDataVersion": "1.1.0",
66
"name": "com.microchip.mplabx.project.pic-iot-aws-sensor-node",
7-
"version": "4.1.0",
7+
"version": "4.1.2",
88
"displayName": "PIC-IoT AWS Sensor Node",
99
"projectName": "pic-iot-aws-sensor-node",
1010
"shortDescription": "Microchip PIC-IoT WA (Wireless for Amazon Web Services) Application Example",
@@ -15,12 +15,16 @@
1515
"compiler": [
1616
{
1717
"name": "xc16",
18-
"semverRange": "^1.41.0"
18+
"semverRange": "^1.60.0"
1919
}
2020
],
2121
"dfp": {
2222
"name": "PIC24F-GA-GB_DFP",
23-
"semverRange": "^1.0.67"
23+
"semverRange": "^1.3.109"
24+
},
25+
"configurator": {
26+
"name": "MCC",
27+
"semverRange": ">=4.0.1"
2428
},
2529
"device": {
2630
"metaDataVersion": "1.0.0",

‎MyConfig.mc3

Lines changed: 13169 additions & 0 deletions
Large diffs are not rendered by default.

‎PICIoT.X/MyConfig.mc3

Lines changed: 13169 additions & 0 deletions
Large diffs are not rendered by default.

‎PICIoT.X/mcc_generated_files/application_manager.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ void loadDefaultAWSEndpoint(void)
355355
{
356356
memset(awsEndpoint, '\0', AWS_ENDPOINT_LEN);
357357
wifi_readAWSEndpointFromWinc();
358-
if(awsEndpoint[0] == 0xFF)
358+
if(((uint8_t)awsEndpoint[0]) == 0xFF)
359359
{
360360
sprintf(awsEndpoint, "%s", AWS_MCHP_SANDBOX_URL);
361361
debug_printIoTAppMsg("Using the AWS Sandbox endpoint : %s", awsEndpoint);

‎PICIoT.X/mcc_generated_files/cli/cli.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static bool commandTooLongFlag = false;
7373

7474
const char * const cli_option_version_number = "1.0.1";
7575

76-
const char * const firmware_version_number = "4.1.0";
76+
const char * const firmware_version_number = "4.1.2";
7777

7878
static void command_received(char *command_text);
7979
static void reset_cmd(char *pArg);

‎PICIoT.X/mcc_generated_files/cloud/wifi_service.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void wifi_readThingNameFromWinc(void)
152152
debug_printInfo("WINC in download mode");
153153

154154
status = spi_flash_read((uint8_t*)cid, THING_NAME_FLASH_OFFSET,MQTT_CID_LENGTH);
155-
if(status != M2M_SUCCESS || cid[0] == 0xFF || cid[MQTT_CID_LENGTH-1] == 0xFF)
155+
if(status != M2M_SUCCESS || (((uint8_t)cid[0]) == 0xFF) || (((uint8_t)cid[MQTT_CID_LENGTH-1]) == 0xFF))
156156
{
157157
sprintf(cid, "%s", AWS_THING_NAME);
158158
debug_printIoTAppMsg("Thing Name is not present, error type %d, user defined thing ID is used",status);
@@ -183,7 +183,7 @@ void wifi_readAWSEndpointFromWinc(void)
183183
{
184184
debug_printError("Error reading AWS Endpoint from WINC");
185185
}
186-
else if(awsEndpoint[0] == 0xFF)
186+
else if(((uint8_t)awsEndpoint[0]) == 0xFF)
187187
{
188188
debug_printIoTAppMsg("AWS Endpoint is not present in WINC, either re-provision or microchip AWS sandbox endpoint will be used");
189189
}

‎PICIoT.X/nbproject/Makefile-default.mk

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

‎PICIoT.X/nbproject/Makefile-genesis.properties

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#
2-
#Fri Jul 24 02:32:47 UTC 2020
3-
default.Pack.dfplocation=/opt/microchip/mplabx/v5.25/packs/Microchip/PIC24F-GA-GB_DFP/1.0.67
4-
default.com-microchip-mplab-nbide-toolchainXC16-XC16LanguageToolchain.md5=e5736228501ef0825fa503ed0aa3576c
5-
default.languagetoolchain.dir=/opt/microchip/xc16/v1.41/bin
6-
configurations-xml=25456d42a734707f8b57ee1bf16f44b9
7-
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=6e453b0cf7f7da72a932cfdb2f655401
8-
default.languagetoolchain.version=1.41
2+
#Fri Feb 26 23:34:45 UTC 2021
3+
default.Pack.dfplocation=/opt/microchip/mplabx/v5.40/packs/Microchip/PIC24F-GA-GB_DFP/1.3.109
4+
default.com-microchip-mplab-nbide-toolchainXC16-XC16LanguageToolchain.md5=6c45d321f797d8e29b80086da23c0652
5+
default.languagetoolchain.dir=/opt/microchip/xc16/v1.60/bin
6+
configurations-xml=4b1aa72c3b48a4d3786a1ac1a685066e
7+
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=9db8f8a224aa17d0023ea7f468f871dc
8+
default.languagetoolchain.version=1.60
99
host.platform=linux
1010
conf.ids=default

‎PICIoT.X/nbproject/Makefile-local-default.mk

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,24 @@
1414
# You can invoke make with the values of the macros:
1515
# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...
1616
#
17-
PATH_TO_IDE_BIN=/opt/microchip/mplabx/v5.25/mplab_platform/platform/../mplab_ide/modules/../../bin/
17+
PATH_TO_IDE_BIN=/opt/microchip/mplabx/v5.40/mplab_platform/platform/../mplab_ide/modules/../../bin/
1818
# Adding MPLAB X bin directory to path.
19-
PATH:=/opt/microchip/mplabx/v5.25/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
19+
PATH:=/opt/microchip/mplabx/v5.40/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
2020
# Path to java used to run MPLAB X when this makefile was created
21-
MP_JAVA_PATH="/opt/microchip/mplabx/v5.25/sys/java/jre1.8.0_181/bin/"
21+
MP_JAVA_PATH="/opt/microchip/mplabx/v5.40/sys/java/zulu8.36.0.1-ca-fx-jdk8.0.202-linux_x64/jre/bin/"
2222
OS_CURRENT="$(shell uname -s)"
23-
MP_CC="/opt/microchip/xc16/v1.41/bin/xc16-gcc"
23+
MP_CC="/opt/microchip/xc16/v1.60/bin/xc16-gcc"
2424
# MP_CPPC is not defined
2525
# MP_BC is not defined
26-
MP_AS="/opt/microchip/xc16/v1.41/bin/xc16-as"
27-
MP_LD="/opt/microchip/xc16/v1.41/bin/xc16-ld"
28-
MP_AR="/opt/microchip/xc16/v1.41/bin/xc16-ar"
29-
DEP_GEN=${MP_JAVA_PATH}java -jar "/opt/microchip/mplabx/v5.25/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
30-
MP_CC_DIR="/opt/microchip/xc16/v1.41/bin"
26+
MP_AS="/opt/microchip/xc16/v1.60/bin/xc16-as"
27+
MP_LD="/opt/microchip/xc16/v1.60/bin/xc16-ld"
28+
MP_AR="/opt/microchip/xc16/v1.60/bin/xc16-ar"
29+
DEP_GEN=${MP_JAVA_PATH}java -jar "/opt/microchip/mplabx/v5.40/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
30+
MP_CC_DIR="/opt/microchip/xc16/v1.60/bin"
3131
# MP_CPPC_DIR is not defined
3232
# MP_BC_DIR is not defined
33-
MP_AS_DIR="/opt/microchip/xc16/v1.41/bin"
34-
MP_LD_DIR="/opt/microchip/xc16/v1.41/bin"
35-
MP_AR_DIR="/opt/microchip/xc16/v1.41/bin"
33+
MP_AS_DIR="/opt/microchip/xc16/v1.60/bin"
34+
MP_LD_DIR="/opt/microchip/xc16/v1.60/bin"
35+
MP_AR_DIR="/opt/microchip/xc16/v1.60/bin"
3636
# MP_BC_DIR is not defined
37+
DFP_DIR=/opt/microchip/mplabx/v5.40/packs/Microchip/PIC24F-GA-GB_DFP/1.3.109

‎PICIoT.X/nbproject/configurations.xml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -371,14 +371,16 @@
371371
<targetDevice>PIC24FJ128GA705</targetDevice>
372372
<targetHeader></targetHeader>
373373
<targetPluginBoard></targetPluginBoard>
374-
<platformTool>nEdbgTool</platformTool>
374+
<platformTool></platformTool>
375375
<languageToolchain>XC16</languageToolchain>
376-
<languageToolchainVersion>1.41</languageToolchainVersion>
376+
<languageToolchainVersion>1.60</languageToolchainVersion>
377377
<platform>3</platform>
378378
</toolsSet>
379379
<packs>
380-
<pack name="PIC24F-GA-GB_DFP" vendor="Microchip" version="1.0.67"/>
380+
<pack name="PIC24F-GA-GB_DFP" vendor="Microchip" version="1.3.109"/>
381381
</packs>
382+
<ScriptingSettings>
383+
</ScriptingSettings>
382384
<compileType>
383385
<linkerTool>
384386
<linkerLibItems>
@@ -523,6 +525,7 @@
523525
<property key="legacy-libc" value="true"/>
524526
<property key="mpreserve-all" value="false"/>
525527
<property key="oXC16glb-macros" value=""/>
528+
<property key="omit-pack-options" value="1"/>
526529
<property key="output-file-format" value="elf"/>
527530
<property key="preserve-all" value="false"/>
528531
<property key="preserve-file" value=""/>
@@ -588,6 +591,8 @@
588591
<property key="debugoptions.useswbreakpoints" value="false"/>
589592
<property key="firmware.path"
590593
value="Press to browse for a specific firmware version"/>
594+
<property key="firmware.toolpack"
595+
value="Press to select which tool pack to use"/>
591596
<property key="firmware.update.action" value="firmware.update.use.latest"/>
592597
<property key="memories.aux" value="false"/>
593598
<property key="memories.bootflash" value="true"/>
@@ -603,8 +608,6 @@
603608
<property key="memories.programmemory" value="true"/>
604609
<property key="memories.programmemory.ranges" value="0-15eff"/>
605610
<property key="poweroptions.powerenable" value="false"/>
606-
<property key="programmerToGoFilePath"
607-
value="C:/Users/C14050/Desktop/Git pic-iot-aws-sensor-node/PICIoT.X/debug/default/PICIoT_ptg"/>
608611
<property key="programoptions.eraseb4program" value="true"/>
609612
<property key="programoptions.preservedataflash" value="false"/>
610613
<property key="programoptions.preservedataflash.ranges"
@@ -615,6 +618,10 @@
615618
<property key="programoptions.preserveprogramrange" value="false"/>
616619
<property key="programoptions.preserveuserid" value="false"/>
617620
<property key="programoptions.programuserotp" value="false"/>
621+
<property key="toolpack.updateoptions"
622+
value="toolpack.updateoptions.uselatestoolpack"/>
623+
<property key="toolpack.updateoptions.packversion"
624+
value="Press to select which tool pack to use"/>
618625
<property key="voltagevalue" value=""/>
619626
</nEdbgTool>
620627
</conf>

0 commit comments

Comments
 (0)