Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions camerad/archon_controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -597,10 +597,12 @@ namespace Camera {
*/
std::string ArchonController::make_applymod_command(int mod) const {
std::ostringstream oss;
// Archon rejects lowercase hex, so MOD11 must be 0A, not 0a
oss << "APPLYMOD"
<< std::setfill('0')
<< std::setw(2)
<< std::hex
<< std::uppercase
<< (mod-1);
return oss.str();
}
Expand Down Expand Up @@ -3190,6 +3192,7 @@ namespace Camera {
<< std::setfill('0')
<< std::setw(2)
<< std::hex
<< std::uppercase
<< (module-1);
error = this->send_cmd(applystr.str());
}
Expand Down
6 changes: 3 additions & 3 deletions utils/network.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@

namespace Network {

// 3000 was not enough for an Archon APPLYALL, which measures 4.5s on a
// controller whose bias boards make its power-down ramp slow
constexpr const int POLLTIMEOUT = 5000; /// default Poll timeout in msec
// An Archon APPLYALL measures 6s on a controller whose bias boards make its
// power-down ramp slow; a reply later than this desyncs every command after it
constexpr const int POLLTIMEOUT = 15000; /// default Poll timeout in msec
constexpr const int LISTENQ = 64; /// listen(3n) backlog
constexpr const int UDPMSGLEN = 256; /// UDP message length
constexpr const int CONNECT_TIMEOUT_SEC = 3; /// Connect() timeout in seconds
Expand Down
Loading