From 86d0e854e3c3827cfc9c3ee60fdbc29d80cecf80 Mon Sep 17 00:00:00 2001 From: jomjol <30766535+jomjol@users.noreply.github.com> Date: Sat, 8 Aug 2020 18:34:49 +0200 Subject: [PATCH] update nightly --- code/lib/jomjol_image_proc/CFindTemplate.cpp | 2 +- firmware/firmware.bin | Bin 1629760 -> 1629760 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/lib/jomjol_image_proc/CFindTemplate.cpp b/code/lib/jomjol_image_proc/CFindTemplate.cpp index 5d410ebb..0ed42d0a 100644 --- a/code/lib/jomjol_image_proc/CFindTemplate.cpp +++ b/code/lib/jomjol_image_proc/CFindTemplate.cpp @@ -454,7 +454,7 @@ void CAlignAndCutImage::Align(std::string _template0, int ref0_x, int ref0_y, st delete imgzw; } - string zw = "dx: " + to_string(dx) + "dy: " + to_string(dy) + "d_winkel: " + to_string(d_winkel); + string zw = "\tdx:\t" + to_string(dx) + "\tdy:\t" + to_string(dy) + "\td_winkel:\t" + to_string(d_winkel); LogFile.WriteToDedicatedFile("/sdcard/alignment.txt", zw); CRotate rt(this->rgb_image, this->channels, this->width, this->height, this->bpp); diff --git a/firmware/firmware.bin b/firmware/firmware.bin index 8b170b454719643f2ce2900d3ab1876579e64635..758496fb1a77672296a3eb94d1429dd37f382151 100644 GIT binary patch delta 7138 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 c{$|f<-eVt@CBxrp8j7rcK3LrNKLX2|9RL6T delta 7140 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 Uvgz6GOz^p$qq`sM_vRh^AC-@o4gdfE