bugfixes

diff --git a/bot/Functions/Header.au3 b/bot/Functions/Header.au3
index 1b51e1ef085d66093befd6cef7a165f2f6ece408..879ca4e6be21a620c73ceadac0c4b33f473d37b9 100755 (executable)
--- a/bot/Functions/Header.au3
+++ b/bot/Functions/Header.au3
@@ -7,11 +7,11 @@
 #include <GuiTab.au3>
 #include "BinaryIntegerConvert.au3"
 #include "EpochConvert.au3"
-$programversion = "0.99"
+$programversion = "0.99.1"
 $excelLineBegin = "1100" ; Change this to the range of cells you want to be processed
 $excelLineEnd = "4000"
 Global $completelog = ""
-$CellRange = "A" & $excelLineBegin & ":P" & $excelLineEnd
+$CellRange = "A" & $excelLineBegin & ":Q" & $excelLineEnd
 $cellSystem = 0
 $cellDate = 1
 $cellChipV = 3

diff --git a/bot/Functions/PrintSucessMessage.au3 b/bot/Functions/PrintSucessMessage.au3
index db651c993f1343fb12f24da48cf920d65bb60a7e..950e1e700fd849d547d1868bf737aecbccfc549a 100755 (executable)
--- a/bot/Functions/PrintSucessMessage.au3
+++ b/bot/Functions/PrintSucessMessage.au3
@@ -1,7 +1,7 @@
-$calcmin = _DateDiff('s', $starttimetotal, _NowCalc()) ; n for minites, s for seconds
-$calcmin = Round($calcmin / 60, 2)    ; Minutes
-$calchours= Round($calcmin / 3600, 2) ; Hoours
-$calcdays= Round($calcmin / 86400, 2) ; Days
+$calcsec = _DateDiff('s', $starttimetotal, _NowCalc()) ; n for minites, s for seconds
+$calcmin = Round($calcsec / 60, 2)    ; Minutes
+$calchours= Round($calcsec / 3600, 2) ; Hoours
+$calcdays= Round($calcsec / 86400, 2) ; Days
 RefreshGUISendNtfct("All runs (" & $totalrealruns & ") ended in " & $calcmin & " minutes (" & $calchours &" hours).")
 ;Run(@AutoItExe & ' /AutoIt3ExecuteScript "' & @ScriptDir & '\Functions\RefreshGUISendNtfct.au3" "' & $system & '" "All runs (' & $totalrealruns & ') ended in ' & $calcmin & ' minutes (' & $calchours &' hours)."')
 Run(@AutoItExe & ' /AutoIt3ExecuteLine "MsgBox(0, ''Sucess!'', ''All runs (' & $totalrealruns & ') ended in ' & $calcmin & ' minutes (' & $calchours &' hours, ' & $calcdays & ' days).' & @CRLF & 'Please check the Excel sheet and the results for errors.'')"')

diff --git a/bot/Functions/ReadAndSaveExcelParameters.au3 b/bot/Functions/ReadAndSaveExcelParameters.au3
index 3ee8ee6875ed4ba822344a4624e1a46a1b2f90b8..c68eff464b82454fcc5afd4cb2d8d5344ec19463 100755 (executable)
--- a/bot/Functions/ReadAndSaveExcelParameters.au3
+++ b/bot/Functions/ReadAndSaveExcelParameters.au3
@@ -1,8 +1,6 @@
-
-$temperaturebefore = $currentline[$cellTemp][0]
 $waitfortemp = $currentline[$cellTempWait][0]
 If $waitfortemp == "" Then
-       $waitfortemp = "0"
+       $waitfortemp = 0
        $currentline[$cellTempWait][0] = "0"
 EndIf
 $clock = $currentline[$cellClock][0] ; save needed clock
@@ -16,4 +14,4 @@ $eventnum = $currentline[$cellEventsN][0] ; save number of events to save
 If $eventnum == "" Then
        $eventnum = 100000
        $currentline[$cellEventsN][0] = "100000"
-EndIf
\ No newline at end of file
+EndIf

diff --git a/bot/Functions/SaveToExcel.au3 b/bot/Functions/SaveToExcel.au3
index be7492dca282961c83992cbc5dba0c0adaafd245..e52079822e7f1e64b0acfad1c240d6f91fc53775 100755 (executable)
--- a/bot/Functions/SaveToExcel.au3
+++ b/bot/Functions/SaveToExcel.au3
@@ -1,4 +1,5 @@
 $currentline[$cellDate][0] = @MDAY & "." & @MON & "." & @YEAR
+If $currenttempchip == 100000 Then $currenttempchip = "?"
 $currentline[$cellTChip][0] = $currenttempchip
 $currentline[$cellVRef][0] = $vref
 $calcsec = _DateDiff('s', $starttime, _NowCalc()) ; n for minites, s for seconds

diff --git a/bot/Functions/WaitForTemperature.au3 b/bot/Functions/WaitForTemperature.au3
index 8c40b9b6ac09425524b937c7ff5a56687f36cac0..be82489939b552de9ec0413ecf6a6a0e5f3d2695 100755 (executable)
--- a/bot/Functions/WaitForTemperature.au3
+++ b/bot/Functions/WaitForTemperature.au3
@@ -3,7 +3,7 @@ If $currentline[$cellTemp][0] == $temperaturebefore Then
 Else
        $tempcorrent = False
 EndIf
-$tempwaiti = 0
+$tempwaiti = 0 ; set the 5 minutes wait counter to zero if it reaches 6 -> 30 minutes passed
 While Not $tempcorrent
        $currenttemp = GetTemperatureForSure($system)
        If $currenttemp == 100000 Then
@@ -14,7 +14,7 @@ While Not $tempcorrent
        If ($currentline[$cellTemp][0] < $currenttemp + 0.5 And $currentline[$cellTemp][0] > $currenttemp - 0.5) Then
                $tempcorrent = True
        Else
-               If $tempwaiti > 5 Then
+               If $tempwaiti > 5 Then ; after 30 minutes give up waiting
                        $currenttempchip = GetTemperatureForSure("Chip" & $system)
                        RefreshGUISendNtfct("Cooling could not reach needed temperature of " & $currentline[$cellTemp][0] & " °C within 30 minutes. Current cooling temperature is " & $currenttemp & ", chip temperature is " & $currenttempchip & ". Will proceed anyway.")
                        $tempcorrent = True
@@ -24,7 +24,7 @@ While Not $tempcorrent
                Run(@AutoItExe & ' /AutoIt3ExecuteScript "' & @ScriptDir & '\Functions\RefreshGUI.au3" "' & $completelog & '"')
                $tempseti = 0
                Do
-                       If $tempseti > 10 Then
+                       If $tempseti > 10 Then ; after 10 failed attempts
                                $currenttempchip = GetTemperatureForSure("Chip" & $system)
                                RefreshGUISendNtfct("Could not set temperature to " & $currentline[$cellTemp][0] & ". Current cooling temperature is " & $currenttemp & " °C, chip temperature is " & $currenttempchip & ". Will proceed anyway.")
                                $tempcorrent = True
@@ -32,10 +32,11 @@ While Not $tempcorrent
                        EndIf
                        $settemp = RunWait(@AutoItExe & ' /AutoIt3ExecuteScript "' & @ScriptDir & '\Functions\TemperatureControl.au3" "' & $system & '" "' & $currentline[$cellTemp][0] & '"', @ScriptDir)
                        $tempseti = $tempseti + 1
-               Until $settemp == 0
+               Until $settemp == 0 ; until temperature could be set succesfully
                $tempwaiti= $tempwaiti + 1
-               Sleep(1000 * 60 * 5)
+               Sleep(1000 * 60 * 5) ; wait 5 minutes between checks and sets of temperature
        EndIf
 WEnd
 Sleep($waitfortemp * 60 * 1000) ; wait for user specified minutes
 $currenttempchip = GetTemperatureForSure("Chip" & $system) ; get chip temperature before measurement start
+$temperaturebefore = $currentline[$cellTemp][0] ; if next run has the same needed temperature as this run, dont check for cooling water temperature, see the first lines of this file for details

diff --git a/bot/Mimosa_Autorun_PXI.au3 b/bot/Mimosa_Autorun_PXI.au3
index 7ae968046af83df900e27df605f532140eddbdcf..0135a9b0c1b16f0f13b1056f1267a614cb1b96be 100755 (executable)
--- a/bot/Mimosa_Autorun_PXI.au3
+++ b/bot/Mimosa_Autorun_PXI.au3
@@ -51,13 +51,13 @@ If (Not @error) And IsObj($oExcelDoc) Then ; Check again if everything went well
                $totalrealruns = 0
                $starttimetotal = _NowCalc()
                For $run = 0 To $totallexcelines - 1
-                       $currentrange = "A" & $excelLineBegin + $run & ":P" & $excelLineBegin + $run
+                       $currentrange = "A" & $excelLineBegin + $run & ":Q" & $excelLineBegin + $run
                        $oExcelDoc = ObjGet($FileName) ; if doc was closed and object destroyed -> reopen it. A possibility to check if object exists would come handy here....
                        $oDocument = $oExcelDoc.Worksheets(1) ; We use the 'Default' worksheet
                        $currentline = $oDocument.range($currentrange).value
                        If ($currentline[$cellChipN][0] == $chipinstalled And "Mi" & $currentline[$cellChipV][0] == $chipversion And $currentline[$cellRadSrc][0] == $radSource And $currentline[$cellRad][0] == $radiated And $currentline[$cellDate][0] == "" And $currentline[$cellSystem][0] == "PXI" And ($currentline[$cellClock][0] == "100" Or $currentline[$cellClock][0] == "")) Then
-                               #include "Functions\WaitForTemperature.au3"
                                #include "Functions\ReadAndSaveExcelParameters.au3"
+                               #include "Functions\WaitForTemperature.au3"
                                SetMiParameter($matrix, $vref)
                                ProgramMi()
                                Sleep(200)

diff --git a/bot/Mimosa_Autorun_USB.au3 b/bot/Mimosa_Autorun_USB.au3
index a0badf40afb94afc704bb47054e9adcee0f5fd83..6eafaba9c3be142fc9662982d8581df6482d1619 100755 (executable)
--- a/bot/Mimosa_Autorun_USB.au3
+++ b/bot/Mimosa_Autorun_USB.au3
@@ -73,13 +73,13 @@ If (Not @error) And IsObj($oExcelDoc) Then ; Check again if everything went well
                $totalrealruns = 0
                $starttimetotal = _NowCalc()
                For $run = 0 To $totallexcelines - 1
-                       $currentrange = "A" & $excelLineBegin + $run & ":P" & $excelLineBegin + $run
+                       $currentrange = "A" & $excelLineBegin + $run & ":Q" & $excelLineBegin + $run
                        $oExcelDoc = ObjGet($FileName) ; if doc was closed and object destroyed -> reopen it. A possibility to check if object exists would come handy here....
                        $oDocument = $oExcelDoc.Worksheets(1) ; We use the 'Default' worksheet
                        $currentline = $oDocument.range($currentrange).value
                        If ($currentline[$cellChipN][0] == $chipinstalled And "Mi" & $currentline[$cellChipV][0] == $chipversion And $currentline[$cellRadSrc][0] == $radSource And $currentline[$cellRad][0] == $radiated And $currentline[$cellDate][0] == "" And $currentline[$cellSystem][0] == "USB") Then
-                               #include "Functions\WaitForTemperature.au3"
                                #include "Functions\ReadAndSaveExcelParameters.au3"
+                               #include "Functions\WaitForTemperature.au3"
                                CheckWindowExist()
                                SelectBoard()
                                CheckIfBoardOK()

diff --git a/bot/config_USB.ini b/bot/config_USB.ini
index 1cb190c2967caaf87cacb74bd137b041ff543fb3..214239faee568e0e5b53179132eec53f51dceacf 100755 (executable)
--- a/bot/config_USB.ini
+++ b/bot/config_USB.ini
@@ -1,6 +1,6 @@
 [experimental setup]
-ChipVersion = Mi34
-ChipInstalled = 4
+ChipVersion = Mi32Ter
+ChipInstalled = 5d
 ExcelPath = H:\dennis doering\Arbeitsprogramme\Mimosa34\LaborbuchMi34 - Neu.xls
 RadSource = none
 Radiated = 0