Você está na página 1de 8

date:01-3-2012

Name:yuvraj
********************************************************************************
********************************
1. New splash screen added.......as per specified in AMG Firmware reguirement do
cument page no 8
1.1 changes made in files-> src\logo.asm
note: To convert the bitmap image into the series of hex bytes
the image needs to be truly monochromatic (bit depth=1)
bitmap image.
The bitmap image is converted to series of hex bytes using
packbmp utility available in folder g10v4\bitmap
This series of hex bytes is then converted to the format mentioned in firm
ware
requirement document page no 8.
********************************************************************************
*******************************
********************************************************************************
*******************************
2. New Water analysis string (english) generated.
2.1 changes made in files-> language\english.cpp....cENGLISH::cENGLISH ()
-> src\strings.h
********************************************************************************
*******************************
********************************************************************************
*******************************
3. "Water Analysis " string added at the top of the list in the
test type menu page ....as per specified in AMG Firmware reguirement doc
ument page no 4
3.1 changes made in files-> src\tests.cpp...........VOID cTESTS::Initialize ()
-> include\test.h
********************************************************************************
*******************************
date:05-3-2012
Name:yuvraj
********************************************************************************
*******************************
4. Water Analysis main screen (new) added ....as per specified in AMG Firmware r
eguirement document page no 5
(some changes still to be done )
4.1 changes made in files-> include\tests.h

-> src\tests.cpp ........VOID cTESTS::Load (HPCHEADE


R ptr, BOOL change)
........VOID cTESTS::Key (SHORT key
)
........#include "wa.h"...line adde
d
-> src\convert.cpp.......#include "wa.h"...line adde
d
-> src\setup.cpp ........VOID cSETUP::UpdateItem (SE
TUP_ITEM item,PCHAR out,BOOL bCSV)
-> create\makefile.......wa.cpp file added under in
CPPSRCS and wa.obj created with
required header files.
-> src\makefile..........wa.cpp file added under in
CPPSRCS and wa.obj created with
required header files.
4.2 new files added
-> create\wa.cpp.........Set the initial Water analy
sis parameter values and generate the ram image.
-> src\wa.cpp............water analysis test related
functions
-> src\wa.h..............water analysis Test class.
********************************************************************************
**********************************
********************************************************************************
**********************************
date: 12-03-2012
name:yuvraj
********************************************************************************
**********************************
5. sample position Manual 3 fixed and un-editable
5.1 changes made in files-> include\turret.h
-> src\setup.cpp
6. Water Analysis main screen (page 2) added ....as per specified in AMG Firmwar
e reguirement document page no 6
6.1 changes made in files-> inlcude\context.h......new water analysis test re
lated variables created
-> src\context.cpp........new water analysis test re
lated variables initialised
-> include\setup.h........menu items for water analy
sis test created
-> src\setup.cpp..........function Drawmenu(....) ch
anged to add "result= A+BX+CX2+DX3 " text
and to add a blank line
function key(....)
function GotDouble ()
function UpdateItem ()
function vChange(.....)
-> src\wa.cpp.............function DataShift (ACQ_MO
DE from, ACQ_MODE to) added
function vDrawMisc ()...ad
ded

-> language\english.cpp ..water analysis ...page 2 r


elated strings added
********************************************************************************
**************************************
********************************************************************************
**************************************
date: 16-03-2012
name:yuvraj
********************************************************************************
**************************************
7. result screeen added with value of measured concentration
7.1 changes made in files-> src\runtest.cpp......VOID cRUNTESTBase::Key (SH
ORT key)...changed
-> src\wa.cpp...........
-> src\turret.h.........functions changed
BOOL ManSix (const SAMPLER
_pos) const
SHORT ModNum (const SAMPLE
R _pos) const
SHORT PosForSmp (const SAM
PLER _pos, const SHORT _smp) const
********************************************************************************
*************************************
********************************************************************************
*************************************
date: 21-03-2012
name:yuvraj
********************************************************************************
*************************************
8. Two new models created and two new hex files generated
Instrument names: GENESYS 10S WA-UV-Vis
GENESYS 10S WA-Vis
Hex file names:
WA_UV.HEX
WA_VIS.HEX
8.1 changes made in files->
->
->
->
->
->
8.2 new files added

include\config.h.....
include\config.inc...
include\config.mk....
create\build.cpp.....
src\makefile.........
src\version.asm......

-> src\WA_UV.cfg
-> src\WA_VIS.cfg

********************************************************************************
**************************************
********************************************************************************
**************************************
date: 28-03-2012

name:yuvraj
********************************************************************************
**************************************
9. Changes according to TFS feedback
a. increase number of lines used to display the result before going to a new
page.
a.1
changes made in files-> include\turret.h.......SHORT ModNum (con
st SAMPLER _pos) const
b. need to assign a unique filename
b.1
changes made in files->
r created
->
E::TestType [] {}
->
->
->
string ) added
->
string ) added
->
string ) added
->
string ) added
->
string ) added

to the test file - wa for water analysis


include\strings.h......new string pointe
src\diskette.cpp.......STRINGS cDISKETT
include\diskfile.h.....
src\diskfile.cpp.......
language\english.cpp...WA(file extension
language\french.cpp....WA(file extension
language\german.cpp....WA(file extension
language\spanish.cpp...WA(file extension
language\italian.cpp...WA(file extension

c. need to output the .csv file


c.1
changes made in files-> src\wa.cpp.............
d. Modify the measure blank to use current turret position(fully manual oper
ation)
d.1
changes made in files-> include\turret.h.....function.. BOOL Man
Three (const SAMPLER _pos) const ...added
-> src\sscan.cpp........SSCAN_STATUS cSSCAN
::Baseline () const
e. the system should home and remember the last turret position and return t
o that position after the home
e.1
changes made in files-> include\system.h........Functions protot
ypes added to save and get the turret position
VOID
TurretPo
sition(BYTE );
BYTE
TurretPo
sition (VOID);
-> src\system.cpp..........Function definat
ions added to save and get the turret position
VOID cSYSTEM::Tu
rretPosition(BYTE m)
BYTE cSYSTEM::Tu
rretPosition ()
-> include\turret.h........function modifie
d
SHORT PosForSm
p (const SAMPLER _pos, const SHORT _smp) const
-> src\turret.cpp..........function modifie
d

VOID cTURRET::Po
sition (SHORT newcell)
-> src\tests.cpp...........turret keys disa
abled on the test type page
********************************************************************************
*********************************************
********************************************************************************
*********************************************
date: 03-04-2012
name:yuvraj
********************************************************************************
*********************************************
10. smart start garbage value problem
Following changes are made to remove the problem
>>the last turret position value is not saved to battery backupd non vol
atile RTC ram.
10.1 changes made in files-> include\system.h...........the CellPosition v
ariable commented
src\system.cpp.............changes made in fun
ctions
VOID cSYSTEM::Turre
tPosition(BYTE m)
VOID cSYSTEM::Turre
tPosition()
include\turret.h...........changes made in fun
ction
SHORT
PosForSm
p (const SAMPLER _pos, const SHORT _smp) const
********************************************************************************
**********************************************
********************************************************************************
**********************************************
date: 05-04-2012
name: yuvraj
********************************************************************************
**********************************************
11. At every power-on, the turret should move to Blank position in manual three
operation for water analysis test
11.1 changes made in files-> include\system.h...........the CellPosition va
riable is created to save the current turret position,
this variable is no
w saved in volatile RAM
-> src\system.cpp.............changes made in fun
ctions
VOID cSYSTEM::Turre
tPosition(BYTE m)
VOID cSYSTEM::Turre
tPosition()
-> include\turret.h...........changes made in fun
ction
SHORT
PosForSm
p (const SAMPLER _pos, const SHORT _smp) const

********************************************************************************
***********************************************
********************************************************************************
***********************************************
date: 10-04-2012
name: yuvraj
********************************************************************************
***********************************************
12. In water analysis test the turret should move to blank position only at powe
r on, in next runs the turret should move to
the previous saved position.
12.2 changes made in files-> src\runtest.cpp............changes made in fu
nction
BOOL cRUNBase::Ver
ifyTurret () const {
********************************************************************************
************************************************
********************************************************************************
************************************************
date: 12-04-2012
name: yuvraj
********************************************************************************
************************************************
13. The change number 12 is discarded
While entering into water analysis test run process, the turret should move
to the position, selected previously in any other test.
For example when operator selects position B, 2 or 4 in the home screen(or a
ny other screen) then after the water analysis test run
the turret should move to respective position and if operator selects the po
sition 1, 3 or 5(not available in manual 3 opearation) in
the home screen(or any other screen) then after the water analysis test run
the turret should move to blank position.
13.2 changes made in files-> src\system.cpp...........VOID cSYSTEM::Turr
etPosition(BYTE m)
-> include\turret.h.........SHORT PosForSmp (c
onst SAMPLER _pos, const SHORT _smp) const
********************************************************************************
*************************************************
********************************************************************************
************************************************
date: 19-04-2012
name: yuvraj
********************************************************************************
************************************************
14. version change from 4.003 to 1.000
model name reported on the USB port: a. "GENESYS 10S WA UV-Vis"
b. "GENESYS 10S WA Vis"
14.1 changes made in files-> src\version.asm..........
********************************************************************************

************************************************
********************************************************************************
************************************************
date: 26-04-2012
name: yuvraj
********************************************************************************
************************************************
15. version change from 4.003 to 1.000
new splash screen 'Pandastar' added.
15.1 changes made in files-> src\logo.asm..........
********************************************************************************
************************************************
********************************************************************************
************************************************
date: 22-06-2012
name: yuvraj
********************************************************************************
************************************************
16.
16.1 Issue Id: SE23717
Title : G10S PV test passes without required standard in sample compar
tment
16.1.1 changes made in files-> src\pvwlext.cpp......BYTE cPVWLExt::Sc
anWL (SHORT Std) const
note : Applied an amplitude qualifier of 0.1A in absorbance mode
and 10% - 90% in % Transmittance mode.
16.2 Issue Id: PRINTER (no TT tracking #)
Title : GENESYS 10S systems with an internal thermal printer do not ad
vance the
paper enough after printing is done
16.2.1 changes made in files-> src\printer.cpp.....cPRINTER::EndPrint
()
.....cPRINTER::PrintGra
ph ()
16.3 Issue Id: Blank Test name
16.3.1 changes made in file->
ated in class cSTORETEST
->
:Key (SHORT key)
->
(SHORT key)
->
(SHORT key)
->
e::Key (SHORT key)
->
Keys (SHORT key)

include\stored.h.......new variable cre


src\stored.cpp.........VOID cSTORETEST:
src\names.cpp..........VOID cNAMES::Key
src\setup.cpp..........VOID cSETUP::Key
src\runtest.cpp........VOID cRUNTESTBas
src\ss.cpp.............BOOL cSSGraph::v

-> src\kin.cpp............BOOL cKINGraph:


:vKeys (SHORT key)
********************************************************************************
************************************************
********************************************************************************
************************************************
date: 27-06-2012
name: yuvraj
********************************************************************************
************************************************
17. New splash screens added.......Orion AM 7000 splashscreen for vis , Orion AM
8000 splashscreen for uv-vis
C:\g10v4\bitmap\splashscreens
17.1 changes made in files-> src\logo.asm
********************************************************************************
************************************************
Note: The changes made can be found by searching for BAT in the source code.