Merge pull request #130 from EmixamPP/5.0.2

v5.0.2

Author: EmixamPP

CHANGELOG.md

@@ -1,3 +1,6 @@
+# Wed Aug 23 2023 - 5.0.2
+- Minor search fix
+- Longer search by default
 # Tue Aug 8 2023 - 5.0.0
 - Automatic ir camera detection
 - Automatic ir emitter configuration

meson.build

@@ -1,7 +1,7 @@
 project(
     'linux-enable-ir-emitter', 
     'cpp',
-    version: '5.0.0', 
+    version: '5.0.2', 
     license: 'MIT',
     default_options: [
         'prefix=/usr',
@@ -118,7 +118,6 @@ install_data(
 
 install_data(
     'LICENSE',
-    'README.md',
     install_dir : lib_dir,
 )
 

sources/camera/camerainstruction.cpp

@@ -91,22 +91,25 @@ CameraInstruction::CameraInstruction(uint8_t unit, uint8_t selector, const vecto
  * false if the maximum control has already been set
  */
 bool CameraInstruction::next() noexcept
-{
+{   
+    if (curCtrl == maxCtrl)
+        return false;
+        
     for (unsigned i = 0; i < curCtrl.size(); ++i)
     {
         uint16_t nextCtrli = static_cast<uint16_t>(curCtrl[i] + 1);
         if (nextCtrli > maxCtrl[i])
             curCtrl[i] = minCtrl[i]; // simulate "overflow"
-        else 
+        else
         {
             curCtrl[i] = static_cast<uint8_t>(nextCtrli);
             logDebugCtrl("new current:", curCtrl);
             return true;
-        }   
+        }
     }
 
+    // all are in overflow (should never arrive!)
     setMaxAsCur();
-
     return false;
 }
 

sources/command/configure.py

@@ -15,7 +15,7 @@ def configure(device: str | None, manual: bool, emitters: int, neg_answer_limit:
         device (str | None): path to the infrared camera, None for automatic detection
         manual (bool): true for enabling the manual configuration
         emitters (int): number of emitters on the device
-        neg_answer_limit (int): after k negative answer the pattern will be skiped, use 256 for unlimited
+        neg_answer_limit (int): number of negative answer before the pattern is skiped. Use -1 for unlimited
     """
     logging.info("Ensure to not use the camera during the execution.")
     logging.info("Warning to do not kill the process !")

sources/driver/finder.cpp

@@ -119,29 +119,22 @@ unique_ptr<vector<unique_ptr<Driver>>> Finder::find()
             {
                 CameraInstruction instruction(camera, unit, selector);
                 const CameraInstruction initInstruction = instruction; // copy for reset later
-
-                if (!instruction.setMinAsCur()) // if no min instruction exists
-                    if (!instruction.next())    // start from the next one
-                        continue;               // if no next, skip
-
+                
+                instruction.setMinAsCur();
                 unsigned negAnswerCounter = 0;
-                do
-                {
+                while (negAnswerCounter < negAnswerLimit && instruction.next())
+                {   
+                    if (negAnswerCounter == negAnswerLimit - 1)
+                        instruction.setMaxAsCur();
+
                     if (camera.apply(instruction) && camera.isEmitterWorking())
                     {
                         drivers->push_back(createDriverFromInstruction(instruction, unit, selector));
                         if (drivers->size() == emitters) // all emitters are configured
                             return drivers;
                     }
                     ++negAnswerCounter;
-                    
-                    if (negAnswerCounter == negAnswerLimit - 1)
-                    {
-                        instruction.setMaxAsCur();
-                        continue;
-                    }
-
-                } while (negAnswerCounter < negAnswerLimit && instruction.next());
+                }
 
                 camera.apply(initInstruction);
                 Logger::debug("");

sources/linux-enable-ir-emitter.py

@@ -67,8 +67,8 @@
         "-l",
         "--limit",
         metavar="<count>",
-        help="the number of negative answer before the pattern is skipped, by default is 5. Use -1 for unlimited",
-        default=[5],
+        help="the number of negative answer before the pattern is skipped, by default is 40. Use -1 for unlimited",
+        default=[40],
         type=int,
         nargs=1,
     )