add preliminary sense_minmax support (bdeafb42) · Commits · derf / dlog-viewer

bin/dlog-viewer

+10 −6

Original line number	Original line	Diff line number	Diff line
	@@ -201,13 +201,13 @@ class DLog:
	self.channels = list(map(DLogChannel, channels))		self.channels = list(map(DLogChannel, channels))
	self.interval = float(dlog.find("frame").find("tint").text)		self.interval = float(dlog.find("frame").find("tint").text)
	self.sense_minmax = int(dlog.find("frame").find("sense_minmax").text)		self.sense_minmax = int(dlog.find("frame").find("sense_minmax").text)
	self.planned_duration = int(dlog.find("frame").find("time").text)
	self.observed_duration = self.interval * int(len(raw_data) / (4 * num_channels))

	if self.sense_minmax:		if self.sense_minmax:
	raise RuntimeError(		# there's a min, current, and max reading for each channel.
	"DLog files with 'Log Min/Max' enabled are not supported yet"		num_channels *= 3
	)
			self.planned_duration = int(dlog.find("frame").find("time").text)
			self.observed_duration = self.interval * int(len(raw_data) / (4 * num_channels))

	self.timestamps = np.linspace(		self.timestamps = np.linspace(
	0, self.observed_duration, num=int(len(raw_data) / (4 * num_channels))		0, self.observed_duration, num=int(len(raw_data) / (4 * num_channels))
	@@ -264,7 +264,11 @@ class DLog:
	self.slots = [dict(), dict(), dict(), dict()]		self.slots = [dict(), dict(), dict(), dict()]

	for i, channel in enumerate(self.channels):		for i, channel in enumerate(self.channels):
	channel.data = self.data[i]		if self.sense_minmax:
			# [i3] == current/avg(?), [i3 + 1] == min, [i*3 + 2] == max
			channel.data = self.data[i * 3]
			else:
			channel.data = self.data[i]
	self.slots[channel.slot - 1][channel.unit] = channel		self.slots[channel.slot - 1][channel.unit] = channel

	def slot_has_data(self, slot):		def slot_has_data(self, slot):

Admin message