Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 13 additions & 0 deletions Change_Log.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Dec 18 2013:
-Initial Project released

June 16 2014:
-Changed Ia_PID_Kp to 25 and Ia_PID_Ki to 4, prior version had Kp and Ki set too agressively and caused pump current output oscillations.
-in Ia_PID() function, Ri_Mid_Error boundary checked changed
-in Ia_PID() function, Ri_Mid_Error_Sum boundary checked changed
-Removed vestigial code regarding displaying Text on LCD that made it's way in from the closed sourced firmware.
November 12 2018:
-Lambda and temp is displayed as text on first line, lambda graph at bottom of display.
-Added a heatup msg
-Vout defaults to lambda 1 during heatup.
-New PCB with nice connector.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?xml version="1.0"?><PSOC_WND_PERSIST><APP_EDITOR_SETTINGS><OPEN_FILE PATH=".\main.c" /><EDITOR_TABGROUP SPLIT="Horizontal"><FILE PATH="" /><FILE PATH=".\SLC_Free_Open_Source.soc" /><FILE PATH=".\main.c" /></EDITOR_TABGROUP></APP_EDITOR_SETTINGS><DEBUGGER_SETTINGS><TRACE_MODE VALUE="PCOnly" /><EVENT NUMBER="0" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="1" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="2" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="3" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="4" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="5" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="6" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="7" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="8" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="9" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="10" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="11" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="12" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="13" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="14" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="15" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="16" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="17" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="18" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="19" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="20" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="21" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="22" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="23" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="24" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="25" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="26" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="27" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="28" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="29" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="30" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="31" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="32" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="33" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="34" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="35" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="36" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="37" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="38" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="39" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="40" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="41" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="42" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="43" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="44" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="45" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="46" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="47" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="48" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="49" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="50" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="51" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="52" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="53" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="54" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="55" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="56" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="57" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="58" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="59" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="60" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="61" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="62" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><EVENT NUMBER="63" THREAD8="Disabled" THREAD16="Disabled" LOGIC="Disabled" /><GLOBAL_EVENT_CONTROL THREAD8="8 Bit Thread - Active" THREAD16="16 Bit Thread - Active" LOGIC="State Logic - Active" /><MEMWIN_TABGROUP SPLIT="Horizontal"><VIEW BANK="RAM" TITLE="RAM" COLUMNS="8" /><VIEW BANK="FLASH" TITLE="FLASH" COLUMNS="8" /><VIEW BANK="IO Bank 0" TITLE="IO Bank 0" COLUMNS="1" /><VIEW BANK="IO Bank 1" TITLE="IO Bank 1" COLUMNS="1" /></MEMWIN_TABGROUP></DEBUGGER_SETTINGS></PSOC_WND_PERSIST>
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
Starting MAKE...
creating project.mk

lib/adcinc.asm

lib/adcincint.asm

lib/amux4_0.asm

lib/amux4_1.asm

lib/dac6_vgnd.asm

lib/dac9_ia.asm

lib/insamp.asm

lib/lcd.asm

lib/psocconfig.asm

lib/psocconfigtbl.asm

lib/pwm8_heater.asm

lib/pwm8_heaterint.asm

lib/pwm8_nb_out.asm

lib/pwm8_nb_outint.asm

lib/pwm8_vout.asm

lib/pwm8_voutint.asm

lib/sleeptimer.asm

lib/sleeptimerint.asm

./boot.asm

Linking..

symbol ADCINC_bGetData is unused

symbol SleepTimer_bGetTickCntr is unused

symbol PWM8_Heater_bReadCounter is unused

symbol ADCINC_iGetData is unused

symbol SleepTimer_iGetTickCntr is unused

symbol SleepTimer_lGetTickCntr is unused

symbol PWM8_Vout_EnableInt is unused

symbol PWM8_Vout_Stop is unused

symbol LCD_DrawBG is unused

symbol SleepTimer_TickWait is unused

symbol PWM8_Vout_bReadPulseWidth is unused

symbol PWM8_NB_Out_EnableInt is unused

symbol SleepTimer_SetTimer is unused

symbol SleepTimer_SyncWait is unused

symbol LCD_DrawVBG is unused

symbol LCD_InitVBG is unused

symbol ADCINC_Stop is unused

symbol PWM8_Heater_EnableInt is unused

symbol PWM8_NB_Out_Stop is unused

symbol ADCINC_fClearFlag is unused

symbol INSAMP_Stop is unused

symbol SleepTimer_bGetTimer is unused

symbol PWM8_Heater_Stop is unused

symbol PWM8_NB_Out_bReadPulseWidth is unused

symbol _LCD_DrawVBG is unused

symbol SleepTimer_Stop is unused

symbol AMUX4_0_Stop is unused

symbol AMUX4_1_Stop is unused

symbol PWM8_Vout_WritePeriod is unused

symbol DAC9_Ia_Stop is unused

symbol ADCINC_WritePulseWidth is unused

symbol ADCINC_fIsDataAvailable is unused

symbol PWM8_Heater_bReadPulseWidth is unused

symbol SleepTimer_DisableInt is unused

symbol LCD_PrHexInt is unused

symbol PWM8_Vout_bReadCounter is unused

symbol DAC9_Ia_WriteBlind is unused

symbol ADCINC_cClearFlagGetData is unused

symbol AMUX4_0_Start is unused

symbol AMUX4_1_Start is unused

symbol ADCINC_StopADC is unused

symbol PWM8_NB_Out_WritePeriod is unused

symbol DAC6_VGND_Stop is unused

symbol PWM8_Heater_WritePeriod is unused

symbol PWM8_NB_Out_bReadCounter is unused

symbol INSAMP_SetGain is unused

symbol DAC6_VGND_WriteBlind is unused

603 bytes unused code deleted

no worthwhile duplicate found

ROM 89% full. 3607 out of 4096 bytes used (does not include absolute areas).

RAM 40% full. 101 bytes used (does not include stack usage).

Built with ICCM8C STD V7.05.00


SLC_Free_Open_Source - 0 error(s) 0 warning(s) 11:18:47

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@
</LIB_FILE_LIST>
</FILE_LIST>
<BUILD_SETTINGS>
<BUILD COMPILER="IMAGECRAFT" INCLUDE_PATH="C:\PROGRA~1\Cypress\PSOCDE~2\5.3\Common\CY3E64~1\tools\include\CY8C24~3"/>

<BUILD COMPILER="IMAGECRAFT" INCLUDE_PATH="C:\PROGRA~2\Cypress\PSOCDE~1\5.4\Common\CYPRES~1\tools\include\CY8C24~1"/>
</BUILD_SETTINGS>
<MISC>
<WINDOWPOSITIONS>
Expand All @@ -79,6 +80,15 @@
</MISC>
</APPLICATION>
<PROJECT_SETTINGS>









<SECTION SECTION_NAME="Linker Settings" VENDOR="HI-TECH" LIB_PATH="" LIBS="" OPTIONS=""/>
<SECTION SECTION_NAME="Linker Settings" VENDOR="IMAGECRAFT" LIB_PATH="" LIBS="" RELOC_ADDR_START="336" ENABLE_ALIGN_SHIFT="0" ENABLE_24MHZ_WARNING="0" ALLOW_24MHZSHIFTOPTS="0"/>
<SECTION SECTION_NAME="Linker Settings" VENDOR="ImageCraftPro" LIB_PATH="" LIBS="" RELOC_ADDR_START="336" ENABLE_ALIGN_SHIFT="0" ENABLE_24MHZ_WARNING="0" ALLOW_24MHZSHIFTOPTS="0"/>
Expand Down
Loading