From: Benjamin Linnik Date: Thu, 22 Aug 2013 12:04:48 +0000 (+0200) Subject: Added Dennis to Notification sending function X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=58b00886f45e339e44d5f204aa0455c5688fcefd;p=radhard.git Added Dennis to Notification sending function --- diff --git a/README.txt b/README.txt index afdab9b..9b51ff9 100644 --- a/README.txt +++ b/README.txt @@ -1 +1,5 @@ Radiation Hardness Stuff + + +###### bot ####### +A script to automatically control the softwarte for the Mimosa chips. diff --git a/bot/Functions/SendNtfctn.au3 b/bot/Functions/SendNtfctn.au3 index ac9847e..5831871 100644 --- a/bot/Functions/SendNtfctn.au3 +++ b/bot/Functions/SendNtfctn.au3 @@ -26,8 +26,8 @@ Func SendNtfctn($text) EndIf If $notifyDennis Then - ;$oHTTP.Open("GET", "http://autoremotejoaomgcd.appspot.com/sendmessage?key=APA91bEejQPoLUIipcNpfeDvNoa5Bd48AASVBHRphY4ySu8U2FSfuDym2iHdkC_YJ2zyhhbVXVB0oRacd_QmDFsrNRATF0rT4b7pqIHj8EeUrOdq0s_gQq7BE0ERaUfHHikhet06D8ff8BUXe8uVZ5RqoI2ygWc48Q&message=RadHard:%20" & $text & "&password=TannenbaumSaftSchorle") - ;$oHTTP.Send() + $oHTTP.Open("GET", "http://autoremotejoaomgcd.appspot.com/sendmessage?key=APA91bHCZjLkmISyt3lHjn-ym1Md9SymV5hKq05gxuPKXSMVm6e1rphU55sjiQNfQOIUpzoNqCU8kGXLwDJTRksMBRgk62dW5N_Go69dchFvfYqNIKKrvG26FGBPjKea06PU6IPxLPm0WWSM53k7QIQj0EZtMSNxpg&message=RadHard:%20" & $text & "&password=mimosa") + $oHTTP.Send() EndIf If $notifyStefan Then diff --git a/bot/Mimosa_Autorun.au3 b/bot/Mimosa_Autorun.au3 index 1c58ae8..d14a866 100644 --- a/bot/Mimosa_Autorun.au3 +++ b/bot/Mimosa_Autorun.au3 @@ -120,7 +120,7 @@ If (Not @error) And IsObj($oExcelDoc) Then ; Check again if everything went well Sleep(500) $i = $i + 1 If ($i > 20) Then - Run(@AutoItExe & ' /AutoIt3ExecuteScript "' & @ScriptDir & '\Functions\SendNtfctn.au3' & @ScriptDir & '\Functions\SendNtfctn.au3" "USB Boards could be not OK!"', @ScriptDir) + Run(@AutoItExe & ' /AutoIt3ExecuteScript "' & @ScriptDir & '\Functions\SendNtfctn.au3" "USB Boards could be not OK!"', @ScriptDir) MsgBox(16, "Message", "USB Boards could be not OK! Please check the Debug output.") Exit EndIf @@ -275,7 +275,7 @@ If (Not @error) And IsObj($oExcelDoc) Then ; Check again if everything went well $calcsecestimate = Int($calcsecestimate) $timeend = _Epoch_encrypt(_NowCalc()) + $calcsecestimate $timeend = _Epoch_decrypt($timeend) - $completelog &= _NowCalc() & " Estimated runtime: " & $calcmin & " minutes. Estimated endtime: " & $timeend & @CRLF + $completelog &= _NowCalc() & " Estimated runtime: " & $calcmin & " minutes." & @CRLF & "Estimated endtime: " & $timeend & @CRLF Run(@AutoItExe & ' /AutoIt3ExecuteScript "' & @ScriptDir & '\Functions\SendNtfctn.au3" "Estimated runtime: ' & $calcmin & ' minutes. Will end at ' & $timeend & '"', @ScriptDir) $estimate = 1 EndIf diff --git a/bot/bot backup.rar b/bot/bot backup.rar index 60f624f..e69de29 100755 Binary files a/bot/bot backup.rar and b/bot/bot backup.rar differ diff --git a/bot/config.ini b/bot/config.ini index 2343493..e652d7e 100755 --- a/bot/config.ini +++ b/bot/config.ini @@ -1,10 +1,10 @@ [experimental setup] ChipVersion = Mi34 -ChipInstalled = 1 +ChipInstalled = 14 ExcelPath = H:\dennis doering\Arbeitsprogramme\Mimosa34\LaborbuchMi34.xls -SystemTemperature = -20 +SystemTemperature = 20 RadSource = Fe55 -Radiated = 1Mrad +Radiated = 0 [various] -Notify = 1 +Notify = 7 NotifyCustom = (Optional)