4 changes: 4 additions & 0 deletions software/PC/UniSolder/obj/Release/.NETFramework,Version=v4.8.AssemblyAttributes.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
Binary file added software/PC/UniSolder/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
View file
Binary file not shown.
Binary file added software/PC/UniSolder/obj/Release/UniSolder.csproj.AssemblyReference.cache
View file
Binary file not shown.
Empty file added software/PC/UniSolder/obj/Release/UniSolder.csproj.CopyComplete
View file
Empty file.
1 change: 1 addition & 0 deletions software/PC/UniSolder/obj/Release/UniSolder.csproj.CoreCompileInputs.cache
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3a288d020fab15d9b448606f63a7d8365730ff61
17 changes: 17 additions & 0 deletions software/PC/UniSolder/obj/Release/UniSolder.csproj.FileListAbsolute.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,20 @@ C:\Users\Sparky\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\o
C:\Users\Sparky\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.csproj.GenerateResource.Cache
C:\Users\Sparky\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.exe
C:\Users\Sparky\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.pdb
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\bin\Release\UniSolder.exe.config
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\bin\Release\UniSolder.exe
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\bin\Release\UniSolder.pdb
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\bin\Release\SSComm.dll
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\bin\Release\SSControls.dll
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\bin\Release\LibUsbDotNet.dll
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\bin\Release\SSComm.pdb
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\bin\Release\SSControls.pdb
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.csproj.AssemblyReference.cache
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.csproj.SuggestedBindingRedirects.cache
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.Form1.resources
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.Properties.Resources.resources
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.csproj.GenerateResource.cache
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.csproj.CoreCompileInputs.cache
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.csproj.CopyComplete
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.exe
C:\Users\Spartak\Desktop\MyProjects\Electronics\UniSolder\software\PC\UniSolder\obj\Release\UniSolder.pdb
Binary file modified software/PC/UniSolder/obj/Release/UniSolder.csproj.GenerateResource.Cache
View file
Binary file not shown.
Empty file added software/PC/UniSolder/obj/Release/UniSolder.csproj.SuggestedBindingRedirects.cache
View file
Empty file.
Binary file modified software/PC/UniSolder/obj/Release/UniSolder.exe
View file
Binary file not shown.
Binary file modified software/PC/UniSolder/obj/Release/UniSolder.pdb
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion software/front/US_BootLoader.X/OLED.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void OLEDInit(){
else{
PreUpdateBuff.PreRowUpdate.ColLow = 0; //SSD1306 is 128x64 - no need to shift
mcuSPISendByte(0x8D); //charge pump control
mcuSPISendByte(DisplaySetup.InternalChargePump ? 0x14 : 0x10);
mcuSPISendByte(DisplaySetup.InternalChargePump ? 0x14 : 0x10);
}
mcuSPIWait();
mcuSPISendBytes((unsigned int*)OLEDInitBuff2, sizeof(OLEDInitBuff2));
Expand Down
12 changes: 6 additions & 6 deletions software/front/US_BootLoader.X/PIC32MX564F128H.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,24 +116,24 @@ void mcuJumpToApp(void)
}

UINT mcuEraseFlash(void){
UINT Result = 1;
UINT result = 1;
UINT32 i;
UINT32 pFlash = APP_FLASH_BASE_ADDRESS;

for( i = 0; i < ((APP_FLASH_END_ADDRESS - APP_FLASH_BASE_ADDRESS + 1)/FLASH_PAGE_SIZE); i++ )
{
Result = NVMErasePage( (void *)(pFlash + i*FLASH_PAGE_SIZE) );
if(Result)break;
result = NVMErasePage( (void *)(pFlash + i*FLASH_PAGE_SIZE) );
if(result)break;
}

pFlash = APP_IVT_BASE_ADDRESS;
for( i = 0; i < ((APP_IVT_END_ADDRESS - APP_IVT_BASE_ADDRESS + 1)/FLASH_PAGE_SIZE); i++ )
{
Result = NVMErasePage( (void *)(pFlash + i*FLASH_PAGE_SIZE) );
if(Result)break;
result = NVMErasePage( (void *)(pFlash + i*FLASH_PAGE_SIZE) );
if(result)break;
}

return Result;
return result;
}

UINT mcuWriteFlashRecord(void * RecordData)
Expand Down
Binary file modified software/front/US_BootLoader.X/dist/PIC32/production/US_BootLoader.X.production.elf
View file
Binary file not shown.
983 changes: 494 additions & 489 deletions software/front/US_BootLoader.X/dist/PIC32/production/US_BootLoader.X.production.hex
View file

Large diffs are not rendered by default.

2,278 changes: 1,150 additions & 1,128 deletions software/front/US_BootLoader.X/dist/PIC32/production/US_BootLoader.X.production.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions software/front/US_BootLoader.X/dist/PIC32/production/memoryfile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<memory name="program">
<units>bytes</units>
<length>15872</length>
<used>12356</used>
<free>3516</free>
<used>12396</used>
<free>3476</free>
</memory>
<memory name="data">
<units>bytes</units>
<length>4096</length>
<used>1524</used>
<free>2572</free>
<used>1520</used>
<free>2576</free>
</memory>
</executable>
</project>
56 changes: 28 additions & 28 deletions software/front/US_BootLoader.X/nbproject/Makefile-PIC32.mk
View file

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions software/front/US_BootLoader.X/nbproject/Makefile-genesis.properties
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
#
#Wed Jan 06 01:49:19 EET 2021
#Mon Dec 20 16:04:27 EET 2021
PIC32.languagetoolchain.version=2.50
conf.ids=PIC32
PIC32.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=10848bd240cfb6abc7d759fdffba8dbe
host.id=pvvd-5air-5
configurations-xml=c65460396b5688950fe367266eeeb22b
PIC32.Pack.dfplocation=F\:\\Program Files\\Microchip\\MPLABX\\v5.45\\packs\\Microchip\\PIC32MX_DFP\\1.3.231
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=4e1c703e057ce3824a620f2a747a6f88
PIC32.languagetoolchain.dir=F\:\\Program Files\\Microchip\\xc32\\v2.50\\bin
proj.dir=C\:\\Users\\Sparky\\Desktop\\MyProjects\\Electronics\\UniSolder\\software\\front\\US_BootLoader.X
host.id=j1sl-xalx-o
configurations-xml=bbbb7373c759566f4c65d7527b33c2a5
PIC32.Pack.dfplocation=C\:\\Users\\Spartak\\.mchp_packs\\Microchip\\PIC32MX_DFP\\1.3.231
PIC32.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=a8d1477a0cbdce4f518d7c31ceeffdbe
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=5232c20b48df3223daf8c79e5b83e9a8
user-defined-mime-resolver-xml=none
PIC32.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v2.50\\bin
proj.dir=C\:\\Users\\Spartak\\Desktop\\MyProjects\\Electronics\\UniSolder\\software\\front\\US_BootLoader.X
host.platform=windows
30 changes: 15 additions & 15 deletions software/front/US_BootLoader.X/nbproject/Makefile-local-PIC32.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...
#
SHELL=cmd.exe
PATH_TO_IDE_BIN=F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/
PATH_TO_IDE_BIN=C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/
# Adding MPLAB X bin directory to path.
PATH:=F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
PATH:=C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
# Path to java used to run MPLAB X when this makefile was created
MP_JAVA_PATH="F:\Program Files\Microchip\MPLABX\v5.45\sys\java\zulu8.40.0.25-ca-fx-jre8.0.222-win_x64/bin/"
MP_JAVA_PATH="C:\Program Files\Microchip\MPLABX\v5.50\sys\java\zulu8.40.0.25-ca-fx-jre8.0.222-win_x64/bin/"
OS_CURRENT="$(shell uname -s)"
MP_CC="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-gcc.exe"
MP_CPPC="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-g++.exe"
MP_CC="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-gcc.exe"
MP_CPPC="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-g++.exe"
# MP_BC is not defined
MP_AS="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-as.exe"
MP_LD="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-ld.exe"
MP_AR="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-ar.exe"
DEP_GEN=${MP_JAVA_PATH}java -jar "F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_CPPC_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AS="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-as.exe"
MP_LD="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-ld.exe"
MP_AR="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-ar.exe"
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_CPPC_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
# MP_BC_DIR is not defined
MP_AS_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_LD_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AR_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AS_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_LD_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_AR_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
# MP_BC_DIR is not defined
DFP_DIR=F:/Program Files/Microchip/MPLABX/v5.45/packs/Microchip/PIC32MX_DFP/1.3.231
DFP_DIR=C:/Users/Spartak/.mchp_packs/Microchip/PIC32MX_DFP/1.3.231
81 changes: 80 additions & 1 deletion software/front/US_BootLoader.X/nbproject/configurations.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<targetDevice>PIC32MX564F128H</targetDevice>
<targetHeader></targetHeader>
<targetPluginBoard></targetPluginBoard>
<platformTool>noID</platformTool>
<platformTool>PICkit3PlatformTool</platformTool>
<languageToolchain>XC32</languageToolchain>
<languageToolchainVersion>2.50</languageToolchainVersion>
<platform>3</platform>
Expand Down Expand Up @@ -321,6 +321,85 @@
<property key="programoptions.uselvpprogramming" value="false"/>
<property key="voltagevalue" value="3.25"/>
</PICkit3PlatformTool>
<Tool>
<property key="ADC 1" value="true"/>
<property key="AutoSelectMemRanges" value="auto"/>
<property key="CAN1" value="true"/>
<property key="CHANGE NOTICE" value="true"/>
<property key="COMPARATOR" value="true"/>
<property key="DMA" value="true"/>
<property key="Freeze All Other Peripherals" value="true"/>
<property key="I2C1" value="true"/>
<property key="I2C3" value="true"/>
<property key="I2C4" value="true"/>
<property key="I2C5" value="true"/>
<property key="INPUT CAPTURE 1" value="true"/>
<property key="INPUT CAPTURE 2" value="true"/>
<property key="INPUT CAPTURE 3" value="true"/>
<property key="INPUT CAPTURE 4" value="true"/>
<property key="INPUT CAPTURE 5" value="true"/>
<property key="INTERRUPT CONTROL" value="true"/>
<property key="OUTPUT COMPARE 1" value="true"/>
<property key="OUTPUT COMPARE 2" value="true"/>
<property key="OUTPUT COMPARE 3" value="true"/>
<property key="OUTPUT COMPARE 4" value="true"/>
<property key="OUTPUT COMPARE 5" value="true"/>
<property key="PARALLEL MASTER/SLAVE PORT" value="true"/>
<property key="REAL TIME CLOCK" value="true"/>
<property key="SPI 2" value="true"/>
<property key="SPI 3" value="true"/>
<property key="SPI 4" value="true"/>

This comment has been minimized.

Sign in to view

Copy link
@guduziying56

guduziying56 Mar 29, 2023

<属性键=“SPI 5” 值=“真”/>

This comment has been minimized.

Sign in to view

Copy link
@guduziying56

guduziying56 Mar 29, 2023

<属性键=“SPI 5” 值=“真”/>
<property key="SecureSegment.SegmentProgramming" value="FullChipProgramming"/>
<property key="TIMER1" value="true"/>
<property key="TIMER2" value="true"/>
<property key="TIMER3" value="true"/>
<property key="TIMER4" value="true"/>
<property key="TIMER5" value="true"/>
<property key="ToolFirmwareFilePath"
value="Press to browse for a specific firmware version"/>
<property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
<property key="UART1" value="true"/>
<property key="UART2" value="true"/>
<property key="UART3" value="true"/>
<property key="UART4" value="true"/>
<property key="UART5" value="true"/>
<property key="UART6" value="true"/>
<property key="USB" value="true"/>
<property key="debugoptions.useswbreakpoints" value="false"/>
<property key="hwtoolclock.frcindebug" value="false"/>
<property key="memories.aux" value="false"/>
<property key="memories.bootflash" value="false"/>
<property key="memories.configurationmemory" value="false"/>
<property key="memories.configurationmemory2" value="true"/>
<property key="memories.dataflash" value="true"/>
<property key="memories.eeprom" value="false"/>
<property key="memories.flashdata" value="true"/>
<property key="memories.id" value="false"/>
<property key="memories.instruction.ram" value="true"/>
<property key="memories.instruction.ram.ranges"
value="${memories.instruction.ram.ranges}"/>
<property key="memories.programmemory" value="true"/>
<property key="memories.programmemory.ranges" value="0-7fff"/>
<property key="poweroptions.powerenable" value="false"/>
<property key="programmertogo.imagename" value=""/>
<property key="programoptions.donoteraseauxmem" value="false"/>
<property key="programoptions.eraseb4program" value="true"/>
<property key="programoptions.pgmspeed" value="2"/>
<property key="programoptions.preservedataflash" value="false"/>
<property key="programoptions.preservedataflash.ranges"
value="${programoptions.preservedataflash.ranges}"/>
<property key="programoptions.preserveeeprom" value="false"/>
<property key="programoptions.preserveeeprom.ranges" value=""/>
<property key="programoptions.preserveprogram.ranges" value=""/>
<property key="programoptions.preserveprogramrange" value="false"/>
<property key="programoptions.preserveuserid" value="false"/>
<property key="programoptions.programcalmem" value="false"/>
<property key="programoptions.programuserotp" value="false"/>
<property key="programoptions.testmodeentrymethod" value="VPPFirst"/>
<property key="programoptions.usehighvoltageonmclr" value="false"/>
<property key="programoptions.uselvpprogramming" value="false"/>
<property key="voltagevalue" value="3.25"/>
</Tool>
<item path="bootloader.ld" ex="false" overriding="false">
<C32>
</C32>
Expand Down
25 changes: 25 additions & 0 deletions software/front/US_BootLoader.X/nbproject/private/configurations.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<configurationDescriptor version="65">
<projectmakefile>Makefile</projectmakefile>
<defaultConf>0</defaultConf>
<confs>
<conf name="PIC32" type="2">
<platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>900A:=&lt;rev>0002:=&lt;man>Microchip Technology Inc.:=&lt;prod>PICkit 3:=&lt;sn>DEFAULT_PK3 :=&lt;drv>x:=&lt;xpt>h:=end</platformToolSN>
<languageToolchainDir>C:\Program Files\Microchip\xc32\v2.50\bin</languageToolchainDir>
<mdbdebugger version="1">
<placeholder1>place holder 1</placeholder1>
<placeholder2>place holder 2</placeholder2>
</mdbdebugger>
<runprofile version="6">
<args></args>
<rundir></rundir>
<buildfirst>true</buildfirst>
<console-type>0</console-type>
<terminal-type>0</terminal-type>
<remove-instrumentation>0</remove-instrumentation>
<environment>
</environment>
</runprofile>
</conf>
</confs>
</configurationDescriptor>
19 changes: 19 additions & 0 deletions software/front/US_BootLoader.X/nbproject/private/private.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_BootLoader.X/mcu.h</file>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_BootLoader.X/OLED.c</file>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_BootLoader.X/PIC32MX564F128H.h</file>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_BootLoader.X/crc.h</file>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_BootLoader.X/main.c</file>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_BootLoader.X/io.c</file>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_BootLoader.X/PIC32MX564F128H.c</file>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_BootLoader.X/OLED.h</file>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_BootLoader.X/io.h</file>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_BootLoader.X/typedefs.h</file>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_BootLoader.X/crc.c</file>
</group>
</open-files>
</project-private>
2 changes: 1 addition & 1 deletion software/front/US_Firmware.X/OLED.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ void OLEDInit(){
else{
PreUpdateBuff.PreRowUpdate.ColLow = 0; //SSD1306 is 128x64 - no need to shift
mcuSPISendByte(0x8D); //charge pump control
mcuSPISendByte(DisplaySetup.InternalChargePump ? 0x14 : 0x10);
mcuSPISendByte(DisplaySetup.InternalChargePump ? 0x14 : 0x10);
}
mcuSPIWait();
mcuSPISendBytes((unsigned int*)OLEDInitBuff2, sizeof(OLEDInitBuff2));
Expand Down
Binary file modified ...are/front/US_Firmware.X/dist/PIC32_NoOptimization/production/US_Firmware.X.production.elf
View file
Binary file not shown.
8,353 changes: 4,169 additions & 4,184 deletions ...are/front/US_Firmware.X/dist/PIC32_NoOptimization/production/US_Firmware.X.production.hex
View file

Large diffs are not rendered by default.

4,062 changes: 1,975 additions & 2,087 deletions ...are/front/US_Firmware.X/dist/PIC32_NoOptimization/production/US_Firmware.X.production.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions software/front/US_Firmware.X/dist/PIC32_NoOptimization/production/memoryfile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<memory name="program">
<units>bytes</units>
<length>138752</length>
<used>62784</used>
<free>75968</free>
<used>62544</used>
<free>76208</free>
</memory>
<memory name="data">
<units>bytes</units>
<length>32768</length>
<used>4952</used>
<free>27816</free>
<used>5864</used>
<free>26904</free>
</memory>
</executable>
</project>
Binary file modified software/front/US_Firmware.X/dist/PIC32_Standalone/production/US_Firmware.X.production.elf
View file
Binary file not shown.
6,999 changes: 3,502 additions & 3,497 deletions software/front/US_Firmware.X/dist/PIC32_Standalone/production/US_Firmware.X.production.hex
View file

Large diffs are not rendered by default.

3,715 changes: 1,800 additions & 1,915 deletions software/front/US_Firmware.X/dist/PIC32_Standalone/production/US_Firmware.X.production.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions software/front/US_Firmware.X/dist/PIC32_Standalone/production/memoryfile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<memory name="program">
<units>bytes</units>
<length>138752</length>
<used>52540</used>
<free>86212</free>
<used>52612</used>
<free>86140</free>
</memory>
<memory name="data">
<units>bytes</units>
<length>32768</length>
<used>4908</used>
<free>27860</free>
<used>5316</used>
<free>27452</free>
</memory>
</executable>
</project>
Binary file modified ...re/front/US_Firmware.X/dist/PIC32_with_bootloader/production/US_Firmware.X.production.elf
View file
Binary file not shown.
6,999 changes: 3,502 additions & 3,497 deletions ...re/front/US_Firmware.X/dist/PIC32_with_bootloader/production/US_Firmware.X.production.hex
View file

Large diffs are not rendered by default.

3,845 changes: 1,865 additions & 1,980 deletions ...re/front/US_Firmware.X/dist/PIC32_with_bootloader/production/US_Firmware.X.production.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions software/front/US_Firmware.X/dist/PIC32_with_bootloader/production/memoryfile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<memory name="program">
<units>bytes</units>
<length>122876</length>
<used>52540</used>
<free>70336</free>
<used>52612</used>
<free>70264</free>
</memory>
<memory name="data">
<units>bytes</units>
<length>32768</length>
<used>4908</used>
<free>27860</free>
<used>5316</used>
<free>27452</free>
</memory>
</executable>
</project>
4 changes: 2 additions & 2 deletions software/front/US_Firmware.X/isr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ void ISRStart(){
mcuEnableInterrupts();
}

void I2CAddCommands(int c)
{
void I2CAddCommands(int c){
int i;
i=mcuDisableInterrupts();
I2CCommands |= c;
Expand All @@ -88,6 +87,7 @@ void I2CAddCommands(int c)
void OnPowerLost(){
if(!mainFlags.PowerLost){
mainFlags.PowerLost = 1;
OLED_VCC = 1; //turn off OLED's power
HEATER = 0;
mcuADCStop();
mcuStopISRTimer();
Expand Down
5 changes: 3 additions & 2 deletions software/front/US_Firmware.X/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,13 @@ int main(void){
while(1){
if(mainFlags.PowerLost){
SavePars();
MenuTasks();
OLED_VCC = 0; //Turn on OLED's power
MenuTasks(1);
_delay_ms(1000);
mcuReset();
while(1);
}
MenuTasks();
MenuTasks(0);
IOTasks();
IronTasks();
PIDTasks();
Expand Down
17 changes: 9 additions & 8 deletions software/front/US_Firmware.X/menu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ void MenuInit(){
Enc = LastEnc = 0;
}

void OLEDTasks(){
void OLEDTasks(int powerLost){
int dual = IronPars.Config[1].SensorConfig.Type;
t_PIDVars * PV1 = (t_PIDVars *)&PIDVars[0];
t_PIDVars * PV2 = (t_PIDVars *)&PIDVars[1];
if(!dual) PV2 = PV1;
OLEDFlags.DW = 0;
if(mainFlags.PowerLost){
if(powerLost){
OLEDFlags.f.Message = 1;
OLEDMsg1 = " POWER LOST";
OLEDMsg2 = "";
Expand Down Expand Up @@ -145,7 +145,7 @@ void OLEDTasks(){
if(IronPars.Config[0].SensorConfig.Type == SENSOR_NONE){
}
else if(PV1->ShortCircuit || PV2->ShortCircuit){
OLEDFlags.f.Message=1;
OLEDFlags.f.Message = 1;
OLEDMsg1=" HEATER";
OLEDMsg2=" SHORTCIRCUIT";
}
Expand Down Expand Up @@ -599,11 +599,12 @@ void OLEDTasks(){
OLEDUpdate();
}

void MenuTasks(){
void MenuTasks(int powerLost){
int i;
if(mainFlags.PowerLost){
OLEDTasks();
}else{
if(powerLost){
OLEDTasks(1);
}
else{
if(LISRTicks != ISRTicks){
LISRTicks = ISRTicks;
if((LISRTicks & 1) || mainFlags.PowerLost){
Expand Down Expand Up @@ -645,7 +646,7 @@ void MenuTasks(){

OldMode = CMode;

OLEDTasks();
OLEDTasks(0);

if(BeepTicks){
BeepTicks--;
Expand Down
2 changes: 1 addition & 1 deletion software/front/US_Firmware.X/menu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ typedef enum{
}T_MENU_MODE;

extern void MenuInit();
extern void MenuTasks();
extern void MenuTasks(int powerLost);

#ifdef __cplusplus
}
Expand Down
128 changes: 64 additions & 64 deletions software/front/US_Firmware.X/nbproject/Makefile-PIC32_NoOptimization.mk
View file

Large diffs are not rendered by default.

128 changes: 64 additions & 64 deletions software/front/US_Firmware.X/nbproject/Makefile-PIC32_Standalone.mk
View file

Large diffs are not rendered by default.

128 changes: 64 additions & 64 deletions software/front/US_Firmware.X/nbproject/Makefile-PIC32_with_bootloader.mk
View file

Large diffs are not rendered by default.

29 changes: 15 additions & 14 deletions software/front/US_Firmware.X/nbproject/Makefile-genesis.properties
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
#
#Sat Jan 16 00:48:02 EET 2021
proj.dir=C\:\\Users\\Sparky\\Desktop\\MyProjects\\Electronics\\UniSolder\\software\\front\\US_Firmware.X
PIC32_NoOptimization.languagetoolchain.dir=F\:\\Program Files\\Microchip\\xc32\\v2.50\\bin
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=4e1c703e057ce3824a620f2a747a6f88
PIC32_NoOptimization.Pack.dfplocation=F\:\\Program Files\\Microchip\\MPLABX\\v5.45\\packs\\Microchip\\PIC32MX_DFP\\1.3.231
PIC32_Standalone.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=10848bd240cfb6abc7d759fdffba8dbe
PIC32_with_bootloader.languagetoolchain.dir=F\:\\Program Files\\Microchip\\xc32\\v2.50\\bin
configurations-xml=ddbcaf74f7a59e460c86cefc3985449d
PIC32_Standalone.Pack.dfplocation=F\:\\Program Files\\Microchip\\MPLABX\\v5.45\\packs\\Microchip\\PIC32MX_DFP\\1.3.231
PIC32_NoOptimization.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=10848bd240cfb6abc7d759fdffba8dbe
PIC32_with_bootloader.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=10848bd240cfb6abc7d759fdffba8dbe
PIC32_with_bootloader.Pack.dfplocation=F\:\\Program Files\\Microchip\\MPLABX\\v5.45\\packs\\Microchip\\PIC32MX_DFP\\1.3.231
#Mon Dec 20 19:52:48 EET 2021
PIC32_with_bootloader.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=a8d1477a0cbdce4f518d7c31ceeffdbe
proj.dir=C\:\\Users\\Spartak\\Desktop\\MyProjects\\Electronics\\UniSolder\\software\\front\\US_Firmware.X
PIC32_NoOptimization.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v2.50\\bin
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=5232c20b48df3223daf8c79e5b83e9a8
PIC32_NoOptimization.Pack.dfplocation=C\:\\Users\\Spartak\\.mchp_packs\\Microchip\\PIC32MX_DFP\\1.3.231
user-defined-mime-resolver-xml=none
PIC32_with_bootloader.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v2.50\\bin
configurations-xml=39757222da593f5b625bf6d3b4b8a574
PIC32_Standalone.Pack.dfplocation=C\:\\Users\\Spartak\\.mchp_packs\\Microchip\\PIC32MX_DFP\\1.3.231
PIC32_with_bootloader.Pack.dfplocation=C\:\\Users\\Spartak\\.mchp_packs\\Microchip\\PIC32MX_DFP\\1.3.231
host.platform=windows
PIC32_with_bootloader.languagetoolchain.version=2.50
host.id=pvvd-5air-5
PIC32_Standalone.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=a8d1477a0cbdce4f518d7c31ceeffdbe
host.id=j1sl-xalx-o
conf.ids=PIC32_Standalone,PIC32_with_bootloader,PIC32_NoOptimization
PIC32_Standalone.languagetoolchain.dir=F\:\\Program Files\\Microchip\\xc32\\v2.50\\bin
PIC32_Standalone.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v2.50\\bin
PIC32_Standalone.languagetoolchain.version=2.50
PIC32_NoOptimization.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=a8d1477a0cbdce4f518d7c31ceeffdbe
PIC32_NoOptimization.languagetoolchain.version=2.50
2 changes: 1 addition & 1 deletion software/front/US_Firmware.X/nbproject/Makefile-impl.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
PROJECTNAME=US_Firmware.X

# Active Configuration
DEFAULTCONF=PIC32_Standalone
DEFAULTCONF=PIC32_with_bootloader
CONF=${DEFAULTCONF}

# All Configurations
Expand Down
30 changes: 15 additions & 15 deletions software/front/US_Firmware.X/nbproject/Makefile-local-PIC32_NoOptimization.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...
#
SHELL=cmd.exe
PATH_TO_IDE_BIN=F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/
PATH_TO_IDE_BIN=C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/
# Adding MPLAB X bin directory to path.
PATH:=F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
PATH:=C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
# Path to java used to run MPLAB X when this makefile was created
MP_JAVA_PATH="F:\Program Files\Microchip\MPLABX\v5.45\sys\java\zulu8.40.0.25-ca-fx-jre8.0.222-win_x64/bin/"
MP_JAVA_PATH="C:\Program Files\Microchip\MPLABX\v5.50\sys\java\zulu8.40.0.25-ca-fx-jre8.0.222-win_x64/bin/"
OS_CURRENT="$(shell uname -s)"
MP_CC="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-gcc.exe"
MP_CPPC="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-g++.exe"
MP_CC="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-gcc.exe"
MP_CPPC="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-g++.exe"
# MP_BC is not defined
MP_AS="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-as.exe"
MP_LD="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-ld.exe"
MP_AR="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-ar.exe"
DEP_GEN=${MP_JAVA_PATH}java -jar "F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_CPPC_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AS="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-as.exe"
MP_LD="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-ld.exe"
MP_AR="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-ar.exe"
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_CPPC_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
# MP_BC_DIR is not defined
MP_AS_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_LD_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AR_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AS_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_LD_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_AR_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
# MP_BC_DIR is not defined
DFP_DIR=F:/Program Files/Microchip/MPLABX/v5.45/packs/Microchip/PIC32MX_DFP/1.3.231
DFP_DIR=C:/Users/Spartak/.mchp_packs/Microchip/PIC32MX_DFP/1.3.231
30 changes: 15 additions & 15 deletions software/front/US_Firmware.X/nbproject/Makefile-local-PIC32_Standalone.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...
#
SHELL=cmd.exe
PATH_TO_IDE_BIN=F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/
PATH_TO_IDE_BIN=C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/
# Adding MPLAB X bin directory to path.
PATH:=F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
PATH:=C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
# Path to java used to run MPLAB X when this makefile was created
MP_JAVA_PATH="F:\Program Files\Microchip\MPLABX\v5.45\sys\java\zulu8.40.0.25-ca-fx-jre8.0.222-win_x64/bin/"
MP_JAVA_PATH="C:\Program Files\Microchip\MPLABX\v5.50\sys\java\zulu8.40.0.25-ca-fx-jre8.0.222-win_x64/bin/"
OS_CURRENT="$(shell uname -s)"
MP_CC="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-gcc.exe"
MP_CPPC="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-g++.exe"
MP_CC="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-gcc.exe"
MP_CPPC="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-g++.exe"
# MP_BC is not defined
MP_AS="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-as.exe"
MP_LD="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-ld.exe"
MP_AR="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-ar.exe"
DEP_GEN=${MP_JAVA_PATH}java -jar "F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_CPPC_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AS="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-as.exe"
MP_LD="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-ld.exe"
MP_AR="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-ar.exe"
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_CPPC_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
# MP_BC_DIR is not defined
MP_AS_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_LD_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AR_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AS_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_LD_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_AR_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
# MP_BC_DIR is not defined
DFP_DIR=F:/Program Files/Microchip/MPLABX/v5.45/packs/Microchip/PIC32MX_DFP/1.3.231
DFP_DIR=C:/Users/Spartak/.mchp_packs/Microchip/PIC32MX_DFP/1.3.231
30 changes: 15 additions & 15 deletions software/front/US_Firmware.X/nbproject/Makefile-local-PIC32_with_bootloader.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...
#
SHELL=cmd.exe
PATH_TO_IDE_BIN=F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/
PATH_TO_IDE_BIN=C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/
# Adding MPLAB X bin directory to path.
PATH:=F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
PATH:=C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
# Path to java used to run MPLAB X when this makefile was created
MP_JAVA_PATH="F:\Program Files\Microchip\MPLABX\v5.45\sys\java\zulu8.40.0.25-ca-fx-jre8.0.222-win_x64/bin/"
MP_JAVA_PATH="C:\Program Files\Microchip\MPLABX\v5.50\sys\java\zulu8.40.0.25-ca-fx-jre8.0.222-win_x64/bin/"
OS_CURRENT="$(shell uname -s)"
MP_CC="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-gcc.exe"
MP_CPPC="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-g++.exe"
MP_CC="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-gcc.exe"
MP_CPPC="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-g++.exe"
# MP_BC is not defined
MP_AS="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-as.exe"
MP_LD="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-ld.exe"
MP_AR="F:\Program Files\Microchip\xc32\v2.50\bin\xc32-ar.exe"
DEP_GEN=${MP_JAVA_PATH}java -jar "F:/Program Files/Microchip/MPLABX/v5.45/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_CPPC_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AS="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-as.exe"
MP_LD="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-ld.exe"
MP_AR="C:\Program Files\Microchip\xc32\v2.50\bin\xc32-ar.exe"
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files/Microchip/MPLABX/v5.50/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_CPPC_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
# MP_BC_DIR is not defined
MP_AS_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_LD_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AR_DIR="F:\Program Files\Microchip\xc32\v2.50\bin"
MP_AS_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_LD_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
MP_AR_DIR="C:\Program Files\Microchip\xc32\v2.50\bin"
# MP_BC_DIR is not defined
DFP_DIR=F:/Program Files/Microchip/MPLABX/v5.45/packs/Microchip/PIC32MX_DFP/1.3.231
DFP_DIR=C:/Users/Spartak/.mchp_packs/Microchip/PIC32MX_DFP/1.3.231
9 changes: 9 additions & 0 deletions software/front/US_Firmware.X/nbproject/configurations.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
value="_SUPPRESS_PLIB_WARNING;_DISABLE_OPENADC10_CONFIGPORT_WARNING"/>
<property key="strict-ansi" value="false"/>
<property key="support-ansi" value="false"/>
<property key="tentative-definitions" value="-fno-common"/>
<property key="toplevel-reordering" value=""/>
<property key="unaligned-access" value=""/>
<property key="use-cci" value="false"/>
Expand Down Expand Up @@ -182,6 +183,7 @@
</C32-AS>
<C32-CO>
<property key="coverage-enable" value=""/>
<property key="stack-guidance" value="false"/>
</C32-CO>
<C32-LD>
<property key="additional-options-use-response-files" value="false"/>
Expand Down Expand Up @@ -264,6 +266,7 @@
<property key="omit-pack-options" value="1"/>
<property key="relaxed-math" value="false"/>
<property key="save-temps" value="false"/>
<property key="stack-smashing" value=""/>
<property key="wpo-lto" value="false"/>
</C32Global>
<PICkit3PlatformTool>
Expand Down Expand Up @@ -584,6 +587,7 @@
value="_SUPPRESS_PLIB_WARNING;_DISABLE_OPENADC10_CONFIGPORT_WARNING"/>
<property key="strict-ansi" value="false"/>
<property key="support-ansi" value="false"/>
<property key="tentative-definitions" value="-fno-common"/>
<property key="toplevel-reordering" value=""/>
<property key="unaligned-access" value=""/>
<property key="use-cci" value="false"/>
Expand Down Expand Up @@ -616,6 +620,7 @@
</C32-AS>
<C32-CO>
<property key="coverage-enable" value=""/>
<property key="stack-guidance" value="false"/>
</C32-CO>
<C32-LD>
<property key="additional-options-use-response-files" value="false"/>
Expand Down Expand Up @@ -698,6 +703,7 @@
<property key="omit-pack-options" value="1"/>
<property key="relaxed-math" value="false"/>
<property key="save-temps" value="false"/>
<property key="stack-smashing" value=""/>
<property key="wpo-lto" value="false"/>
</C32Global>
<item path="PID.c" ex="false" overriding="false">
Expand Down Expand Up @@ -1383,6 +1389,7 @@
value="_SUPPRESS_PLIB_WARNING;_DISABLE_OPENADC10_CONFIGPORT_WARNING"/>
<property key="strict-ansi" value="false"/>
<property key="support-ansi" value="false"/>
<property key="tentative-definitions" value="-fno-common"/>
<property key="toplevel-reordering" value=""/>
<property key="unaligned-access" value=""/>
<property key="use-cci" value="false"/>
Expand Down Expand Up @@ -1414,6 +1421,7 @@
</C32-AS>
<C32-CO>
<property key="coverage-enable" value=""/>
<property key="stack-guidance" value="false"/>
</C32-CO>
<C32-LD>
<property key="additional-options-use-response-files" value="false"/>
Expand Down Expand Up @@ -1495,6 +1503,7 @@
<property key="omit-pack-options" value="1"/>
<property key="relaxed-math" value="false"/>
<property key="save-temps" value="false"/>
<property key="stack-smashing" value=""/>
<property key="wpo-lto" value="false"/>
</C32Global>
<PICkit3PlatformTool>
Expand Down
61 changes: 61 additions & 0 deletions software/front/US_Firmware.X/nbproject/private/configurations.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<configurationDescriptor version="65">
<projectmakefile>Makefile</projectmakefile>
<defaultConf>1</defaultConf>
<confs>
<conf name="PIC32_Standalone" type="2">
<platformToolSN>noToolString</platformToolSN>
<languageToolchainDir>C:\Program Files\Microchip\xc32\v2.50\bin</languageToolchainDir>
<mdbdebugger version="1">
<placeholder1>place holder 1</placeholder1>
<placeholder2>place holder 2</placeholder2>
</mdbdebugger>
<runprofile version="6">
<args></args>
<rundir></rundir>
<buildfirst>true</buildfirst>
<console-type>0</console-type>
<terminal-type>0</terminal-type>
<remove-instrumentation>0</remove-instrumentation>
<environment>
</environment>
</runprofile>
</conf>
<conf name="PIC32_with_bootloader" type="2">
<platformToolSN>noToolString</platformToolSN>
<languageToolchainDir>C:\Program Files\Microchip\xc32\v2.50\bin</languageToolchainDir>
<mdbdebugger version="1">
<placeholder1>place holder 1</placeholder1>
<placeholder2>place holder 2</placeholder2>
</mdbdebugger>
<runprofile version="6">
<args></args>
<rundir></rundir>
<buildfirst>true</buildfirst>
<console-type>0</console-type>
<terminal-type>0</terminal-type>
<remove-instrumentation>0</remove-instrumentation>
<environment>
</environment>
</runprofile>
</conf>
<conf name="PIC32_NoOptimization" type="2">
<platformToolSN></platformToolSN>
<languageToolchainDir>C:\Program Files\Microchip\xc32\v2.50\bin</languageToolchainDir>
<mdbdebugger version="1">
<placeholder1>place holder 1</placeholder1>
<placeholder2>place holder 2</placeholder2>
</mdbdebugger>
<runprofile version="6">
<args></args>
<rundir></rundir>
<buildfirst>true</buildfirst>
<console-type>0</console-type>
<terminal-type>0</terminal-type>
<remove-instrumentation>0</remove-instrumentation>
<environment>
</environment>
</runprofile>
</conf>
</confs>
</configurationDescriptor>
9 changes: 9 additions & 0 deletions software/front/US_Firmware.X/nbproject/private/private.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/C:/Users/Spartak/Desktop/MyProjects/Electronics/UniSolder/software/front/US_Firmware.X/main.c</file>
</group>
</open-files>
</project-private>