dragonpilot beta3

date: 2023-08-22T14:21:17
commit: 6148ce3d77530281f890970718e9c42b2acc5ff1

common/file_helpers.py

@@ -5,7 +5,7 @@ from atomicwrites import AtomicWriter
 
 
 def mkdirs_exists_ok(path):
-  if path.startswith('http://') or path.startswith('https://'):
+  if path.startswith(('http://', 'https://')):
     raise ValueError('URL path')
   try:
     os.makedirs(path)

common/logging_extra.py

@@ -65,7 +65,7 @@ class SwagFormatter(logging.Formatter):
 
     return record_dict
 
-  def format(self, record):
+  def format(self, record): # noqa: A003
     if self.swaglogger is None:
       raise Exception("must set swaglogger before calling format()")
     return json_robust_dumps(self.format_dict(record))
@@ -95,7 +95,7 @@ class SwagLogFileFormatter(SwagFormatter):
       k += "$a"
     return k, v
 
-  def format(self, record):
+  def format(self, record): # noqa: A003
     if isinstance(record, str):
       v = json.loads(record)
     else:

common/spinner.py

@@ -29,11 +29,11 @@ class Spinner():
 
   def close(self):
     if self.spinner_proc is not None:
+      self.spinner_proc.kill()
       try:
-        self.spinner_proc.stdin.close()
-      except BrokenPipeError:
-        pass
-      self.spinner_proc.terminate()
+        self.spinner_proc.communicate(timeout=2.)
+      except subprocess.TimeoutExpired:
+        print("WARNING: failed to kill spinner")
       self.spinner_proc = None
 
   def __del__(self):

common/transformations/camera.py

@@ -61,14 +61,6 @@ device_frame_from_view_frame = np.array([
 view_frame_from_device_frame = device_frame_from_view_frame.T
 
 
-def get_calib_from_vp(vp):
-  vp_norm = normalize(vp)
-  yaw_calib = np.arctan(vp_norm[0])
-  pitch_calib = -np.arctan(vp_norm[1]*np.cos(yaw_calib))
-  roll_calib = 0
-  return roll_calib, pitch_calib, yaw_calib
-
-
 # aka 'extrinsic_matrix'
 # road : x->forward, y -> left, z->up
 def get_view_frame_from_road_frame(roll, pitch, yaw, height):
@@ -131,6 +123,14 @@ def denormalize(img_pts, intrinsics=fcam_intrinsics, width=np.inf, height=np.inf
   return img_pts_denormalized[:, :2].reshape(input_shape)
 
 
+def get_calib_from_vp(vp, intrinsics=fcam_intrinsics):
+  vp_norm = normalize(vp, intrinsics)
+  yaw_calib = np.arctan(vp_norm[0])
+  pitch_calib = -np.arctan(vp_norm[1]*np.cos(yaw_calib))
+  roll_calib = 0
+  return roll_calib, pitch_calib, yaw_calib
+
+
 def device_from_ecef(pos_ecef, orientation_ecef, pt_ecef):
   # device from ecef frame
   # device frame is x -> forward, y-> right, z -> down

common/util.h

@@ -44,6 +44,7 @@ namespace util {
 void set_thread_name(const char* name);
 int set_realtime_priority(int level);
 int set_core_affinity(std::vector<int> cores);
+int set_file_descriptor_limit(uint64_t limit);
 
 // ***** Time helpers *****
 struct tm get_time();
@@ -75,10 +76,13 @@ int getenv(const char* key, int default_val);
 float getenv(const char* key, float default_val);
 
 std::string hexdump(const uint8_t* in, const size_t size);
-std::string random_string(std::string::size_type length);
 std::string dir_name(std::string const& path);
 
-// **** file fhelpers *****
+// ***** random helpers *****
+int random_int(int min, int max);
+std::string random_string(std::string::size_type length);
+
+// **** file helpers *****
 std::string read_file(const std::string& fn);
 std::map<std::string, std::string> read_files_in_dir(const std::string& path);
 int write_file(const char* path, const void* data, size_t size, int flags = O_WRONLY, mode_t mode = 0664);

common/version.h

@@ -1 +1 @@
-#define COMMA_VERSION "2023.08.15"
+#define COMMA_VERSION "2023.08.22"