sz3 · sz3 · Jun 1, 2023 · Jul 23, 2022 · Jul 23, 2022 · Jul 23, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,20 +10,20 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - name: "linux gcc7"
-          os: ubuntu-18.04
-          env: CXX="g++-7" CC="gcc-7"
-
         - name: "linux gcc9"
+          os: ubuntu-20.04
+          env: CXX="g++-9" CC="gcc-9"
+
+        - name: "linux gcc-latest"
           os: ubuntu-latest
 
         - name: "linux clang"
-          os: ubuntu-18.04
+          os: ubuntu-20.04
           env: CXX="clang++" CC="clang"
           extra-packages: "clang"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: 'recursive'
 
@@ -50,10 +50,10 @@ jobs:
       run: python3 -m unittest
 
   cppcheck:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Install dependencies
       run: sudo apt-get install cppcheck

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Get the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: 'recursive'
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,7 @@ add_definitions("-DLIBCIMBAR_PROJECT_ROOT=\"${libcimbar_SOURCE_DIR}\"")
 if("${CMAKE_BUILD_TYPE}" STREQUAL "")
 	set(CMAKE_BUILD_TYPE "RelWithDebInfo")
 	set(CMAKE_C_FLAGS "${CFLAGS} -Wall -std=c99 -Os -fPIC")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Wall -g -O2 -fPIC")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Wall -Wextra -g -O2 -fPIC")
 endif()
 
 if(DEFINED USE_WASM)  # wasm build needs OPENCV_DIR defined

diff --git a/bitmap/2/00.png b/bitmap/2/00.png
diff --git a/bitmap/2/01.png b/bitmap/2/01.png
diff --git a/bitmap/2/02.png b/bitmap/2/02.png
diff --git a/bitmap/2/03.png b/bitmap/2/03.png
diff --git a/package-wasm.sh b/package-wasm.sh
@@ -4,11 +4,11 @@
 cd /usr/src/app
 
 apt update
-apt install python -y
+apt install python3 -y
 
 cd opencv4/
 mkdir opencv-build-wasm && cd opencv-build-wasm
-python ../platforms/js/build_js.py build_wasm --build_wasm --emscripten_dir=/emsdk/upstream/emscripten
+python3 ../platforms/js/build_js.py build_wasm --build_wasm --emscripten_dir=/emsdk/upstream/emscripten
 
 cd /usr/src/app
 mkdir build-wasm && cd build-wasm
@@ -22,5 +22,5 @@ emcmake cmake .. -DUSE_WASM=2 -DOPENCV_DIR=/usr/src/app/opencv4
 make -j5 install
 (cd ../web/ && zip cimbar.asmjs.zip cimbar_js.js index.html main.js)
 
-(cd ../ && python package-cimbar-html.py)
+(cd ../ && python3 package-cimbar-html.py)
 
diff --git a/src/exe/build_image_assets/build_image_assets.cpp b/src/exe/build_image_assets/build_image_assets.cpp
@@ -29,6 +29,12 @@ map<string, string> getFileBlobs(string dir_path)
 			blobs[file_path] = base91::encode(contents);
 		}
 
+	for (int i = 0; i < 4; ++i)
+	{
+		string file_path = fmt::format("{}/2/{:02x}.png", dir_path, i);
+		string contents = File(file_path).read_all();
+		blobs[file_path] = base91::encode(contents);
+	}
 	for (int i = 0; i < 16; ++i)
 	{
 		string file_path = fmt::format("{}/4/{:02x}.png", dir_path, i);
@@ -43,8 +49,8 @@ int main(int argc, char** argv)
 	cxxopts::Options options("build_image_assets", "Build a C++ class file (header-only) that contains base91 png asset data.");
 
 	options.add_options()
-	    ("b,bitmap", "Bitmap directory", cxxopts::value<std::string>())
-	    ("h,help", "Print usage")
+		("b,bitmap", "Bitmap directory", cxxopts::value<std::string>())
+		("h,help", "Print usage")
 	;
 
 	auto result = options.parse(argc, argv);

diff --git a/src/exe/cimbar_extract/cimbar_extract.cpp b/src/exe/cimbar_extract/cimbar_extract.cpp
@@ -8,7 +8,7 @@ using std::string;
 
 int main(int argc, char** argv)
 {
-	cxxopts::Options options("cimbar scan", "Scan/extract cimbar code from a source image.");
+	cxxopts::Options options("cimbar_extract", "Scan/extract cimbar code from a source image.");
 
 	options.add_options()
 	    ("i,in", "Encoded png/jpg/etc", cxxopts::value<std::string>())

diff --git a/src/exe/cimbar_send/send.cpp b/src/exe/cimbar_send/send.cpp
@@ -38,12 +38,12 @@ int main(int argc, char** argv)
 	unsigned ecc = cimbar::Config::ecc_bytes();
 	unsigned defaultFps = 15;
 	options.add_options()
-	    ("i,in", "Source file", cxxopts::value<vector<string>>())
-	    ("c,colorbits", "Color bits. [0-3]", cxxopts::value<int>()->default_value(turbo::str::str(colorBits)))
-	    ("e,ecc", "ECC level", cxxopts::value<unsigned>()->default_value(turbo::str::str(ecc)))
-	    ("f,fps", "Target FPS", cxxopts::value<unsigned>()->default_value(turbo::str::str(defaultFps)))
-	    ("z,compression", "Compression level. 0 == no compression.", cxxopts::value<int>()->default_value(turbo::str::str(compressionLevel)))
-	    ("h,help", "Print usage")
+		("i,in", "Source file", cxxopts::value<vector<string>>())
+		("c,colorbits", "Color bits. [0-3]", cxxopts::value<int>()->default_value(turbo::str::str(colorBits)))
+		("e,ecc", "ECC level", cxxopts::value<unsigned>()->default_value(turbo::str::str(ecc)))
+		("f,fps", "Target FPS", cxxopts::value<unsigned>()->default_value(turbo::str::str(defaultFps)))
+		("z,compression", "Compression level. 0 == no compression.", cxxopts::value<int>()->default_value(turbo::str::str(compressionLevel)))
+		("h,help", "Print usage")
 	;
 	options.show_positional_help();
 	options.parse_positional({"in"});
@@ -66,7 +66,7 @@ int main(int argc, char** argv)
 		fps = defaultFps;
 	unsigned delay = 1000 / fps;
 
-	int window_size = 1080;
+	int window_size = cimbar::Config::image_size() + 32;
 	if (!initialize_GL(window_size, window_size))
 	{
 		std::cerr << "failed to create window :(" << std::endl;

diff --git a/src/lib/bit_file/bitmatrix.h b/src/lib/bit_file/bitmatrix.h
@@ -17,33 +17,41 @@ class bitmatrix
 		unsigned size = img.cols * img.rows;
 		while (size >= 8)
 		{
-			const uint64_t* hax = reinterpret_cast<const uint64_t*>(p);
-			uint64_t mval = (*hax) & 0x101010101010101ULL;
+			// we're turning 1 uint64_t into 8 uint8_ts
+			uint64_t mval;
+			memcpy(&mval, p, sizeof mval);
+			mval = mval & 0x101010101010101ULL;
 			const uint8_t* cv = reinterpret_cast<const uint8_t*>(&mval);
-			uint8_t val = cv[0] << 7 | cv[1] << 6 | cv[2] << 5 | cv[3] << 4 | cv[4] << 3 | cv[5] << 2 | cv[6] << 1 | cv[7];
+			// TODO: what about endianness???
+			uint8_t val = (
+				cv[0] << 7 | cv[1] << 6 | cv[2] << 5 | cv[3] << 4 | cv[4] << 3 | cv[5] << 2 |
+				cv[6] << 1 | cv[7]
+			);
 			writer << val;
 			p += 8;
 			size -= 8;
 		}
 
 		// remainder
-		uint8_t val = 0;
-		while (size > 0)
+		if (size > 0)
 		{
-			val |= (*p > 0) << size;
-			++p;
-			--size;
+			uint8_t val = 0;
+			while (size > 0) {
+				val |= (*p > 0) << size;
+				++p;
+				--size;
+			}
+			writer << val;
 		}
-		writer << val;
 	}
 
 public:
 	bitmatrix(const bitbuffer& buff, unsigned width, unsigned height, unsigned xstart=0, unsigned ystart=0)
-	    : _buff(buff)
-	    , _xstart(xstart)
-	    , _ystart(ystart)
-	    , _width(width)
-	    , _height(height)
+		: _buff(buff)
+		, _xstart(xstart)
+		, _ystart(ystart)
+		, _width(width)
+		, _height(height)
 	{
 	}
 

diff --git a/src/lib/cimb_translator/AdjacentCellFinder.cpp b/src/lib/cimb_translator/AdjacentCellFinder.cpp
@@ -2,9 +2,9 @@
 #include "AdjacentCellFinder.h"
 
 AdjacentCellFinder::AdjacentCellFinder(const CellPositions::positions_list& positions, int dimensions, int marker_size)
-    : _positions(positions)
-    , _dimensions(dimensions)
-    , _markerSize(marker_size)
+	: _positions(positions)
+	, _dimensions(dimensions)
+	, _markerSize(marker_size)
 {
 	int midDimensions = dimensions - marker_size - marker_size;
 	int midCells = dimensions * midDimensions;
@@ -13,10 +13,10 @@ AdjacentCellFinder::AdjacentCellFinder(const CellPositions::positions_list& posi
 	_firstBottom = edgeCells + midCells;
 }
 
-std::array<int, 4> AdjacentCellFinder::find(int index)
+std::array<int, 4> AdjacentCellFinder::find(int index) const
 {
 	std::array<int,4> adj = {
-	    right(index), left(index), bottom(index), top(index)
+		right(index), left(index), bottom(index), top(index)
 	};
 	return adj;
 }

diff --git a/src/lib/cimb_translator/AdjacentCellFinder.h b/src/lib/cimb_translator/AdjacentCellFinder.h
@@ -9,19 +9,19 @@ class AdjacentCellFinder
 public:
 	AdjacentCellFinder(const CellPositions::positions_list& positions, int dimensions, int marker_size);
 
-	std::array<int, 4> find(int index);
+	std::array<int, 4> find(int index) const;
 
 	int dimensions() const;
 	int marker_size() const;
 
-protected:
-	int in_row_with_margin(int index) const;
-
 	int right(int index) const;
 	int left(int index) const;
 	int bottom(int index) const;
 	int top(int index) const;
 
+protected:
+	int in_row_with_margin(int index) const;
+
 protected:
 	const CellPositions::positions_list& _positions;
 	int _dimensions;

diff --git a/src/lib/cimb_translator/Cell.h b/src/lib/cimb_translator/Cell.h
@@ -12,22 +12,22 @@ class Cell
 
 public:
 	Cell(const cv::Mat& img)
-	    : _img(img)
-	    , _cols(img.cols)
-	    , _rows(img.rows)
+		: _img(img)
+		, _cols(img.cols)
+		, _rows(img.rows)
 	{
 	}
 
 	Cell(const cv::Mat& img, int xstart, int ystart, int cols, int rows)
-	    : _img(img)
-	    , _xstart(xstart)
-	    , _ystart(ystart)
-	    , _cols(cols)
-	    , _rows(rows)
+		: _img(img)
+		, _xstart(xstart)
+		, _ystart(ystart)
+		, _cols(cols)
+		, _rows(rows)
 	{}
 
 	// it would be nice to use a cropped cv::Mat to get the contiguous memory pointer...
-	std::tuple<uchar,uchar,uchar> mean_rgb_continuous(bool skip)
+	std::tuple<uchar,uchar,uchar> mean_rgb_continuous(bool skip) const
 	{
 		uint16_t blue = 0;
 		uint16_t green = 0;
@@ -61,7 +61,7 @@ class Cell
 		return std::tuple<uchar,uchar,uchar>(red/count, green/count, blue/count);
 	}
 
-	std::tuple<uchar,uchar,uchar> mean_rgb(bool skip=false)
+	std::tuple<uchar,uchar,uchar> mean_rgb(bool skip=false) const
 	{
 		int channels = _img.channels();
 		if (channels < 3)
@@ -93,7 +93,7 @@ class Cell
 		return std::tuple<uchar,uchar,uchar>(red/count, green/count, blue/count);
 	}
 
-	uchar mean_grayscale_continuous()
+	uchar mean_grayscale_continuous() const
 	{
 		uint16_t total = 0;
 		uint16_t count = 0;
@@ -114,7 +114,7 @@ class Cell
 		return (uchar)(total/count);
 	}
 
-	uchar mean_grayscale()
+	uchar mean_grayscale() const
 	{
 		if (_img.channels() > 1)
 			return 0;

diff --git a/src/lib/cimb_translator/CellDrift.cpp b/src/lib/cimb_translator/CellDrift.cpp
@@ -6,8 +6,8 @@ namespace {
 }
 
 CellDrift::CellDrift(int x, int y)
-    : _x(x)
-    , _y(y)
+	: _x(x)
+	, _y(y)
 {}
 
 int CellDrift::x() const
@@ -29,3 +29,15 @@ void CellDrift::updateDrift(int dx, int dy)
 	_y = std::min(_y, _limit);
 	_y = std::max(_y, 0-_limit);
 }
+
+// static
+uint8_t CellDrift::calculate_cooldown(uint8_t previous, uint8_t idx)
+{
+	if (idx == 4)
+		return 4;
+	if (idx % 2 == 0)
+		return 0xFF;
+	if ((previous xor idx) == 6) // 1 and 7, 3 and 5
+		return 0xFF;
+	return idx;
+}
diff --git a/src/lib/cimb_translator/CellDrift.h b/src/lib/cimb_translator/CellDrift.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include <array>
+#include <cstdint>
 #include <utility>
 
 class CellDrift
@@ -10,9 +11,11 @@ class CellDrift
 	CellDrift(int x=0, int y=0);
 
 	inline static const std::array<std::pair<int, int>, 9> driftPairs = {{
-	    {-1, -1}, {0, -1}, {1, -1}, {-1, 0}, {0, 0}, {1, 0}, {-1, 1}, {0, 1}, {1, 1}
+		{-1, -1}, {0, -1}, {1, -1}, {-1, 0}, {0, 0}, {1, 0}, {-1, 1}, {0, 1}, {1, 1}
 	}};
 
+	static uint8_t calculate_cooldown(uint8_t previous, uint8_t idx);
+
 	int x() const;
 	int y() const;