Changeset 2613 for trunk/MagicSoft
- Timestamp:
- 12/07/03 13:09:00 (21 years ago)
- Location:
- trunk/MagicSoft/Cosy
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Cosy/Changelog
r2568 r2613 1 1 -*-*- END -*-*- 2 2003/12/07 - Thomas Bretz 3 4 * tcpip/MDriveCom.cc: 5 - log CC-COMMANDS to log-file 6 7 * main/MStarguider.cc: 8 - fixed handling of DISPLAY variable 9 10 * main/MCosy.cc: 11 - undef EXPERT 12 - removed comments before CheckNetwork 13 14 * gui/MGImage.cc: 15 - fixed some image copy algorithm 16 - removed nonsense ==13 check for TryLock 17 18 * devdrv/macs.cc: 19 - shift crew reported problems: changed timeout from 250ms to 400ms 20 21 * stars.txt: 22 - added Capella 23 24 * Makefile: 25 - added 'install' 26 27 28 2 29 2003/11/25 - Thomas Bretz (La Palma) 3 30 4 * slog:31 * slog: 5 32 - added this small script to analyze log-files 6 33 -
trunk/MagicSoft/Cosy/devdrv/macs.cc
r2518 r2613 383 383 //SetNoWait(TRUE); 384 384 385 StartGuarding( 250, 1, kFALSE); // Using PDO1 @ 100ms385 StartGuarding(400, 1, kFALSE); // Using PDO1 @ 100ms 386 386 //StartGuarding(250, 4); 387 387 //StartHostGuarding(); -
trunk/MagicSoft/Cosy/gui/MGImage.cc
r2518 r2613 87 87 while (s<e) 88 88 { 89 // 11111100 11111000 11111 10090 *d++ = (*s&0xfc) | (*s&0xf8)<<5 | (*s&0xf c)<<11;89 // 11111100 11111000 11111000 90 *d++ = (*s&0xfc) | (*s&0xf8)<<5 | (*s&0xf8)<<11; 91 91 s++; 92 92 } … … 109 109 void MGImage::DrawImg(const byte *buffer) 110 110 { 111 if (fMuxPixmap->TryLock() ==13)111 if (fMuxPixmap->TryLock()) 112 112 return; 113 113 … … 181 181 void MGImage::DrawColImg(const byte *gbuf, const byte *cbuf) 182 182 { 183 if (fMuxPixmap->TryLock() ==13)183 if (fMuxPixmap->TryLock()) 184 184 return; 185 185 -
trunk/MagicSoft/Cosy/main/MCosy.cc
r2518 r2613 52 52 */ 53 53 54 #define EXPERT55 //#undef EXPERT54 //#define EXPERT 55 #undef EXPERT 56 56 57 57 double MCosy::Rad2SE(double rad) const … … 1336 1336 1337 1337 ZdAz dest = *((ZdAz*)mp) * kDeg2Rad; 1338 //if (!SetPosition(dest))1339 //return (void*)0x1234;1338 if (!SetPosition(dest)) 1339 return (void*)0x1234; 1340 1340 1341 1341 SlaStars sla(fObservatory); … … 1353 1353 cout << "WM_Position: start." << endl; 1354 1354 { 1355 //if (!CheckNetwork())1356 //return (void*)0xebb0;1355 if (!CheckNetwork()) 1356 return (void*)0xebb0; 1357 1357 1358 1358 ZdAz dest = *((ZdAz*)mp); … … 1921 1921 const ZdAz seist = GetSePos()*2*TMath::Pi()/16384; // [se] 1922 1922 1923 cout << seist.Zd()*kRad2Deg << " " << seist.Az()*kRad2Deg << endl;1923 //cout << seist.Zd()*kRad2Deg << " " << seist.Az()*kRad2Deg << endl; 1924 1924 1925 1925 ZdAz back = fBending.CorrectBack(seist)*180/TMath::Pi(); 1926 1926 1927 cout << back.Zd() << " " << back.Az() << endl;1927 //cout << back.Zd() << " " << back.Az() << endl; 1928 1928 1929 1929 return back; -
trunk/MagicSoft/Cosy/main/MStarguider.cc
r2518 r2613 180 180 181 181 TString disp=gVirtualX->DisplayName(); 182 if (disp.First(':')>0) 182 cout << "Display: " << disp << endl; 183 if (disp.First(':')>=0) 183 184 disp=disp(0, disp.First(':')); 184 185 185 186 if (disp.IsNull() || disp==(TString)"localhost") 186 187 { 187 fInterpol->CheckEntry(IDM_kInterpol 1);188 fIntRate = 1;188 fInterpol->CheckEntry(IDM_kInterpol5); 189 fIntRate = 5; 189 190 } 190 191 else -
trunk/MagicSoft/Cosy/tcpip/MDriveCom.cc
r2517 r2613 53 53 } 54 54 55 cout << "CC-COMMAND: Track " << ra << "h " << dec << "deg '" << str << "'" << endl; 55 lout << "CC-COMMAND: Track " << ra << "h " << dec << "deg '" << str 56 << "'" << endl; 56 57 57 58 ra *= 15; // h -> deg … … 80 81 } 81 82 82 cout << "CC-COMMAND: Move " << zd << "deg " << az << "deg" << endl;83 lout << "CC-COMMAND: Move " << zd << "deg " << az << "deg" << endl; 83 84 84 85 ZdAz za(zd, az); … … 103 104 { 104 105 cout << "MDriveCom - STOP!... start." << endl; 106 lout << "CC-COMMAND: STOP!" << endl; 105 107 fQueue->PostMsg(WM_STOP); 106 108 cout << "MDriveCom - STOP!... done." << endl;
Note:
See TracChangeset
for help on using the changeset viewer.