diff --git a/Server/config/spec/configspec_server.ini b/Server/config/spec/configspec_server.ini index 8798f79..185126d 100644 --- a/Server/config/spec/configspec_server.ini +++ b/Server/config/spec/configspec_server.ini @@ -29,9 +29,10 @@ config_version = float(default='1.0') __many__ = preset_param [CHECKS] + check_git_version = boolean(default=True) + check_current_position = boolean(default=True) # in meters battery_min = float(default=50.0, min=0, max=100) - check_current_position = boolean(default=True) # in meters start_pos_delta_max = float(default=1.0, min=0) # in seconds diff --git a/Server/copter_table_models.py b/Server/copter_table_models.py index 90fdf3b..c063ed6 100644 --- a/Server/copter_table_models.py +++ b/Server/copter_table_models.py @@ -46,6 +46,7 @@ class ModelChecks: start_pos_delta_max = 1.0 time_delta_max = 1.0 check_current_pos = True + check_git = True @classmethod def column_check(cls, column, pass_context=False): @@ -75,6 +76,8 @@ class ModelChecks: @ModelChecks.column_check("git_version") def check_ver(item): + if not ModelChecks.check_git: + return True return get_git_version() == item diff --git a/Server/server_qt.py b/Server/server_qt.py index b013b33..3c30fb9 100644 --- a/Server/server_qt.py +++ b/Server/server_qt.py @@ -90,8 +90,9 @@ class ExitMsgbox(logging.Handler): class ServerQt(Server): def load_config(self): super().load_config() - table.ModelChecks.battery_min = self.config.checks_battery_min + table.ModelChecks.check_git = self.config.checks_check_git_version table.ModelChecks.check_current_pos = self.config.checks_check_current_position + table.ModelChecks.battery_min = self.config.checks_battery_min table.ModelChecks.start_pos_delta_max = self.config.checks_start_pos_delta_max table.ModelChecks.time_delta_max = self.config.checks_time_delta_max