Skip to content

Commit efd58e0

Browse files
Gabriel UrsGabriel Urs
Gabriel Urs
authored and
Gabriel Urs
committed
MPAE-19324: Fix code typo
1 parent 56e1b46 commit efd58e0

File tree

3 files changed

+99
-19
lines changed

3 files changed

+99
-19
lines changed

‎.main-meta/main.json

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"metaDataVersion": "1.0.0",
33
"category": "com.microchip.ide.project",
44
"content": {
5-
"metaDataVersion": "1.0.0",
5+
"metaDataVersion": "1.3.0",
66
"name": "com.microchip.mcu8.mplabx.project.pic16f18446-cnano-greenhouses",
7-
"version": "1.0.3",
7+
"version": "1.0.4",
88
"displayName": "Plant Monitoring System using PIC16F18446",
99
"projectName": "pic16f18446-cnano-greenhouse",
1010
"shortDescription": "A plant monitoring system with automated control of soil moisture and air humidity",
@@ -35,19 +35,15 @@
3535
}
3636
},
3737
"author": "Microchip",
38-
"subcategories": [
39-
[
40-
"Peripherals", "ADCC"
41-
]
42-
],
4338
"peripherals": [
44-
"ADCC"
39+
"ADCC",
40+
"TMR"
4541
],
4642
"keywords": [
47-
"Greenhouse",
48-
"OLED C click",
49-
"RELAY click",
50-
"Temp&Hum click"
43+
"OLED",
44+
"Air Temperature",
45+
"Fan",
46+
"Water Pump"
5147
],
5248
"additionalData": {
5349
"longDescription": {

‎pic16f18446-cnano-greenhouse.X/analog_sensors.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ uint8_t ANALOG_readSoilMoisture(void)
5656
channel_ANB6_SetDigitalInput();
5757
channel_ANB4_ResetPullup();
5858
channel_ANB4_SetDigitalOutput();
59-
soil += ADCC_GetSingleConversion(channel_ANB4);
59+
soil += ADCC_GetSingleConversion(channel_ANB6);
6060
}
6161

6262
conversion_state = !conversion_state;

‎pic16f18446-cnano-greenhouse.X/nbproject/configurations.xml

Lines changed: 90 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
<itemPath>greenhouse_display.h</itemPath>
3535
<itemPath>HTS221.h</itemPath>
3636
</logicalFolder>
37+
<logicalFolder name="ExternalFiles"
38+
displayName="Important Files"
39+
projectFiles="true">
40+
<itemPath>Makefile</itemPath>
41+
<itemPath>MyConfig.mc3</itemPath>
42+
</logicalFolder>
3743
<logicalFolder name="LinkerScript"
3844
displayName="Linker Files"
3945
projectFiles="true">
@@ -71,12 +77,6 @@
7177
<itemPath>greenhouse_display.c</itemPath>
7278
<itemPath>HTS221.c</itemPath>
7379
</logicalFolder>
74-
<logicalFolder name="ExternalFiles"
75-
displayName="Important Files"
76-
projectFiles="false">
77-
<itemPath>Makefile</itemPath>
78-
<itemPath>MyConfig.mc3</itemPath>
79-
</logicalFolder>
8080
</logicalFolder>
8181
<projectmakefile>Makefile</projectmakefile>
8282
<confs>
@@ -94,6 +94,8 @@
9494
<packs>
9595
<pack name="PIC16F1xxxx_DFP" vendor="Microchip" version="1.2.99"/>
9696
</packs>
97+
<ScriptingSettings>
98+
</ScriptingSettings>
9799
<compileType>
98100
<linkerTool>
99101
<linkerLibItems>
@@ -111,6 +113,7 @@
111113
</compileType>
112114
<makeCustomizationType>
113115
<makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
116+
<makeUseCleanTarget>false</makeUseCleanTarget>
114117
<makeCustomizationPreStep></makeCustomizationPreStep>
115118
<makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled>
116119
<makeCustomizationPostStep></makeCustomizationPostStep>
@@ -197,6 +200,45 @@
197200
<property key="program-the-device-with-default-config-words" value="true"/>
198201
<property key="remove-unused-sections" value="true"/>
199202
</HI-TECH-LINK>
203+
<Tool>
204+
<property key="AutoSelectMemRanges" value="auto"/>
205+
<property key="Freeze Peripherals" value="true"/>
206+
<property key="communication.activationmode" value="nohv"/>
207+
<property key="communication.interface"
208+
value="${communication.interface.default}"/>
209+
<property key="communication.speed" value="${communication.speed.default}"/>
210+
<property key="debugoptions.useswbreakpoints" value="false"/>
211+
<property key="firmware.path"
212+
value="Press to browse for a specific firmware version"/>
213+
<property key="firmware.update.action" value="firmware.update.use.latest"/>
214+
<property key="memories.aux" value="false"/>
215+
<property key="memories.bootflash" value="true"/>
216+
<property key="memories.configurationmemory" value="true"/>
217+
<property key="memories.configurationmemory2" value="true"/>
218+
<property key="memories.dataflash" value="true"/>
219+
<property key="memories.eeprom" value="true"/>
220+
<property key="memories.exclude.configurationmemory" value="true"/>
221+
<property key="memories.flashdata" value="true"/>
222+
<property key="memories.id" value="true"/>
223+
<property key="memories.instruction.ram.ranges"
224+
value="${memories.instruction.ram.ranges}"/>
225+
<property key="memories.programmemory" value="true"/>
226+
<property key="memories.programmemory.ranges" value="0-3fff"/>
227+
<property key="poweroptions.powerenable" value="false"/>
228+
<property key="programmerToGoFilePath"
229+
value="C:/Users/m50673/Desktop/PLANT/pic16f18446-cnano-plant-monitoring-system/pic16f18446-cnano-plant-monitoring-system.X/debug/free/pic16f18446-cnano-plant-monitoring-system_ptg"/>
230+
<property key="programoptions.eraseb4program" value="true"/>
231+
<property key="programoptions.preservedataflash" value="false"/>
232+
<property key="programoptions.preservedataflash.ranges"
233+
value="${memories.dataflash.default}"/>
234+
<property key="programoptions.preserveeeprom" value="false"/>
235+
<property key="programoptions.preserveeeprom.ranges" value="f000-f0ff"/>
236+
<property key="programoptions.preserveprogram.ranges" value="0-3fff"/>
237+
<property key="programoptions.preserveprogramrange" value="false"/>
238+
<property key="programoptions.preserveuserid" value="false"/>
239+
<property key="programoptions.programuserotp" value="false"/>
240+
<property key="voltagevalue" value=""/>
241+
</Tool>
200242
<XC8-CO>
201243
<property key="coverage-enable" value=""/>
202244
</XC8-CO>
@@ -267,6 +309,8 @@
267309
<packs>
268310
<pack name="PIC16F1xxxx_DFP" vendor="Microchip" version="1.2.99"/>
269311
</packs>
312+
<ScriptingSettings>
313+
</ScriptingSettings>
270314
<compileType>
271315
<linkerTool>
272316
<linkerLibItems>
@@ -284,6 +328,7 @@
284328
</compileType>
285329
<makeCustomizationType>
286330
<makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
331+
<makeUseCleanTarget>false</makeUseCleanTarget>
287332
<makeCustomizationPreStep></makeCustomizationPreStep>
288333
<makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled>
289334
<makeCustomizationPostStep></makeCustomizationPostStep>
@@ -370,6 +415,45 @@
370415
<property key="program-the-device-with-default-config-words" value="true"/>
371416
<property key="remove-unused-sections" value="true"/>
372417
</HI-TECH-LINK>
418+
<Tool>
419+
<property key="AutoSelectMemRanges" value="auto"/>
420+
<property key="Freeze Peripherals" value="true"/>
421+
<property key="communication.activationmode" value="nohv"/>
422+
<property key="communication.interface"
423+
value="${communication.interface.default}"/>
424+
<property key="communication.speed" value="${communication.speed.default}"/>
425+
<property key="debugoptions.useswbreakpoints" value="false"/>
426+
<property key="firmware.path"
427+
value="Press to browse for a specific firmware version"/>
428+
<property key="firmware.update.action" value="firmware.update.use.latest"/>
429+
<property key="memories.aux" value="false"/>
430+
<property key="memories.bootflash" value="true"/>
431+
<property key="memories.configurationmemory" value="true"/>
432+
<property key="memories.configurationmemory2" value="true"/>
433+
<property key="memories.dataflash" value="true"/>
434+
<property key="memories.eeprom" value="true"/>
435+
<property key="memories.exclude.configurationmemory" value="true"/>
436+
<property key="memories.flashdata" value="true"/>
437+
<property key="memories.id" value="true"/>
438+
<property key="memories.instruction.ram.ranges"
439+
value="${memories.instruction.ram.ranges}"/>
440+
<property key="memories.programmemory" value="true"/>
441+
<property key="memories.programmemory.ranges" value="0-3fff"/>
442+
<property key="poweroptions.powerenable" value="false"/>
443+
<property key="programmerToGoFilePath"
444+
value="C:/Users/m50673/Desktop/PLANT/pic16f18446-cnano-plant-monitoring-system/pic16f18446-cnano-plant-monitoring-system.X/debug/pro/pic16f18446-cnano-plant-monitoring-system_ptg"/>
445+
<property key="programoptions.eraseb4program" value="true"/>
446+
<property key="programoptions.preservedataflash" value="false"/>
447+
<property key="programoptions.preservedataflash.ranges"
448+
value="${memories.dataflash.default}"/>
449+
<property key="programoptions.preserveeeprom" value="false"/>
450+
<property key="programoptions.preserveeeprom.ranges" value="f000-f0ff"/>
451+
<property key="programoptions.preserveprogram.ranges" value=""/>
452+
<property key="programoptions.preserveprogramrange" value="false"/>
453+
<property key="programoptions.preserveuserid" value="false"/>
454+
<property key="programoptions.programuserotp" value="false"/>
455+
<property key="voltagevalue" value=""/>
456+
</Tool>
373457
<XC8-CO>
374458
<property key="coverage-enable" value=""/>
375459
</XC8-CO>

0 commit comments

Comments
 (0)