Skip to content

Commit

Permalink
mowing down bugs like I'm mowing the lawn
Browse files Browse the repository at this point in the history
  • Loading branch information
admercs committed Apr 26, 2024
1 parent c216de3 commit ab050e3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
15 changes: 8 additions & 7 deletions AutonomyLib/include/common/AutonomySimSettings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ namespace autonomylib {

struct AutonomySimSettings {

private:
typedef common_utils::Utils Utils;
typedef ImageCaptureBase::ImageType ImageType;

// fields
float settings_version_actual;
float settings_version_minimum = 1.2f;

public:
// types
static constexpr int kSubwindowCount = 3; // must be >= 3 for now
Expand Down Expand Up @@ -452,13 +460,6 @@ struct AutonomySimSettings {
}

private:
typedef common_utils::Utils Utils;
typedef ImageCaptureBase::ImageType ImageType;

// fields
float settings_version_actual;
float settings_version_minimum = 1.2f;

void checkSettingsVersion(const Settings &settings_json) {
bool has_default_settings = hasDefaultSettings(settings_json, settings_version_actual);
bool upgrade_required = settings_version_actual < settings_version_minimum;
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

### AutonomySim

- `Build systems`: updated to C++20 standard, `CMake` 3.29.2, `Clang` 17, `GCC` 13, `Python` 3.12
- `Build systems`: updated to `C++20` standard, `CMake` 3.29.2, `Clang` 17, `GCC` 13, `Python` 3.12
- The `autonomysim` Python package has undergone a complete overhaul! `AutonomyLib` is next.
- `Windows`: we now provide separate Batch/Command and PowerShell build systems. Both are tested in CI/CD.
- `Documentation`: a new system has been rolled out that also generates Python and C++ API docs.
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_gcc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ gpg --recv-keys 6C35B99309B5FA62
gpg --verify "gcc-${GCC_VERSION}.tar.gz.sig"

echo 'Unpacking GCC tarball...'
tar -xzf "gcc-${GCC_VERSION}.tar.gz"
tar -xzvf "gcc-${GCC_VERSION}.tar.gz"

echo 'Downloading prerequisites...'
pushd "gcc-${GCC_VERSION}"
Expand Down

0 comments on commit ab050e3

Please sign in to comment.