Open Build Service

domecam.changes Changed

_service Changed

domecam-0.1.11.obscpio/.hgtags -> domecam-0.1.12.obscpio/.hgtags Changed

domecam-0.1.11.obscpio/CMakeLists.txt -> domecam-0.1.12.obscpio/CMakeLists.txt Changed

domecam-0.1.11.obscpio/exe/carriage.cpp -> domecam-0.1.12.obscpio/exe/carriage.cpp Changed

@@ -160,8 +160,16 @@
 }
 
 int application::do_run(const boost::program_options::variables_map& va, abstract_carriage& c) {
+	const auto axis = (va.count(axis_opt) ? std::optional{va[axis_opt].as<std::uint16_t>()} : std::nullopt);
+
 	if (va.count(home_opt)) {
-		carriage_home_executor executor_(std::nullopt);
+		carriage_home_executor executor_(axis);
+		executor_.run(c);
+	} else if (va.count(run_opt)) {
+		carriage_run_executor executor_(axis, va[run_opt].as<std::int16_t>());
+		executor_.run(c);
+	} else if (va.count(track_opt)) {
+		carriage_track_executor executor_(axis, carriage::direction::cw);
 		executor_.run(c);
 	} else if (va.count(mask_opt)) {
 		carriage_mask_executor executor_(va[mask_opt].as<std::uint16_t>());
@@ -172,12 +180,6 @@
 	} else if (va.count(axis_opt)) {
 		carriage_axis_executor executor_(va[axis_opt].as<std::uint16_t>());
 		executor_.run(c);
-	} else if (va.count(run_opt)) {
-		carriage_run_executor executor_(std::nullopt, va[run_opt].as<std::int16_t>());
-		executor_.run(c);
-	} else if (va.count(track_opt)) {
-		carriage_track_executor executor_(std::nullopt, carriage::direction::cw);
-		executor_.run(c);
 	} else if (va.count(speed_opt)) {
 		carriage_speed_executor executor_(va[speed_opt].as<std::uint16_t>());
 		executor_.run(c);

domecam-0.1.11.obscpio/include/buffer_view.h -> domecam-0.1.12.obscpio/include/buffer_view.h Changed

domecam-0.1.11.obscpio/include/executor/edge.h -> domecam-0.1.12.obscpio/include/executor/edge.h Changed

domecam-0.1.11.obscpio/include/executor/pupil.h -> domecam-0.1.12.obscpio/include/executor/pupil.h Changed

domecam-0.1.11.obscpio/include/executor/raw.h -> domecam-0.1.12.obscpio/include/executor/raw.h Changed

domecam-0.1.11.obscpio/include/executorfwd.h -> domecam-0.1.12.obscpio/include/executorfwd.h Changed

domecam-0.1.11.obscpio/include/source.h -> domecam-0.1.12.obscpio/include/source.h Changed

@@ -92,15 +92,15 @@
 private:
 	constexpr static std::uint16_t max_range_ = 31000;
 
-	scan_source_base(camera& c, std::chrono::microseconds timeout, std::size_t capture_buffers, std::uint16_t mask, std::uint16_t load_speed);
-	scan_source_base(camera& c, std::chrono::microseconds timeout, std::size_t capture_buffers, std::uint16_t mask);
+	scan_source_base(camera& c, std::chrono::microseconds timeout, std::size_t capture_buffers, std::uint16_t mask, std::uint16_t load_speed, std::uint16_t axis);
+	scan_source_base(camera& c, std::chrono::microseconds timeout, std::size_t capture_buffers, std::uint16_t mask, std::uint16_t axis);
 protected:
 	carriage carriage_;
 	const std::uint16_t mask_;
 	const std::uint16_t load_speed_;
 	const float spe_;
 public:
-	scan_source_base(camera& c, std::size_t size, std::chrono::microseconds timeout, std::size_t capture_buffers);
+	scan_source_base(camera& c, std::size_t size, std::chrono::microseconds timeout, std::size_t capture_buffers, std::uint16_t axis);
 	virtual ~scan_source_base() override = default;
 
 	std::uint16_t mask() const { return mask_; }
@@ -148,8 +148,8 @@
 	using result_type = detail::scan_frame<T>;
 	constexpr static const std::size_t align = result_type::align;
 
-	scan_source(camera& c, std::size_t size, std::chrono::microseconds timeout, std::size_t capture_buffers):
-		scan_source_base(c, size, timeout, capture_buffers) {
+	scan_source(camera& c, std::size_t size, std::chrono::microseconds timeout, std::size_t capture_buffers, std::uint16_t axis):
+		scan_source_base(c, size, timeout, capture_buffers, axis) {
 	}
 
 	template<class F>

domecam-0.1.11.obscpio/src/executor/edge.cpp -> domecam-0.1.12.obscpio/src/executor/edge.cpp Changed

domecam-0.1.11.obscpio/src/executor/pupil.cpp -> domecam-0.1.12.obscpio/src/executor/pupil.cpp Changed

domecam-0.1.11.obscpio/src/executor/raw.cpp -> domecam-0.1.12.obscpio/src/executor/raw.cpp Changed

domecam-0.1.11.obscpio/src/executorfwd.cpp -> domecam-0.1.12.obscpio/src/executorfwd.cpp Changed

domecam-0.1.11.obscpio/src/io.cpp -> domecam-0.1.12.obscpio/src/io.cpp Changed

@@ -26,6 +26,8 @@
 	const auto& obj  = jv.as_object();
 	const auto& type = obj.at("type").as_string();
 
+	const auto axis = load<std::uint16_t>(obj.if_contains("axis")).value_or(0);
+
 	if (type == "raw") {
 		return std::unique_ptr<executor>{new raw_executor{
 			value_to<std::string>(obj.at("filename")),
@@ -33,7 +35,7 @@
 	} else if (type == "raw_scan") {
 		return std::unique_ptr<executor>{new raw_scan_executor{
 			value_to<std::string>(obj.at("filename")),
-			value_to<std::size_t>(obj.at("frames_number"))}};
+			value_to<std::size_t>(obj.at("frames_number")), axis}};
 	} else if (type == "grad") {
 		return std::unique_ptr<executor>{new grad_executor{
 			value_to<std::string>(obj.at("filename")),
@@ -50,14 +52,14 @@
 		if (type == "pupil") {
 			return std::unique_ptr<executor>{new pupil_executor{frames_number, samples_number, force_initial}};
 		} else if (type == "pupil_scan") {
-			return std::unique_ptr<executor>{new pupil_scan_executor{frames_number, samples_number, force_initial}};
+			return std::unique_ptr<executor>{new pupil_scan_executor{frames_number, samples_number, force_initial, axis}};
 		} else if (type == "edge" || type == "edge_scan") {
 			const auto loss_factor = value_to<float>(obj.at("loss_factor"));
 
 			if (type == "edge") {
 				return std::unique_ptr<executor>{new edge_executor{frames_number, samples_number, force_initial, loss_factor}};
 			} else if (type == "edge_scan") {
-				return std::unique_ptr<executor>{new edge_scan_executor{frames_number, samples_number, force_initial, loss_factor}};
+				return std::unique_ptr<executor>{new edge_scan_executor{frames_number, samples_number, force_initial, loss_factor, axis}};
 			}
 		} else if (type == "pupil_mask") {
 			return std::unique_ptr<executor>{new pupil_mask_executor{

domecam-0.1.11.obscpio/src/source.cpp -> domecam-0.1.12.obscpio/src/source.cpp Changed

@@ -45,7 +45,7 @@
 };
 
 
-scan_source_base::scan_source_base(camera& c, std::chrono::microseconds timeout, std::size_t capture_buffers, std::uint16_t mask, std::uint16_t load_speed):
+scan_source_base::scan_source_base(camera& c, std::chrono::microseconds timeout, std::size_t capture_buffers, std::uint16_t mask, std::uint16_t load_speed, std::uint16_t axis):
 	camera_source_base(c, max_range_ / mask / 2, std::max(timeout, std::chrono::duration_cast<decltype(timeout)>(std::chrono::seconds(load_speed) * mask) / (144 * 1600)), capture_buffers),
 	carriage_(c),
 	mask_(mask),
@@ -56,21 +56,22 @@
 	camera_.trigger_overlap(true);
 	carriage_.sync_mask(mask_);
 	carriage_.speed(load_speed_);
+	carriage_.axis(axis);
 }
 
-scan_source_base::scan_source_base(camera& c, std::chrono::microseconds timeout, std::size_t capture_buffers, std::uint16_t mask):
+scan_source_base::scan_source_base(camera& c, std::chrono::microseconds timeout, std::size_t capture_buffers, std::uint16_t mask, std::uint16_t axis):
 	scan_source_base(c, timeout, capture_buffers, mask,
 	std::min(std::max({
 		std::chrono::seconds(72), /* the fastest speed limit, lower value => faster motion */
 		std::chrono::duration_cast<std::chrono::seconds>(c.exposure_time() * (144 * 1600) / std::min(3, 2*mask)),
 		std::chrono::duration_cast<std::chrono::seconds>(std::chrono::duration<double>(1.0/std::get<1>(c.frame_rate_bounds()) * (144 * 1600) / (2*mask)))
-	}), std::chrono::seconds(std::numeric_limits<std::uint16_t>::max())).count()) {
+	}), std::chrono::seconds(std::numeric_limits<std::uint16_t>::max())).count(), axis) {
 }
 
-scan_source_base::scan_source_base(camera& c, std::size_t size, std::chrono::microseconds timeout, std::size_t capture_buffers):
+scan_source_base::scan_source_base(camera& c, std::size_t size, std::chrono::microseconds timeout, std::size_t capture_buffers, std::uint16_t axis):
 	scan_source_base(c, timeout, capture_buffers,
 	// maximal mask supported in firmware is 0x80
-	max_mask<unsigned int>() >> __builtin_clz(clamp(max_range_ / size / 2, static_cast<std::size_t>(1), static_cast<std::size_t>(std::numeric_limits<std::uint8_t>::max())))) {
+	max_mask<unsigned int>() >> __builtin_clz(clamp(max_range_ / size / 2, static_cast<std::size_t>(1), static_cast<std::size_t>(std::numeric_limits<std::uint8_t>::max()))), axis) {
 
 	assert(size > 0);
 }

domecam.obsinfo Changed

Changes of Revision 27