MBPoll integrated
MBPoll integrated
MBPoll debugging. Most of the issues resolved.
Merge pull request #89 from Fance/master

Update CM5
Merge pull request #6 from temcocontrols/master

Get Code From Temco  2013-9-7
Fix some bugs

1.Tstat5E
2.Inputset dialog
3.Updata HumChamber
Merge branch 'master' of github.com:temcocontrols/T3000_Building_Automation_System

Conflicts:
	.gitignore
	ISP/ComWriter.cpp
	ISP/ISP.vcxproj
	ISP/ISP.vcxproj.filters
	ISP/ReadMe.txt
	ModbusDllforVc/ModbusDllforVc/common.cpp
	T3000/BacnetInput.cpp
	T3000/BacnetOutput.cpp
	T3000/BacnetOutput.h
	T3000/BacnetProgram.cpp
	T3000/BacnetProgram.h
	T3000/BacnetProgramEdit.cpp
	T3000/BacnetProgramEdit.h
	T3000/BacnetVariable.cpp
	T3000/BacnetVariable.h
	T3000/BuildTable1.cpp
	T3000/CM5/BacNetProgram_transplant.cpp
	T3000/CM5/DialogCM5.cpp
	T3000/CM5/ListCtrlEx.cpp
	T3000/CM5/ListCtrlEx.h
	T3000/DialogCM5_BacNet.cpp
	T3000/DialogCM5_BacNet.h
	T3000/HumChamber.cpp
	T3000/InputSetDlg.cpp
	T3000/MainFrm.cpp
	T3000/MainFrm.h
	T3000/OutputSetDlg.cpp
	T3000/ParameterDlg.cpp
	T3000/ParameterDlg.h
	T3000/T3/DialogT3.cpp
	T3000/T3/DialogT3.h
	T3000/T3000.cpp
	T3000/T3000.rc
	T3000/T3000.suo
	T3000/T3000.vcxproj
	T3000/T3000.vcxproj.filters
	T3000/T3000View.cpp
	T3000/T3000View.h
	T3000/T332AI.cpp
	T3000/T332AI.h
	T3000/T38AI8AO.cpp
	T3000/T38AI8AO.h
	T3000/T38I13O.cpp
	T3000/T38I13O.h
	T3000/global_variable.h
	T3000/global_variable_extern.h
	T3000/globle_function.h
	T3000/res/Thumbs.db
	T3000/res/t3000.mdb
	T3000/resource.h
	T3000/stdafx.h
	history.txt
Data traffic added.
Merge pull request #90 from ALEXLCC/master

Fix some bugs For Tstat5E ,Humchamber ,MiniPannel
Merge branch 'master' of github.com:temcocontrols/T3000_Building_Automation_System
latest code merged
Merge pull request #91 from jay-github/master

Data traffic shown inside mbPoll
Merge pull request #7 from temcocontrols/master

Merger Jay's work 2013-9-10
Rev 2013.19

1>Change Tstat5G the same as Tstat5E
2>Fix "Setpoint Value can not write"
3>Fix "Heating Set Point "in night sepoint for loop1 is 1/10 value
4>Fix "Set Heating DB for Day setpoint for Loop1"
5>Fix "Cooling ,Heating DB for Loop2 are not saved to disk"
Merge pull request #92 from ALEXLCC/master

	Rev 2013.19
MBPoll bug corrected.
Merge pull request #93 from jay-github/master

MBPoll bug corrected.
Merge pull request #13 from temcocontrols/master

Get update from temco to Fance