Generated files from "arm-generic-codesearch" build 0, revision f14c6a35cf1c439d5a5b2eca61185210effac48b
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/credential_verifier.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/credential_verifier.h
index 73f5f0c..9f15ecc 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/credential_verifier.h
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/credential_verifier.h
@@ -9,6 +9,7 @@
 
 #include <brillo/secure_blob.h>
 
+#include "cryptohome/auth_factor/auth_factor_metadata.h"
 #include "cryptohome/auth_factor/auth_factor_type.h"
 
 namespace cryptohome {
@@ -26,6 +27,9 @@
   // Accessors for the properties of the factor the verifier was created for.
   AuthFactorType auth_factor_type() const { return auth_factor_type_; }
   const std::string& auth_factor_label() const { return auth_factor_label_; }
+  const AuthFactorMetadata& auth_factor_metadata() const {
+    return auth_factor_metadata_;
+  }
 
   // Sets internal state for |secret| Verify().
   virtual bool Set(const brillo::SecureBlob& secret) = 0;
@@ -35,13 +39,16 @@
 
  protected:
   CredentialVerifier(AuthFactorType auth_factor_type,
-                     const std::string& auth_factor_label)
+                     const std::string& auth_factor_label,
+                     const AuthFactorMetadata& auth_factor_metadata)
       : auth_factor_type_(auth_factor_type),
-        auth_factor_label_(auth_factor_label) {}
+        auth_factor_label_(auth_factor_label),
+        auth_factor_metadata_(auth_factor_metadata) {}
 
  private:
   const AuthFactorType auth_factor_type_;
   const std::string auth_factor_label_;
+  const AuthFactorMetadata auth_factor_metadata_;
 };
 
 }  // namespace cryptohome
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/credential_verifier_unittest.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/credential_verifier_unittest.cc
index 1eef32e..26caa44 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/credential_verifier_unittest.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/credential_verifier_unittest.cc
@@ -5,6 +5,7 @@
 #include <cryptohome/credential_verifier.h>
 
 #include <memory>
+#include <variant>
 
 #include <brillo/secure_blob.h>
 #include <gtest/gtest.h>
@@ -35,6 +36,11 @@
   EXPECT_EQ(password_verifier_->auth_factor_label(), kLabel);
 }
 
+TEST_F(VerifierTest, AuthFactorMetadata) {
+  EXPECT_TRUE(std::holds_alternative<PasswordAuthFactorMetadata>(
+      password_verifier_->auth_factor_metadata().metadata));
+}
+
 TEST_F(VerifierTest, Ok) {
   brillo::SecureBlob secret("good");
   EXPECT_TRUE(password_verifier_->Set(secret));
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/scrypt_verifier.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/scrypt_verifier.cc
index d6a37e7..7d0b87c 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/scrypt_verifier.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/scrypt_verifier.cc
@@ -11,6 +11,7 @@
 #include <libhwsec-foundation/crypto/scrypt.h>
 #include <libhwsec-foundation/crypto/secure_blob_util.h>
 
+#include "cryptohome/auth_factor/auth_factor_metadata.h"
 #include "cryptohome/auth_factor/auth_factor_type.h"
 
 using ::hwsec_foundation::CreateSecureRandomBlob;
@@ -29,7 +30,9 @@
 }  // namespace
 
 ScryptVerifier::ScryptVerifier(const std::string& auth_factor_label)
-    : CredentialVerifier(AuthFactorType::kPassword, auth_factor_label) {}
+    : CredentialVerifier(AuthFactorType::kPassword,
+                         auth_factor_label,
+                         {.metadata = PasswordAuthFactorMetadata()}) {}
 
 bool ScryptVerifier::Set(const brillo::SecureBlob& secret) {
   verifier_.clear();
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/mock_user_session.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/mock_user_session.h
index dead407..b436a2a 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/mock_user_session.h
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/mock_user_session.h
@@ -63,7 +63,10 @@
               (override));
   MOCK_METHOD(void, SetCredentials, (const Credentials&), (override));
   MOCK_METHOD(void, SetCredentials, (AuthSession*), (override));
-  MOCK_METHOD(bool, HasCredentialVerifier, (), (const, override));
+  MOCK_METHOD(CredentialVerifier*,
+              GetCredentialVerifier,
+              (),
+              (const, override));
   MOCK_METHOD(bool, VerifyUser, (const std::string&), (const, override));
   MOCK_METHOD(bool, VerifyCredentials, (const Credentials&), (const, override));
   MOCK_METHOD(void,
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/real_user_session.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/real_user_session.cc
index 148cea1..3a8be75 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/real_user_session.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/real_user_session.cc
@@ -50,8 +50,6 @@
 // Message to use when generating a secret for hibernate.
 constexpr char kHibernateSecretHmacMessage[] = "AuthTimeHibernateSecret";
 
-RealUserSession::RealUserSession() {}
-
 RealUserSession::RealUserSession(
     const std::string& username,
     HomeDirs* homedirs,
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/real_user_session.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/real_user_session.h
index e002eea..5722321 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/real_user_session.h
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/real_user_session.h
@@ -30,7 +30,7 @@
 
 class RealUserSession : public UserSession {
  public:
-  RealUserSession();
+  RealUserSession() = default;
   RealUserSession(
       const std::string& username,
       HomeDirs* homedirs,
@@ -104,9 +104,10 @@
   // Sets credentials current session can be re-authenticated with.
   void SetCredentials(AuthSession* auth_session) override;
 
-  // Returns if a |credential_verifier_| is set for this session.
-  bool HasCredentialVerifier() const override {
-    return credential_verifier_ != nullptr;
+  // Returns the credential verifier for this session. Returns null if there is
+  // no verifier that has been set.
+  CredentialVerifier* GetCredentialVerifier() const override {
+    return credential_verifier_.get();
   }
 
   // Removes the credential_verifier if key_label matches the current verifier
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/user_session.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/user_session.h
index 0d89224..9258c52 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/user_session.h
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/user_session/user_session.h
@@ -92,8 +92,9 @@
   // Sets credentials current session can be re-authenticated with.
   virtual void SetCredentials(AuthSession* auth_session) = 0;
 
-  // Returns if a |credential_verifier_| is set for this session.
-  virtual bool HasCredentialVerifier() const = 0;
+  // Returns the credential verifier for this session. Returns null if there is
+  // no verifier that has been set.
+  virtual CredentialVerifier* GetCredentialVerifier() const = 0;
 
   // Checks that the session belongs to the obfuscated_user.
   virtual bool VerifyUser(const std::string& obfuscated_username) const = 0;
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.cc
index cab7e10..322cb63 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth.cc
@@ -4143,7 +4143,7 @@
     return;
   }
 
-  if (!session->HasCredentialVerifier() ||
+  if (session->GetCredentialVerifier() == nullptr ||
       override_existing_credential_verifier) {
     session->SetCredentials(auth_session);
   }
@@ -4913,7 +4913,8 @@
   UserSession* user_session = sessions_->Find(username);  // May be null!
 
   // If the user does not exist, we cannot return auth factors for it.
-  bool is_persistent_user = keyset_management_->UserExists(obfuscated_username);
+  bool is_persistent_user = (user_session && !user_session->IsEphemeral()) ||
+                            keyset_management_->UserExists(obfuscated_username);
   bool is_ephemeral_user = user_session && user_session->IsEphemeral();
   if (!is_persistent_user && !is_ephemeral_user) {
     ReplyWithError(std::move(on_done), reply,
@@ -4985,6 +4986,19 @@
       }
     }
   } else if (is_ephemeral_user) {
+    // Use the credential verifier for the session to determine what types of
+    // factors are configured.
+    if (user_session) {
+      if (CredentialVerifier* verifier =
+              user_session->GetCredentialVerifier()) {
+        if (auto proto_factor = GetAuthFactorProto(
+                verifier->auth_factor_metadata(), verifier->auth_factor_type(),
+                verifier->auth_factor_label())) {
+          *reply.add_configured_auth_factors() = std::move(*proto_factor);
+        }
+      }
+    }
+
     // Determine what auth factors are supported by going through the entire set
     // of auth factor types and checking each one.
     for (int raw_type = user_data_auth::AuthFactorType_MIN;
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_auth_session_unittest.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_auth_session_unittest.cc
index 75d2733..94d5527 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_auth_session_unittest.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_auth_session_unittest.cc
@@ -56,7 +56,9 @@
 using ::testing::Eq;
 using ::testing::Invoke;
 using ::testing::IsEmpty;
+using ::testing::IsNull;
 using ::testing::NiceMock;
+using ::testing::NotNull;
 using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::SetArgPointee;
@@ -644,7 +646,7 @@
       .WillOnce(Return(false))
       .WillRepeatedly(Return(true));
   EXPECT_CALL(*user_session, IsEphemeral()).WillRepeatedly(Return(false));
-  EXPECT_CALL(*user_session, HasCredentialVerifier()).WillOnce(Return(false));
+  EXPECT_CALL(*user_session, GetCredentialVerifier()).WillOnce(Return(nullptr));
   EXPECT_CALL(*user_session, SetCredentials(auth_session));
   EXPECT_CALL(*user_session, MountVault(kUsername, _, _))
       .WillOnce(ReturnError<CryptohomeMountError>());
@@ -687,7 +689,7 @@
       .WillOnce(Return(false))
       .WillRepeatedly(Return(true));
   EXPECT_CALL(*user_session, IsEphemeral()).WillRepeatedly(Return(false));
-  EXPECT_CALL(*user_session, HasCredentialVerifier()).WillOnce(Return(false));
+  EXPECT_CALL(*user_session, GetCredentialVerifier()).WillOnce(Return(nullptr));
   EXPECT_CALL(*user_session, SetCredentials(auth_session));
   EXPECT_CALL(*user_session, MountVault(kUsername, _, _))
       .WillOnce(ReturnError<CryptohomeMountError>());
@@ -780,7 +782,7 @@
       .WillOnce(Return(false))
       .WillRepeatedly(Return(true));
   EXPECT_CALL(*user_session, IsEphemeral()).WillRepeatedly(Return(false));
-  EXPECT_CALL(*user_session, HasCredentialVerifier()).WillOnce(Return(false));
+  EXPECT_CALL(*user_session, GetCredentialVerifier()).WillOnce(Return(nullptr));
   EXPECT_CALL(*user_session, SetCredentials(auth_session));
   EXPECT_CALL(*user_session, MountVault(kUsername, _, _))
       .WillOnce(ReturnError<CryptohomeMountError>());
@@ -831,7 +833,7 @@
       .WillOnce(Return(false))
       .WillRepeatedly(Return(true));
   EXPECT_CALL(*user_session, IsEphemeral()).WillRepeatedly(Return(false));
-  EXPECT_CALL(*user_session, HasCredentialVerifier()).WillOnce(Return(false));
+  EXPECT_CALL(*user_session, GetCredentialVerifier()).WillOnce(Return(nullptr));
   EXPECT_CALL(*user_session, SetCredentials(auth_session));
   EXPECT_CALL(*user_session, MountVault(kUsername, _, _))
       .WillOnce(ReturnError<CryptohomeMountError>());
@@ -867,7 +869,8 @@
       .WillOnce(Return(false))
       .WillRepeatedly(Return(true));
   EXPECT_CALL(*user_session2, IsEphemeral()).WillRepeatedly(Return(false));
-  EXPECT_CALL(*user_session2, HasCredentialVerifier()).WillOnce(Return(false));
+  EXPECT_CALL(*user_session2, GetCredentialVerifier())
+      .WillOnce(Return(nullptr));
   EXPECT_CALL(*user_session2, SetCredentials(auth_session2));
   EXPECT_CALL(*user_session2, MountVault(kUsername2, _, _))
       .WillOnce(ReturnError<CryptohomeMountError>());
@@ -966,7 +969,7 @@
 
   // Set expectations for credential verifier.
   EXPECT_CALL(*user_session, IsEphemeral()).WillRepeatedly(Return(false));
-  EXPECT_CALL(*user_session, HasCredentialVerifier()).WillOnce(Return(false));
+  EXPECT_CALL(*user_session, GetCredentialVerifier()).WillOnce(Return(nullptr));
   EXPECT_CALL(*user_session, SetCredentials(auth_session));
   // Set up expectation for add credential callback success.
   user_data_auth::AddCredentialsRequest request;
@@ -1701,7 +1704,7 @@
       userdataauth_.FindUserSessionForTest(kUsername);
   ASSERT_TRUE(found_user_session);
   EXPECT_TRUE(found_user_session->IsActive());
-  EXPECT_FALSE(found_user_session->HasCredentialVerifier());
+  EXPECT_THAT(found_user_session->GetCredentialVerifier(), IsNull());
 
   // Act.
   user_data_auth::AddAuthFactorReply reply =
@@ -1710,7 +1713,7 @@
   // Assert.
   EXPECT_EQ(reply.error(), user_data_auth::CRYPTOHOME_ERROR_NOT_SET);
   // Check the user session has a verifier for the given password.
-  EXPECT_TRUE(found_user_session->HasCredentialVerifier());
+  EXPECT_THAT(found_user_session->GetCredentialVerifier(), NotNull());
   Credentials credentials(kUsername, brillo::SecureBlob(kPassword));
   EXPECT_TRUE(found_user_session->VerifyCredentials(credentials));
   EXPECT_THAT(
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_unittest.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_unittest.cc
index d74b426..68656df 100644
--- a/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_unittest.cc
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/cryptohome-9999/work/cryptohome-9999/platform2/cryptohome/userdataauth_unittest.cc
@@ -60,6 +60,7 @@
 #include "cryptohome/pkcs11/fake_pkcs11_token.h"
 #include "cryptohome/pkcs11/mock_pkcs11_token_factory.h"
 #include "cryptohome/protobuf_test_utils.h"
+#include "cryptohome/scrypt_verifier.h"
 #include "cryptohome/storage/file_system_keyset.h"
 #include "cryptohome/storage/homedirs.h"
 #include "cryptohome/storage/mock_arc_disk_quota.h"
@@ -4491,11 +4492,17 @@
             user_data_auth::CRYPTOHOME_ERROR_INVALID_ARGUMENT);
 }
 
-TEST_F(UserDataAuthExTest, ListAuthFactorsUserIsEphemeral) {
-  EXPECT_CALL(keyset_management_, UserExists(_)).WillOnce(Return(false));
-  // Add a mount (and user session) for the ephemeral user.
+TEST_F(UserDataAuthExTest, ListAuthFactorsUserIsPersistentButHasNoStorage) {
   SetupMount("[email protected]");
-  EXPECT_CALL(*session_, IsEphemeral()).WillRepeatedly(Return(true));
+  EXPECT_CALL(*session_, IsEphemeral()).WillRepeatedly(Return(false));
+  EXPECT_CALL(auth_block_utility_, IsAuthFactorSupported(_, _, _))
+      .WillRepeatedly(Return(false));
+  EXPECT_CALL(auth_block_utility_,
+              IsAuthFactorSupported(AuthFactorType::kPassword, _, _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(auth_block_utility_,
+              IsAuthFactorSupported(AuthFactorType::kKiosk, _, _))
+      .WillOnce(Return(true));
 
   user_data_auth::ListAuthFactorsRequest list_request;
   list_request.mutable_account_id()->set_account_id("[email protected]");
@@ -4515,6 +4522,70 @@
   EXPECT_EQ(list_reply.error(), user_data_auth::CRYPTOHOME_ERROR_NOT_SET);
   EXPECT_THAT(list_reply.configured_auth_factors(), IsEmpty());
   EXPECT_THAT(list_reply.supported_auth_factors(),
+              UnorderedElementsAre(user_data_auth::AUTH_FACTOR_TYPE_PASSWORD,
+                                   user_data_auth::AUTH_FACTOR_TYPE_KIOSK));
+}
+
+TEST_F(UserDataAuthExTest, ListAuthFactorsUserIsEphemeralWithoutVerifier) {
+  EXPECT_CALL(keyset_management_, UserExists(_)).WillOnce(Return(false));
+  // Add a mount (and user session) for the ephemeral user.
+  SetupMount("[email protected]");
+  EXPECT_CALL(*session_, IsEphemeral()).WillRepeatedly(Return(true));
+  EXPECT_CALL(*session_, GetCredentialVerifier())
+      .WillRepeatedly(Return(nullptr));
+
+  user_data_auth::ListAuthFactorsRequest list_request;
+  list_request.mutable_account_id()->set_account_id("[email protected]");
+  user_data_auth::ListAuthFactorsReply list_reply;
+  {
+    TaskGuard guard(this, UserDataAuth::TestThreadId::kMountThread);
+    userdataauth_->ListAuthFactors(
+        list_request,
+        base::BindOnce(
+            [](user_data_auth::ListAuthFactorsReply* list_reply_ptr,
+               const user_data_auth::ListAuthFactorsReply& reply) {
+              *list_reply_ptr = reply;
+            },
+            base::Unretained(&list_reply)));
+  }
+
+  EXPECT_EQ(list_reply.error(), user_data_auth::CRYPTOHOME_ERROR_NOT_SET);
+  EXPECT_THAT(list_reply.configured_auth_factors(), IsEmpty());
+  EXPECT_THAT(list_reply.supported_auth_factors(),
+              UnorderedElementsAre(user_data_auth::AUTH_FACTOR_TYPE_PASSWORD));
+}
+
+TEST_F(UserDataAuthExTest, ListAuthFactorsUserIsEphemeralWithVerifier) {
+  EXPECT_CALL(keyset_management_, UserExists(_)).WillOnce(Return(false));
+  // Add a mount (and user session) for the ephemeral user.
+  SetupMount("[email protected]");
+  EXPECT_CALL(*session_, IsEphemeral()).WillRepeatedly(Return(true));
+  ScryptVerifier verifier("password-label");
+  EXPECT_CALL(*session_, GetCredentialVerifier())
+      .WillRepeatedly(Return(&verifier));
+
+  user_data_auth::ListAuthFactorsRequest list_request;
+  list_request.mutable_account_id()->set_account_id("[email protected]");
+  user_data_auth::ListAuthFactorsReply list_reply;
+  {
+    TaskGuard guard(this, UserDataAuth::TestThreadId::kMountThread);
+    userdataauth_->ListAuthFactors(
+        list_request,
+        base::BindOnce(
+            [](user_data_auth::ListAuthFactorsReply* list_reply_ptr,
+               const user_data_auth::ListAuthFactorsReply& reply) {
+              *list_reply_ptr = reply;
+            },
+            base::Unretained(&list_reply)));
+  }
+
+  EXPECT_EQ(list_reply.error(), user_data_auth::CRYPTOHOME_ERROR_NOT_SET);
+  ASSERT_EQ(list_reply.configured_auth_factors_size(), 1);
+  EXPECT_EQ(list_reply.configured_auth_factors(0).type(),
+            user_data_auth::AUTH_FACTOR_TYPE_PASSWORD);
+  EXPECT_EQ(list_reply.configured_auth_factors(0).label(), "password-label");
+  EXPECT_TRUE(list_reply.configured_auth_factors(0).has_password_metadata());
+  EXPECT_THAT(list_reply.supported_auth_factors(),
               UnorderedElementsAre(user_data_auth::AUTH_FACTOR_TYPE_PASSWORD));
 }
 
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_constants.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_constants.h
new file mode 100644
index 0000000..f94c2e2
--- /dev/null
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_constants.h
@@ -0,0 +1,15 @@
+// Copyright 2022 The ChromiumOS Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DIAGNOSTICS_CROS_HEALTHD_EXECUTOR_DELEGATE_CONSTANTS_H_
+#define DIAGNOSTICS_CROS_HEALTHD_EXECUTOR_DELEGATE_CONSTANTS_H_
+
+namespace diagnostics {
+
+inline constexpr char kDelegateMojoChannelHandle[] =
+    "delegate-mojo-channel-handle";
+
+}  // namespace diagnostics
+
+#endif  // DIAGNOSTICS_CROS_HEALTHD_EXECUTOR_DELEGATE_CONSTANTS_H_
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_impl.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_impl.cc
new file mode 100644
index 0000000..3ac027c
--- /dev/null
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_impl.cc
@@ -0,0 +1,12 @@
+// Copyright 2022 The ChromiumOS Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "diagnostics/cros_healthd/executor/delegate_impl.h"
+
+namespace diagnostics {
+
+DelegateImpl::DelegateImpl() {}
+DelegateImpl::~DelegateImpl() {}
+
+}  // namespace diagnostics
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_impl.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_impl.h
new file mode 100644
index 0000000..9157c9e
--- /dev/null
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_impl.h
@@ -0,0 +1,26 @@
+// Copyright 2022 The ChromiumOS Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DIAGNOSTICS_CROS_HEALTHD_EXECUTOR_DELEGATE_IMPL_H_
+#define DIAGNOSTICS_CROS_HEALTHD_EXECUTOR_DELEGATE_IMPL_H_
+
+#include "diagnostics/cros_healthd/executor/mojom/delegate.mojom.h"
+
+namespace diagnostics {
+
+namespace mojom = ::chromeos::cros_healthd::mojom;
+
+class DelegateImpl : public mojom::Delegate {
+ public:
+  DelegateImpl();
+  DelegateImpl(const DelegateImpl&) = delete;
+  DelegateImpl& operator=(const DelegateImpl&) = delete;
+  ~DelegateImpl() override;
+
+  // chromeos::cros_healthd::mojom::Delegate overrides.
+};
+
+}  // namespace diagnostics
+
+#endif  // DIAGNOSTICS_CROS_HEALTHD_EXECUTOR_DELEGATE_IMPL_H_
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_main.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_main.cc
new file mode 100644
index 0000000..5e1c910
--- /dev/null
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/delegate_main.cc
@@ -0,0 +1,62 @@
+// Copyright 2022 The ChromiumOS Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <base/command_line.h>
+#include <brillo/daemons/daemon.h>
+#include <brillo/syslog_logging.h>
+#include <mojo/core/embedder/embedder.h>
+#include <mojo/core/embedder/scoped_ipc_support.h>
+#include <mojo/public/cpp/bindings/pending_receiver.h>
+#include <mojo/public/cpp/bindings/receiver.h>
+#include <mojo/public/cpp/platform/platform_channel.h>
+#include <mojo/public/cpp/system/invitation.h>
+#include <mojo/public/cpp/system/message_pipe.h>
+
+#include "diagnostics/cros_healthd/executor/delegate_constants.h"
+#include "diagnostics/cros_healthd/executor/delegate_impl.h"
+
+namespace diagnostics {
+
+class DelegateDaemon : public brillo::Daemon {
+ public:
+  explicit DelegateDaemon(mojo::PlatformChannelEndpoint endpoint)
+      : scoped_ipc_support_(
+            base::ThreadTaskRunnerHandle::Get() /* io_thread_task_runner */,
+            mojo::core::ScopedIPCSupport::ShutdownPolicy::
+                CLEAN /* blocking shutdown */) {
+    mojo::IncomingInvitation invitation =
+        mojo::IncomingInvitation::Accept(std::move(endpoint));
+    mojo::ScopedMessagePipeHandle pipe = invitation.ExtractMessagePipe(0);
+    receiver_.Bind(mojo::PendingReceiver<mojom::Delegate>(std::move(pipe)));
+    receiver_.set_disconnect_handler(
+        base::BindOnce(&DelegateDaemon::Quit, base::Unretained(this)));
+  }
+  DelegateDaemon(const DelegateDaemon&) = delete;
+  DelegateDaemon& operator=(const DelegateDaemon&) = delete;
+  ~DelegateDaemon();
+
+ private:
+  mojo::core::ScopedIPCSupport scoped_ipc_support_;
+
+  DelegateImpl delegate_;
+
+  mojo::Receiver<mojom::Delegate> receiver_{&delegate_};
+};
+
+DelegateDaemon::~DelegateDaemon() {}
+
+}  // namespace diagnostics
+
+int main(int argc, char* argv[]) {
+  brillo::InitLog(brillo::kLogToSyslog | brillo::kLogToStderr);
+  base::CommandLine::Init(argc, argv);
+
+  mojo::core::Init();
+
+  diagnostics::DelegateDaemon daemon(
+      mojo::PlatformChannel::RecoverPassedEndpointFromString(
+          base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+              diagnostics::kDelegateMojoChannelHandle)));
+  return daemon.Run();
+}
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/utils/delegate_process.cc b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/utils/delegate_process.cc
new file mode 100644
index 0000000..da35cd6
--- /dev/null
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/utils/delegate_process.cc
@@ -0,0 +1,80 @@
+// Copyright 2022 The ChromiumOS Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "diagnostics/cros_healthd/executor/utils/delegate_process.h"
+
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <mojo/public/cpp/bindings/remote.h>
+#include <mojo/public/cpp/bindings/pending_remote.h>
+#include <mojo/public/cpp/system/invitation.h>
+#include <mojo/public/cpp/system/message_pipe.h>
+
+#include "diagnostics/cros_healthd/executor/delegate_constants.h"
+#include "diagnostics/cros_healthd/executor/mojom/delegate.mojom.h"
+
+namespace {
+
+constexpr char kDelegateBinary[] = "/usr/libexec/diagnostics/executor-delegate";
+
+}  // namespace
+
+namespace diagnostics {
+
+DelegateProcess::DelegateProcess() = default;
+
+DelegateProcess::~DelegateProcess() = default;
+
+DelegateProcess::DelegateProcess(
+    const std::string& seccomp_filename,
+    const std::string& user,
+    uint64_t capabilities_mask,
+    const std::vector<base::FilePath>& readonly_mount_points,
+    const std::vector<base::FilePath>& writable_mount_points)
+    : SandboxedProcess({kDelegateBinary},
+                       seccomp_filename,
+                       user,
+                       capabilities_mask,
+                       readonly_mount_points,
+                       writable_mount_points) {
+  SendMojoInvitation();
+  RunDelegate();
+}
+
+DelegateProcess::DelegateProcess(
+    const std::string& seccomp_filename,
+    const std::vector<base::FilePath>& readonly_mount_points)
+    : SandboxedProcess(
+          {kDelegateBinary}, seccomp_filename, readonly_mount_points) {
+  SendMojoInvitation();
+  RunDelegate();
+}
+
+void DelegateProcess::SendMojoInvitation() {
+  mojo::OutgoingInvitation invitation;
+  mojo::ScopedMessagePipeHandle pipe = invitation.AttachMessagePipe(0);
+  mojo::OutgoingInvitation::Send(std::move(invitation),
+                                 base::kNullProcessHandle,
+                                 channel_.TakeLocalEndpoint());
+  remote_.Bind(mojo::PendingRemote<mojom::Delegate>(std::move(pipe), 0));
+}
+
+void DelegateProcess::RunDelegate() {
+  base::LaunchOptions options;
+  std::string value;
+  channel_.PrepareToPassRemoteEndpoint(&options.fds_to_remap, &value);
+
+  AddArg(std::string("--") + kDelegateMojoChannelHandle + "=" + value);
+
+  for (const auto& pii : options.fds_to_remap) {
+    BindFd(pii.first, pii.second);
+  }
+
+  SandboxedProcess::Start();
+  channel_.RemoteProcessLaunchAttempted();
+}
+
+}  // namespace diagnostics
diff --git a/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/utils/delegate_process.h b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/utils/delegate_process.h
new file mode 100644
index 0000000..c1ff6ec
--- /dev/null
+++ b/chroot/build/arm-generic/tmp/portage/chromeos-base/diagnostics-9999/work/diagnostics-9999/platform2/diagnostics/cros_healthd/executor/utils/delegate_process.h
@@ -0,0 +1,86 @@
+// Copyright 2022 The ChromiumOS Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DIAGNOSTICS_CROS_HEALTHD_EXECUTOR_UTILS_DELEGATE_PROCESS_H_
+#define DIAGNOSTICS_CROS_HEALTHD_EXECUTOR_UTILS_DELEGATE_PROCESS_H_
+
+#include <string>
+#include <vector>
+
+#include <mojo/public/cpp/bindings/remote.h>
+#include <mojo/public/cpp/platform/platform_channel.h>
+
+#include "diagnostics/cros_healthd/executor/mojom/delegate.mojom.h"
+#include "diagnostics/cros_healthd/executor/utils/sandboxed_process.h"
+
+namespace diagnostics {
+
+namespace mojom = chromeos::cros_healthd::mojom;
+
+// Run executor delegate.
+//
+// Argument definition can be found in the following header:
+//     cros_healthd/executor/utils/sandboxed_process.h.
+//
+// Notice:
+// 1. |DelegateProcess| can't be initialized when the current thread is dealing
+// with a mojo task. For example, when calling `remote->Func()`, we can't create
+// |DelegateProcess| in `Func()`. A recommended way to create it is to launch a
+// new task in same thread.
+//
+// 2. The users should be aware of the lifecycle of this object. Once it's
+// destroyed, the mojo connection to the delegate will disconnect.
+//
+// Example usage:
+//   // Assume `Func()` is the mojo receiver interface in the executor.
+//   void Executor::Func(callback) {
+//     base::SequencedTaskRunnerHandle::Get()->PostTask(
+//         FROM_HERE,
+//         base::BindOnce(&Executor::FuncTask, weak_factory_.GetWeakPtr(),
+//                        std::move(callback)));
+//   }
+//
+//   void Executor::FuncTask {
+//     auto delegate = std::make_unique<DelegateProcess>("seccomp.policy");
+//     auto cb = mojo::WrapCallbackWithDefaultInvokeIfNotRun(
+//         std::move(callback), default error params);
+//
+//     // Remember to move the |delegate| in to prevent being destroyed.
+//     delegate->remote()->GetData(
+//         base::BindOnce(&GetDataCallback, std::move(cb),
+//         std::move(delegate)));
+//   }
+//
+class DelegateProcess : public SandboxedProcess {
+ public:
+  using SandboxedProcess::SandboxedProcess;
+  DelegateProcess(const std::string& seccomp_filename,
+                  const std::string& user,
+                  uint64_t capabilities_mask,
+                  const std::vector<base::FilePath>& readonly_mount_points,
+                  const std::vector<base::FilePath>& writable_mount_points);
+  DelegateProcess(
+      const std::string& seccomp_filename,
+      const std::vector<base::FilePath>& readonly_mount_points = {});
+
+  DelegateProcess(const DelegateProcess&) = delete;
+  DelegateProcess& operator=(const DelegateProcess&) = delete;
+  ~DelegateProcess() override;
+
+  auto remote() { return remote_.get(); }
+
+ protected:
+  DelegateProcess();
+
+ private:
+  virtual void SendMojoInvitation();
+  virtual void RunDelegate();
+
+  mojo::PlatformChannel channel_;
+  mojo::Remote<mojom::Delegate> remote_;
+};
+
+}  // namespace diagnostics
+
+#endif  // DIAGNOSTICS_CROS_HEALTHD_EXECUTOR_UTILS_DELEGATE_PROCESS_H_
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm.c
deleted file mode 100644
index 7b93c27..0000000
--- a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm.c
+++ /dev/null
@@ -1,1308 +0,0 @@
-/* Copyright 2012 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <alsa/asoundlib.h>
-#include <alsa/use-case.h>
-#include <ctype.h>
-#include <string.h>
-#include <syslog.h>
-
-#include "cras_alsa_ucm.h"
-#include "cras_util.h"
-#include "strlcpy.h"
-#include "utlist.h"
-
-static const char jack_control_var[] = "JackControl";
-static const char jack_dev_var[] = "JackDev";
-static const char jack_switch_var[] = "JackSwitch";
-static const char edid_var[] = "EDIDFile";
-static const char cap_var[] = "CaptureControl";
-static const char override_type_name_var[] = "OverrideNodeType";
-static const char dsp_name_var[] = "DspName";
-static const char playback_mixer_elem_var[] = "PlaybackMixerElem";
-static const char capture_mixer_elem_var[] = "CaptureMixerElem";
-static const char min_buffer_level_var[] = "MinBufferLevel";
-static const char dma_period_var[] = "DmaPeriodMicrosecs";
-static const char disable_software_volume[] = "DisableSoftwareVolume";
-static const char playback_device_name_var[] = "PlaybackPCM";
-static const char playback_device_rate_var[] = "PlaybackRate";
-static const char playback_channels_var[] = "PlaybackChannels";
-static const char capture_device_name_var[] = "CapturePCM";
-static const char capture_device_rate_var[] = "CaptureRate";
-static const char capture_channel_map_var[] = "CaptureChannelMap";
-static const char capture_channels_var[] = "CaptureChannels";
-static const char coupled_mixers[] = "CoupledMixers";
-static const char dependent_device_name_var[] = "DependentPCM";
-static const char preempt_hotword_var[] = "PreemptHotword";
-static const char echo_reference_dev_name_var[] = "EchoReferenceDev";
-static const char rtc_proc_echo_cancellation_modifier[] =
-	"RTC Proc Echo Cancellation";
-static const char rtc_proc_noise_suppression_modifier[] =
-	"RTC Proc Noise Suppression";
-static const char rtc_proc_gain_control_modifier[] = "RTC Proc Gain Control";
-
-/* SectionModifier prefixes and suffixes. */
-static const char hotword_model_prefix[] = "Hotword Model";
-static const char swap_mode_suffix[] = "Swap Mode";
-static const char noise_cancellation_suffix[] = "Noise Cancellation";
-
-/*
- * Set this value in a SectionDevice to specify the intrinsic sensitivity in
- * 0.01 dBFS/Pa. It currently only supports input devices. You should get the
- * value by recording samples without either hardware or software gain. We are
- * still working on building a standard process for measuring it. The value you
- * see now in our UCM is just estimated value. If it is set, CRAS will enable
- * software gain and use the value as a reference for calculating the
- * appropriate software gain to apply to the device to meet our target volume.
- */
-static const char intrinsic_sensitivity_var[] = "IntrinsicSensitivity";
-
-/*
- * Set this value in a SectionDevice to specify the default node gain in
- * 0.01 dB.
- */
-static const char default_node_gain[] = "DefaultNodeGain";
-static const char fully_specified_ucm_var[] = "FullySpecifiedUCM";
-static const char main_volume_names[] = "MainVolumeNames";
-
-/* Use case verbs corresponding to CRAS_STREAM_TYPE. */
-static const char *use_case_verbs[] = {
-	"HiFi",	  "Multimedia", "Voice Call",
-	"Speech", "Pro Audio",	"Accessibility",
-};
-
-static const size_t max_section_name_len = 100;
-
-/* Represents a list of section names found in UCM. */
-struct section_name {
-	const char *name;
-	struct section_name *prev, *next;
-};
-
-struct cras_use_case_mgr {
-	snd_use_case_mgr_t *mgr;
-	char *name;
-	unsigned int avail_use_cases;
-	enum CRAS_STREAM_TYPE use_case;
-	char *hotword_modifier;
-};
-
-static inline const char *uc_verb(struct cras_use_case_mgr *mgr)
-{
-	return use_case_verbs[mgr->use_case];
-}
-
-static int device_enabled(struct cras_use_case_mgr *mgr, const char *dev)
-{
-	const char **list;
-	unsigned int i;
-	int num_devs;
-	int enabled = 0;
-
-	num_devs = snd_use_case_get_list(mgr->mgr, "_enadevs", &list);
-	if (num_devs <= 0)
-		return 0;
-
-	for (i = 0; i < (unsigned int)num_devs; i++)
-		if (!strcmp(dev, list[i])) {
-			enabled = 1;
-			break;
-		}
-
-	snd_use_case_free_list(list, num_devs);
-	return enabled;
-}
-
-static int modifier_enabled(struct cras_use_case_mgr *mgr, const char *mod)
-{
-	const char **list;
-	unsigned int mod_idx;
-	int num_mods;
-
-	num_mods = snd_use_case_get_list(mgr->mgr, "_enamods", &list);
-	if (num_mods <= 0)
-		return 0;
-
-	for (mod_idx = 0; mod_idx < (unsigned int)num_mods; mod_idx++)
-		if (!strcmp(mod, list[mod_idx]))
-			break;
-
-	snd_use_case_free_list(list, num_mods);
-	return (mod_idx < (unsigned int)num_mods);
-}
-
-static int get_var(struct cras_use_case_mgr *mgr, const char *var,
-		   const char *dev, const char *verb, const char **value)
-{
-	char *id;
-	int rc;
-	size_t len = strlen(var) + strlen(dev) + strlen(verb) + 4;
-
-	id = (char *)malloc(len);
-	if (!id)
-		return -ENOMEM;
-	snprintf(id, len, "=%s/%s/%s", var, dev, verb);
-	rc = snd_use_case_get(mgr->mgr, id, value);
-
-	free((void *)id);
-	return rc;
-}
-
-static int get_int(struct cras_use_case_mgr *mgr, const char *var,
-		   const char *dev, const char *verb, int *value)
-{
-	const char *str_value;
-	int rc;
-
-	if (!value)
-		return -EINVAL;
-	rc = get_var(mgr, var, dev, verb, &str_value);
-	if (rc != 0)
-		return rc;
-	*value = atoi(str_value);
-	free((void *)str_value);
-	return 0;
-}
-
-static int ucm_set_modifier_enabled(struct cras_use_case_mgr *mgr,
-				    const char *mod, int enable)
-{
-	int rc;
-
-	rc = snd_use_case_set(mgr->mgr, enable ? "_enamod" : "_dismod", mod);
-	if (rc)
-		syslog(LOG_ERR, "Can not %s UCM modifier %s, rc = %d",
-		       enable ? "enable" : "disable", mod, rc);
-	return rc;
-}
-
-static int ucm_str_ends_with_suffix(const char *str, const char *suffix)
-{
-	if (!str || !suffix)
-		return 0;
-	size_t len_str = strlen(str);
-	size_t len_suffix = strlen(suffix);
-	if (len_suffix > len_str)
-		return 0;
-	return strncmp(str + len_str - len_suffix, suffix, len_suffix) == 0;
-}
-
-static int ucm_section_exists_with_name(struct cras_use_case_mgr *mgr,
-					const char *name,
-					const char *identifier)
-{
-	const char **list;
-	unsigned int i;
-	int num_entries;
-	int exist = 0;
-
-	num_entries = snd_use_case_get_list(mgr->mgr, identifier, &list);
-	if (num_entries <= 0)
-		return 0;
-
-	for (i = 0; i < (unsigned int)num_entries; i += 2) {
-		if (!list[i])
-			continue;
-
-		if (strcmp(list[i], name) == 0) {
-			exist = 1;
-			break;
-		}
-	}
-	snd_use_case_free_list(list, num_entries);
-	return exist;
-}
-
-static int ucm_section_exists_with_suffix(struct cras_use_case_mgr *mgr,
-					  const char *suffix,
-					  const char *identifier)
-{
-	const char **list;
-	unsigned int i;
-	int num_entries;
-	int exist = 0;
-
-	num_entries = snd_use_case_get_list(mgr->mgr, identifier, &list);
-	if (num_entries <= 0)
-		return 0;
-
-	for (i = 0; i < (unsigned int)num_entries; i += 2) {
-		if (!list[i])
-			continue;
-
-		if (ucm_str_ends_with_suffix(list[i], suffix)) {
-			exist = 1;
-			break;
-		}
-	}
-	snd_use_case_free_list(list, num_entries);
-	return exist;
-}
-
-static int ucm_mod_exists_with_suffix(struct cras_use_case_mgr *mgr,
-				      const char *suffix)
-{
-	char *identifier;
-	int rc;
-
-	identifier = snd_use_case_identifier("_modifiers/%s", uc_verb(mgr));
-	rc = ucm_section_exists_with_suffix(mgr, suffix, identifier);
-	free(identifier);
-	return rc;
-}
-
-static int ucm_mod_exists_with_name(struct cras_use_case_mgr *mgr,
-				    const char *name)
-{
-	char *identifier;
-	int rc;
-
-	identifier = snd_use_case_identifier("_modifiers/%s", uc_verb(mgr));
-	rc = ucm_section_exists_with_name(mgr, name, identifier);
-	free(identifier);
-	return rc;
-}
-
-/* Get a list of section names whose variable is the matched value. */
-static struct section_name *
-ucm_get_sections_for_var(struct cras_use_case_mgr *mgr, const char *var,
-			 const char *value, const char *identifier,
-			 enum CRAS_STREAM_DIRECTION direction)
-{
-	const char **list;
-	struct section_name *section_names = NULL, *s_name;
-	unsigned int i;
-	int num_entries;
-	int rc;
-
-	num_entries = snd_use_case_get_list(mgr->mgr, identifier, &list);
-	if (num_entries <= 0)
-		return NULL;
-
-	/* snd_use_case_get_list fills list with pairs of device name and
-	 * comment, so device names are in even-indexed elements. */
-	for (i = 0; i < (unsigned int)num_entries; i += 2) {
-		const char *this_value;
-
-		if (!list[i])
-			continue;
-
-		rc = get_var(mgr, var, list[i], uc_verb(mgr), &this_value);
-		if (rc)
-			continue;
-
-		if (!strcmp(value, this_value)) {
-			s_name = (struct section_name *)malloc(
-				sizeof(struct section_name));
-
-			if (!s_name) {
-				syslog(LOG_ERR, "Failed to allocate memory");
-				free((void *)this_value);
-				break;
-			}
-
-			s_name->name = strdup(list[i]);
-			DL_APPEND(section_names, s_name);
-		}
-		free((void *)this_value);
-	}
-
-	snd_use_case_free_list(list, num_entries);
-	return section_names;
-}
-
-static struct section_name *
-ucm_get_devices_for_var(struct cras_use_case_mgr *mgr, const char *var,
-			const char *value, enum CRAS_STREAM_DIRECTION dir)
-{
-	char *identifier;
-	struct section_name *section_names;
-
-	identifier = snd_use_case_identifier("_devices/%s", uc_verb(mgr));
-	section_names =
-		ucm_get_sections_for_var(mgr, var, value, identifier, dir);
-	free(identifier);
-	return section_names;
-}
-
-static const char *ucm_get_value_for_dev(struct cras_use_case_mgr *mgr,
-					 const char *value_var, const char *dev)
-{
-	const char *name = NULL;
-	int rc;
-
-	rc = get_var(mgr, value_var, dev, uc_verb(mgr), &name);
-	if (rc)
-		return NULL;
-
-	return name;
-}
-
-static inline const char *
-ucm_get_playback_device_name_for_dev(struct cras_use_case_mgr *mgr,
-				     const char *dev)
-{
-	return ucm_get_value_for_dev(mgr, playback_device_name_var, dev);
-}
-
-static inline const char *
-ucm_get_capture_device_name_for_dev(struct cras_use_case_mgr *mgr,
-				    const char *dev)
-{
-	return ucm_get_value_for_dev(mgr, capture_device_name_var, dev);
-}
-
-/* Gets the value of DependentPCM property. This is used to structure two
- * SectionDevices under one cras iodev to avoid two PCMs be open at the
- * same time because of restriction in lower layer driver or hardware.
- */
-static inline const char *
-ucm_get_dependent_device_name_for_dev(struct cras_use_case_mgr *mgr,
-				      const char *dev)
-{
-	return ucm_get_value_for_dev(mgr, dependent_device_name_var, dev);
-}
-
-/* Get a list of mixer names specified in a UCM variable separated by ",".
- * E.g. "Left Playback,Right Playback".
- */
-static struct mixer_name *ucm_get_mixer_names(struct cras_use_case_mgr *mgr,
-					      const char *dev, const char *var,
-					      enum CRAS_STREAM_DIRECTION dir,
-					      mixer_name_type type)
-{
-	const char *names_in_string = NULL;
-	int rc;
-	char *tokens, *name;
-	char *laststr = NULL;
-	struct mixer_name *names = NULL;
-
-	rc = get_var(mgr, var, dev, uc_verb(mgr), &names_in_string);
-	if (rc)
-		return NULL;
-
-	tokens = strdup(names_in_string);
-	name = strtok_r(tokens, ",", &laststr);
-	while (name != NULL) {
-		names = mixer_name_add(names, name, dir, type);
-		name = strtok_r(NULL, ",", &laststr);
-	}
-	free((void *)names_in_string);
-	free(tokens);
-	return names;
-}
-
-/* Gets the modifier name of Noise Cancellation for the given node_name. */
-static void ucm_get_node_noise_cancellation_name(const char *node_name,
-						 char *mod_name)
-{
-	size_t len =
-		strlen(node_name) + 1 + strlen(noise_cancellation_suffix) + 1;
-	if (len > max_section_name_len) {
-		syslog(LOG_ERR,
-		       "Length of the given section name is %zu > %zu(max)",
-		       len, max_section_name_len);
-		len = max_section_name_len;
-	}
-	snprintf(mod_name, len, "%s %s", node_name, noise_cancellation_suffix);
-}
-
-/* Exported Interface */
-
-struct cras_use_case_mgr *ucm_create(const char *name)
-{
-	struct cras_use_case_mgr *mgr;
-	int rc;
-	const char **list;
-	int num_verbs, i, j;
-
-	assert_on_compile(ARRAY_SIZE(use_case_verbs) == CRAS_STREAM_NUM_TYPES);
-
-	if (!name)
-		return NULL;
-
-	mgr = (struct cras_use_case_mgr *)malloc(sizeof(*mgr));
-	if (!mgr)
-		return NULL;
-
-	mgr->name = strdup(name);
-	if (!mgr->name)
-		goto cleanup;
-
-	rc = snd_use_case_mgr_open(&mgr->mgr, name);
-	if (rc) {
-		syslog(LOG_WARNING, "Can not open ucm for card %s, rc = %d",
-		       name, rc);
-		goto cleanup;
-	}
-
-	mgr->avail_use_cases = 0;
-	mgr->hotword_modifier = NULL;
-	num_verbs = snd_use_case_get_list(mgr->mgr, "_verbs", &list);
-	for (i = 0; i < num_verbs; i += 2) {
-		for (j = 0; j < CRAS_STREAM_NUM_TYPES; ++j) {
-			if (strcmp(list[i], use_case_verbs[j]) == 0)
-				break;
-		}
-		if (j < CRAS_STREAM_NUM_TYPES)
-			mgr->avail_use_cases |= (1 << j);
-	}
-	if (num_verbs > 0)
-		snd_use_case_free_list(list, num_verbs);
-
-	rc = ucm_set_use_case(mgr, CRAS_STREAM_TYPE_DEFAULT);
-	if (rc)
-		goto cleanup_mgr;
-
-	return mgr;
-
-cleanup_mgr:
-	snd_use_case_mgr_close(mgr->mgr);
-cleanup:
-	free(mgr->name);
-	free(mgr);
-	return NULL;
-}
-
-void ucm_destroy(struct cras_use_case_mgr *mgr)
-{
-	snd_use_case_mgr_close(mgr->mgr);
-	free(mgr->hotword_modifier);
-	free(mgr->name);
-	free(mgr);
-}
-
-int ucm_set_use_case(struct cras_use_case_mgr *mgr,
-		     enum CRAS_STREAM_TYPE use_case)
-{
-	int rc;
-
-	if (mgr->avail_use_cases & (1 << use_case)) {
-		mgr->use_case = use_case;
-	} else {
-		syslog(LOG_ERR, "Unavailable use case %d for card %s", use_case,
-		       mgr->name);
-		return -1;
-	}
-
-	rc = snd_use_case_set(mgr->mgr, "_verb", uc_verb(mgr));
-	if (rc) {
-		syslog(LOG_ERR, "Can not set verb %s for card %s, rc = %d",
-		       uc_verb(mgr), mgr->name, rc);
-		return rc;
-	}
-
-	return 0;
-}
-
-int ucm_swap_mode_exists(struct cras_use_case_mgr *mgr)
-{
-	return ucm_mod_exists_with_suffix(mgr, swap_mode_suffix);
-}
-
-int ucm_enable_swap_mode(struct cras_use_case_mgr *mgr, const char *node_name,
-			 int enable)
-{
-	char *swap_mod = NULL;
-	int rc;
-	size_t len = strlen(node_name) + 1 + strlen(swap_mode_suffix) + 1;
-	swap_mod = (char *)malloc(len);
-	if (!swap_mod)
-		return -ENOMEM;
-	snprintf(swap_mod, len, "%s %s", node_name, swap_mode_suffix);
-	if (!ucm_mod_exists_with_name(mgr, swap_mod)) {
-		syslog(LOG_ERR, "Can not find swap mode modifier %s.",
-		       swap_mod);
-		free((void *)swap_mod);
-		return -EPERM;
-	}
-	if (modifier_enabled(mgr, swap_mod) == !!enable) {
-		free((void *)swap_mod);
-		return 0;
-	}
-	rc = ucm_set_modifier_enabled(mgr, swap_mod, enable);
-	free((void *)swap_mod);
-	return rc;
-}
-
-static int ucm_modifier_try_enable(struct cras_use_case_mgr *mgr, int enable,
-				   const char *name)
-{
-	if (!ucm_mod_exists_with_name(mgr, name)) {
-		syslog(LOG_ERR, "Can not find modifier %s.", name);
-		return -ENOTSUP;
-	}
-	if (modifier_enabled(mgr, name) == !!enable) {
-		syslog(LOG_DEBUG, "Modifier %s is already %s.", name,
-		       enable ? "enabled" : "disabled");
-		return 0;
-	}
-
-	syslog(LOG_DEBUG, "UCM %s Modifier %s", enable ? "enable" : "disable",
-	       name);
-	return ucm_set_modifier_enabled(mgr, name, enable);
-}
-
-int inline ucm_node_echo_cancellation_exists(struct cras_use_case_mgr *mgr)
-{
-	return ucm_mod_exists_with_name(mgr,
-					rtc_proc_echo_cancellation_modifier);
-}
-
-int inline ucm_enable_node_echo_cancellation(struct cras_use_case_mgr *mgr,
-					     int enable)
-{
-	return ucm_modifier_try_enable(mgr, enable,
-				       rtc_proc_echo_cancellation_modifier);
-}
-
-int inline ucm_node_noise_suppression_exists(struct cras_use_case_mgr *mgr)
-{
-	return ucm_mod_exists_with_name(mgr,
-					rtc_proc_noise_suppression_modifier);
-}
-
-int inline ucm_enable_node_noise_suppression(struct cras_use_case_mgr *mgr,
-					     int enable)
-{
-	return ucm_modifier_try_enable(mgr, enable,
-				       rtc_proc_noise_suppression_modifier);
-}
-
-int inline ucm_node_gain_control_exists(struct cras_use_case_mgr *mgr)
-{
-	return ucm_mod_exists_with_name(mgr, rtc_proc_gain_control_modifier);
-}
-
-int inline ucm_enable_node_gain_control(struct cras_use_case_mgr *mgr,
-					int enable)
-{
-	return ucm_modifier_try_enable(mgr, enable,
-				       rtc_proc_gain_control_modifier);
-}
-
-int ucm_node_noise_cancellation_exists(struct cras_use_case_mgr *mgr,
-				       const char *node_name)
-{
-	char node_modifier_name[max_section_name_len];
-
-	ucm_get_node_noise_cancellation_name(node_name, node_modifier_name);
-	return ucm_mod_exists_with_name(mgr, node_modifier_name);
-}
-
-int ucm_enable_node_noise_cancellation(struct cras_use_case_mgr *mgr,
-				       const char *node_name, int enable)
-{
-	char node_modifier_name[max_section_name_len];
-
-	ucm_get_node_noise_cancellation_name(node_name, node_modifier_name);
-	return ucm_modifier_try_enable(mgr, enable, node_modifier_name);
-}
-
-int ucm_set_enabled(struct cras_use_case_mgr *mgr, const char *dev, int enable)
-{
-	int rc;
-	if (device_enabled(mgr, dev) == !!enable)
-		return 0;
-	syslog(LOG_DEBUG, "UCM %s %s", enable ? "enable" : "disable", dev);
-	rc = snd_use_case_set(mgr->mgr, enable ? "_enadev" : "_disdev", dev);
-	if (rc && (rc != -ENOENT || ucm_has_fully_specified_ucm_flag(mgr))) {
-		syslog(LOG_ERR, "Can not %s UCM for device %s, rc = %d",
-		       enable ? "enable" : "disable", dev, rc);
-	}
-	return rc;
-}
-
-char *ucm_get_flag(struct cras_use_case_mgr *mgr, const char *flag_name)
-{
-	char *flag_value = NULL;
-	const char *value;
-	int rc;
-
-	/* Set device to empty string since flag is specified in verb section */
-	rc = get_var(mgr, flag_name, "", uc_verb(mgr), &value);
-	if (!rc) {
-		flag_value = strdup(value);
-		free((void *)value);
-	}
-
-	return flag_value;
-}
-
-char *ucm_get_cap_control(struct cras_use_case_mgr *mgr, const char *ucm_dev)
-{
-	char *control_name = NULL;
-	const char *value;
-	int rc;
-
-	rc = get_var(mgr, cap_var, ucm_dev, uc_verb(mgr), &value);
-	if (!rc) {
-		control_name = strdup(value);
-		free((void *)value);
-	}
-
-	return control_name;
-}
-
-inline const char *ucm_get_override_type_name(struct cras_use_case_mgr *mgr,
-					      const char *dev)
-{
-	return ucm_get_value_for_dev(mgr, override_type_name_var, dev);
-}
-
-char *ucm_get_dev_for_jack(struct cras_use_case_mgr *mgr, const char *jack,
-			   enum CRAS_STREAM_DIRECTION direction)
-{
-	struct section_name *section_names, *c;
-	char *ret = NULL;
-
-	section_names =
-		ucm_get_devices_for_var(mgr, jack_dev_var, jack, direction);
-
-	DL_FOREACH (section_names, c) {
-		if (!strcmp(c->name, "Mic")) {
-			/* Skip mic section for output */
-			if (direction == CRAS_STREAM_OUTPUT)
-				continue;
-		} else {
-			/* Only check mic for input. */
-			if (direction == CRAS_STREAM_INPUT)
-				continue;
-		}
-		ret = strdup(c->name);
-		break;
-	}
-
-	DL_FOREACH (section_names, c) {
-		DL_DELETE(section_names, c);
-		free((void *)c->name);
-		free(c);
-	}
-
-	return ret;
-}
-
-char *ucm_get_dev_for_mixer(struct cras_use_case_mgr *mgr, const char *mixer,
-			    enum CRAS_STREAM_DIRECTION dir)
-{
-	struct section_name *section_names = NULL, *c;
-	char *ret = NULL;
-
-	if (dir == CRAS_STREAM_OUTPUT) {
-		section_names = ucm_get_devices_for_var(
-			mgr, playback_mixer_elem_var, mixer, dir);
-	} else if (dir == CRAS_STREAM_INPUT) {
-		section_names = ucm_get_devices_for_var(
-			mgr, capture_mixer_elem_var, mixer, dir);
-	}
-
-	if (section_names)
-		ret = strdup(section_names->name);
-
-	DL_FOREACH (section_names, c) {
-		DL_DELETE(section_names, c);
-		free((void *)c->name);
-		free(c);
-	}
-
-	return ret;
-}
-
-inline const char *ucm_get_edid_file_for_dev(struct cras_use_case_mgr *mgr,
-					     const char *dev)
-{
-	return ucm_get_value_for_dev(mgr, edid_var, dev);
-}
-
-inline const char *ucm_get_dsp_name_for_dev(struct cras_use_case_mgr *mgr,
-					    const char *dev)
-{
-	return ucm_get_value_for_dev(mgr, dsp_name_var, dev);
-}
-
-int ucm_get_min_buffer_level(struct cras_use_case_mgr *mgr, unsigned int *level)
-{
-	int value;
-	int rc;
-
-	rc = get_int(mgr, min_buffer_level_var, "", uc_verb(mgr), &value);
-	if (rc)
-		return -ENOENT;
-	*level = value;
-
-	return 0;
-}
-
-unsigned int ucm_get_disable_software_volume(struct cras_use_case_mgr *mgr)
-{
-	int value;
-	int rc;
-
-	rc = get_int(mgr, disable_software_volume, "", uc_verb(mgr), &value);
-	if (rc)
-		return 0;
-
-	return value;
-}
-
-int ucm_get_default_node_gain(struct cras_use_case_mgr *mgr, const char *dev,
-			      long *gain)
-{
-	int value;
-	int rc;
-
-	rc = get_int(mgr, default_node_gain, dev, uc_verb(mgr), &value);
-	if (rc)
-		return rc;
-	*gain = value;
-	return 0;
-}
-
-int ucm_get_intrinsic_sensitivity(struct cras_use_case_mgr *mgr,
-				  const char *dev, long *sensitivity)
-{
-	int value;
-	int rc;
-
-	rc = get_int(mgr, intrinsic_sensitivity_var, dev, uc_verb(mgr), &value);
-	if (rc)
-		return rc;
-	*sensitivity = value;
-	return 0;
-}
-
-int ucm_get_preempt_hotword(struct cras_use_case_mgr *mgr, const char *dev)
-{
-	int value;
-	int rc;
-
-	rc = get_int(mgr, preempt_hotword_var, dev, uc_verb(mgr), &value);
-	if (rc)
-		return 0;
-	return value;
-}
-
-static int get_device_index_from_target(const char *target_device_name);
-
-int ucm_get_alsa_dev_idx_for_dev(struct cras_use_case_mgr *mgr, const char *dev,
-				 enum CRAS_STREAM_DIRECTION direction)
-{
-	const char *pcm_name = NULL;
-	int dev_idx = -1;
-
-	if (direction == CRAS_STREAM_OUTPUT)
-		pcm_name = ucm_get_playback_device_name_for_dev(mgr, dev);
-	else if (direction == CRAS_STREAM_INPUT)
-		pcm_name = ucm_get_capture_device_name_for_dev(mgr, dev);
-
-	if (pcm_name) {
-		dev_idx = get_device_index_from_target(pcm_name);
-		free((void *)pcm_name);
-	}
-	return dev_idx;
-}
-
-inline const char *
-ucm_get_echo_reference_dev_name_for_dev(struct cras_use_case_mgr *mgr,
-					const char *dev)
-{
-	return ucm_get_value_for_dev(mgr, echo_reference_dev_name_var, dev);
-}
-
-int ucm_get_sample_rate_for_dev(struct cras_use_case_mgr *mgr, const char *dev,
-				enum CRAS_STREAM_DIRECTION direction)
-{
-	int value;
-	int rc;
-	const char *var_name;
-
-	if (direction == CRAS_STREAM_OUTPUT)
-		var_name = playback_device_rate_var;
-	else if (direction == CRAS_STREAM_INPUT)
-		var_name = capture_device_rate_var;
-	else
-		return -EINVAL;
-
-	rc = get_int(mgr, var_name, dev, uc_verb(mgr), &value);
-	if (rc)
-		return rc;
-
-	return value;
-}
-
-int ucm_get_channels_for_dev(struct cras_use_case_mgr *mgr, const char *dev,
-			     enum CRAS_STREAM_DIRECTION direction,
-			     size_t *channels)
-{
-	int value;
-	int rc;
-	const char *var_name;
-
-	if (direction == CRAS_STREAM_OUTPUT)
-		var_name = playback_channels_var;
-	else if (direction == CRAS_STREAM_INPUT)
-		var_name = capture_channels_var;
-	else
-		return -EINVAL;
-
-	rc = get_int(mgr, var_name, dev, uc_verb(mgr), &value);
-	if (rc)
-		return rc;
-	if (value < 0)
-		return -1;
-
-	*channels = (size_t)value;
-	return 0;
-}
-
-int ucm_get_capture_chmap_for_dev(struct cras_use_case_mgr *mgr,
-				  const char *dev, int8_t *channel_layout)
-{
-	const char *var_str;
-	char *tokens, *token;
-	int i, rc;
-
-	rc = get_var(mgr, capture_channel_map_var, dev, uc_verb(mgr), &var_str);
-	if (rc)
-		return rc;
-
-	tokens = strdup(var_str);
-	token = strtok(tokens, " ");
-	for (i = 0; token && (i < CRAS_CH_MAX); i++) {
-		channel_layout[i] = atoi(token);
-		token = strtok(NULL, " ");
-	}
-
-	free((void *)tokens);
-	free((void *)var_str);
-	return (i == CRAS_CH_MAX) ? 0 : -EINVAL;
-}
-
-struct mixer_name *ucm_get_coupled_mixer_names(struct cras_use_case_mgr *mgr,
-					       const char *dev)
-{
-	return ucm_get_mixer_names(mgr, dev, coupled_mixers, CRAS_STREAM_OUTPUT,
-				   MIXER_NAME_VOLUME);
-}
-
-static int get_device_index_from_target(const char *target_device_name)
-{
-	/* Expects a string in the form: hw:card-name,<num> */
-	const char *pos = target_device_name;
-	if (!pos)
-		return -1;
-	while (*pos && *pos != ',')
-		++pos;
-	if (*pos == ',') {
-		++pos;
-		return atoi(pos);
-	}
-	return -1;
-}
-
-static const char *ucm_get_dir_for_device(struct cras_use_case_mgr *mgr,
-					  const char *dev_name,
-					  enum CRAS_STREAM_DIRECTION *dir)
-{
-	const char *pcm_name;
-
-	pcm_name = ucm_get_playback_device_name_for_dev(mgr, dev_name);
-
-	if (pcm_name) {
-		*dir = CRAS_STREAM_OUTPUT;
-		return pcm_name;
-	}
-
-	pcm_name = ucm_get_capture_device_name_for_dev(mgr, dev_name);
-	if (pcm_name) {
-		*dir = CRAS_STREAM_INPUT;
-		return pcm_name;
-	}
-
-	*dir = CRAS_STREAM_UNDEFINED;
-	return NULL;
-}
-
-static int ucm_parse_device_section(struct cras_use_case_mgr *mgr,
-				    const char *dev,
-				    struct ucm_section **sections)
-{
-	enum CRAS_STREAM_DIRECTION dir;
-	int dev_idx = -1;
-	int dependent_dev_idx = -1;
-	const char *jack_name = NULL;
-	const char *jack_type = NULL;
-	const char *jack_dev = NULL;
-	const char *jack_control = NULL;
-	const char *mixer_name = NULL;
-	struct mixer_name *m_name;
-	int rc = 0;
-	const char *pcm_name;
-	const char *dependent_dev_name = NULL;
-	struct ucm_section *dev_sec;
-	const char *dev_name;
-
-	dev_name = strdup(dev);
-	if (!dev_name)
-		return 0;
-
-	pcm_name = ucm_get_dir_for_device(mgr, dev_name, &dir);
-
-	if (pcm_name)
-		dev_idx = get_device_index_from_target(pcm_name);
-
-	if (dir == CRAS_STREAM_UNDEFINED) {
-		syslog(LOG_ERR,
-		       "UCM configuration for device '%s' missing"
-		       " PlaybackPCM or CapturePCM definition.",
-		       dev_name);
-		rc = -EINVAL;
-		goto error_cleanup;
-	}
-
-	dependent_dev_name =
-		ucm_get_dependent_device_name_for_dev(mgr, dev_name);
-	if (dependent_dev_name) {
-		dependent_dev_idx =
-			get_device_index_from_target(dependent_dev_name);
-	}
-
-	jack_dev = ucm_get_jack_dev_for_dev(mgr, dev_name);
-	jack_control = ucm_get_jack_control_for_dev(mgr, dev_name);
-	if (dir == CRAS_STREAM_OUTPUT)
-		mixer_name = ucm_get_playback_mixer_elem_for_dev(mgr, dev_name);
-	else if (dir == CRAS_STREAM_INPUT)
-		mixer_name = ucm_get_capture_mixer_elem_for_dev(mgr, dev_name);
-
-	if (jack_dev) {
-		jack_name = jack_dev;
-		jack_type = "gpio";
-	} else if (jack_control) {
-		jack_name = jack_control;
-		jack_type = "hctl";
-	}
-
-	dev_sec = ucm_section_create(dev_name, pcm_name, dev_idx,
-				     dependent_dev_idx, dir, jack_name,
-				     jack_type);
-
-	if (!dev_sec) {
-		syslog(LOG_ERR, "Failed to allocate memory.");
-		rc = -ENOMEM;
-		goto error_cleanup;
-	}
-
-	dev_sec->jack_switch = ucm_get_jack_switch_for_dev(mgr, dev_name);
-
-	if (mixer_name) {
-		rc = ucm_section_set_mixer_name(dev_sec, mixer_name);
-		if (rc)
-			goto error_cleanup;
-	}
-
-	m_name = ucm_get_mixer_names(mgr, dev_name, coupled_mixers, dir,
-				     MIXER_NAME_VOLUME);
-	ucm_section_concat_coupled(dev_sec, m_name);
-
-	DL_APPEND(*sections, dev_sec);
-	ucm_section_dump(dev_sec);
-error_cleanup:
-	free((void *)dev_name);
-	free((void *)dependent_dev_name);
-	free((void *)jack_dev);
-	free((void *)jack_control);
-	free((void *)mixer_name);
-	free((void *)pcm_name);
-	return rc;
-}
-
-struct ucm_section *ucm_get_sections(struct cras_use_case_mgr *mgr)
-{
-	struct ucm_section *sections = NULL;
-	const char **list;
-	int num_devs;
-	int i;
-	char *identifier;
-
-	/* Find the list of all mixers using the control names defined in
-	 * the header definintion for this function.  */
-	identifier = snd_use_case_identifier("_devices/%s", uc_verb(mgr));
-	num_devs = snd_use_case_get_list(mgr->mgr, identifier, &list);
-	free(identifier);
-
-	/* snd_use_case_get_list fills list with pairs of device name and
-	 * comment, so device names are in even-indexed elements. */
-	for (i = 0; i < num_devs; i += 2) {
-		if (ucm_parse_device_section(mgr, list[i], &sections) < 0) {
-			ucm_section_free_list(sections);
-			sections = NULL;
-			break;
-		}
-	}
-
-	if (num_devs > 0)
-		snd_use_case_free_list(list, num_devs);
-	return sections;
-}
-
-char *ucm_get_hotword_models(struct cras_use_case_mgr *mgr)
-{
-	const char **list;
-	int i, num_entries;
-	int models_len = 0;
-	int ret = -ENOMEM;
-	char *models = NULL;
-	const char *model_name;
-	char *identifier;
-	size_t buf_size;
-
-	identifier = snd_use_case_identifier("_modifiers/%s", uc_verb(mgr));
-	if (!identifier)
-		goto err;
-
-	num_entries = snd_use_case_get_list(mgr->mgr, identifier, &list);
-	free(identifier);
-	if (num_entries < 0) {
-		ret = num_entries;
-		goto err;
-	}
-
-	if (num_entries == 0)
-		return NULL;
-
-	buf_size = num_entries * (CRAS_MAX_HOTWORD_MODEL_NAME_SIZE + 1);
-	models = (char *)malloc(buf_size);
-	if (!models) {
-		snd_use_case_free_list(list, num_entries);
-		goto err;
-	}
-
-	for (i = 0; i < num_entries; i += 2) {
-		if (!list[i])
-			continue;
-
-		if (strncmp(list[i], hotword_model_prefix,
-			    strlen(hotword_model_prefix)))
-			continue;
-
-		model_name = list[i] + strlen(hotword_model_prefix);
-		while (isspace(*model_name))
-			model_name++;
-
-		if (strlen(model_name) > CRAS_MAX_HOTWORD_MODEL_NAME_SIZE) {
-			syslog(LOG_ERR,
-			       "Ignore hotword model %s because the it is"
-			       "too long.",
-			       list[i]);
-			continue;
-		}
-
-		if (models_len != 0)
-			models[models_len++] = ',';
-
-		strlcpy(models + models_len, model_name, buf_size - models_len);
-		models_len += strlen(model_name);
-	}
-	models[models_len++] = 0;
-	snd_use_case_free_list(list, num_entries);
-
-	return models;
-err:
-	syslog(LOG_ERR, "Failed to get hotword due to error: %d", ret);
-	return NULL;
-}
-
-void ucm_disable_all_hotword_models(struct cras_use_case_mgr *mgr)
-{
-	const char **list;
-	int num_enmods, mod_idx;
-
-	if (!mgr)
-		return;
-
-	/* Disable all currently enabled hotword model modifiers. */
-	num_enmods = snd_use_case_get_list(mgr->mgr, "_enamods", &list);
-	if (num_enmods <= 0)
-		return;
-
-	for (mod_idx = 0; mod_idx < num_enmods; mod_idx++) {
-		if (!strncmp(list[mod_idx], hotword_model_prefix,
-			     strlen(hotword_model_prefix)))
-			ucm_set_modifier_enabled(mgr, list[mod_idx], 0);
-	}
-	snd_use_case_free_list(list, num_enmods);
-}
-
-static int ucm_is_modifier_enabled(struct cras_use_case_mgr *mgr,
-				   char *modifier, long *value)
-{
-	int rc;
-	char *id;
-	size_t len = strlen(modifier) + 11 + 1;
-
-	id = (char *)malloc(len);
-
-	if (!id)
-		return -ENOMEM;
-
-	snprintf(id, len, "_modstatus/%s", modifier);
-	rc = snd_use_case_geti(mgr->mgr, id, value);
-	free(id);
-	return rc;
-}
-
-int ucm_enable_hotword_model(struct cras_use_case_mgr *mgr)
-{
-	long mod_status;
-
-	if (!mgr->hotword_modifier)
-		return -EINVAL;
-
-	ucm_is_modifier_enabled(mgr, mgr->hotword_modifier, &mod_status);
-
-	if (!mod_status)
-		return ucm_set_modifier_enabled(mgr, mgr->hotword_modifier, 1);
-
-	return -EINVAL;
-}
-
-int ucm_set_hotword_model(struct cras_use_case_mgr *mgr, const char *model)
-{
-	char *model_mod;
-	long mod_status = 0;
-	size_t model_mod_size =
-		strlen(model) + 1 + strlen(hotword_model_prefix) + 1;
-
-	model_mod = (char *)malloc(model_mod_size);
-
-	if (!model_mod)
-		return -ENOMEM;
-	snprintf(model_mod, model_mod_size, "%s %s", hotword_model_prefix,
-		 model);
-	if (!ucm_mod_exists_with_name(mgr, model_mod)) {
-		free((void *)model_mod);
-		return -EINVAL;
-	}
-
-	if (mgr->hotword_modifier &&
-	    !strncmp(mgr->hotword_modifier, model_mod, model_mod_size)) {
-		free((void *)model_mod);
-		return 0;
-	}
-
-	/* If check failed, just move on, dont fail incoming model */
-	if (mgr->hotword_modifier)
-		ucm_is_modifier_enabled(mgr, mgr->hotword_modifier,
-					&mod_status);
-
-	ucm_disable_all_hotword_models(mgr);
-	free(mgr->hotword_modifier);
-	mgr->hotword_modifier = model_mod;
-	if (mod_status)
-		return ucm_enable_hotword_model(mgr);
-	return 0;
-}
-
-int ucm_has_fully_specified_ucm_flag(struct cras_use_case_mgr *mgr)
-{
-	char *flag;
-	int ret = 0;
-	flag = ucm_get_flag(mgr, fully_specified_ucm_var);
-	if (!flag)
-		return 0;
-	ret = !strcmp(flag, "1");
-	free(flag);
-	return ret;
-}
-
-inline const char *
-ucm_get_playback_mixer_elem_for_dev(struct cras_use_case_mgr *mgr,
-				    const char *dev)
-{
-	return ucm_get_value_for_dev(mgr, playback_mixer_elem_var, dev);
-}
-
-inline const char *
-ucm_get_capture_mixer_elem_for_dev(struct cras_use_case_mgr *mgr,
-				   const char *dev)
-{
-	return ucm_get_value_for_dev(mgr, capture_mixer_elem_var, dev);
-}
-
-struct mixer_name *ucm_get_main_volume_names(struct cras_use_case_mgr *mgr)
-{
-	return ucm_get_mixer_names(mgr, "", main_volume_names,
-				   CRAS_STREAM_OUTPUT, MIXER_NAME_MAIN_VOLUME);
-}
-
-int ucm_list_section_devices_by_device_name(
-	struct cras_use_case_mgr *mgr, enum CRAS_STREAM_DIRECTION direction,
-	const char *device_name, ucm_list_section_devices_callback cb,
-	void *cb_arg)
-{
-	int listed = 0;
-	struct section_name *section_names, *c;
-	const char *var;
-	char *identifier;
-
-	if (direction == CRAS_STREAM_OUTPUT)
-		var = playback_device_name_var;
-	else if (direction == CRAS_STREAM_INPUT)
-		var = capture_device_name_var;
-	else
-		return 0;
-
-	identifier = snd_use_case_identifier("_devices/%s", uc_verb(mgr));
-	section_names = ucm_get_sections_for_var(mgr, var, device_name,
-						 identifier, direction);
-	free(identifier);
-	if (!section_names)
-		return 0;
-
-	DL_FOREACH (section_names, c) {
-		cb(c->name, cb_arg);
-		listed++;
-	}
-
-	DL_FOREACH (section_names, c) {
-		DL_DELETE(section_names, c);
-		free((void *)c->name);
-		free(c);
-	}
-	return listed;
-}
-
-inline const char *ucm_get_jack_control_for_dev(struct cras_use_case_mgr *mgr,
-						const char *dev)
-{
-	return ucm_get_value_for_dev(mgr, jack_control_var, dev);
-}
-
-inline const char *ucm_get_jack_dev_for_dev(struct cras_use_case_mgr *mgr,
-					    const char *dev)
-{
-	return ucm_get_value_for_dev(mgr, jack_dev_var, dev);
-}
-
-int ucm_get_jack_switch_for_dev(struct cras_use_case_mgr *mgr, const char *dev)
-{
-	int value;
-
-	int rc = get_int(mgr, jack_switch_var, dev, uc_verb(mgr), &value);
-	if (rc || value < 0)
-		return -1;
-	return value;
-}
-
-unsigned int ucm_get_dma_period_for_dev(struct cras_use_case_mgr *mgr,
-					const char *dev)
-{
-	int value;
-
-	int rc = get_int(mgr, dma_period_var, dev, uc_verb(mgr), &value);
-	if (rc || value < 0)
-		return 0;
-	return value;
-}
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/dbus_bindings/org.chromium.cras.Control.xml b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/dbus_bindings/org.chromium.cras.Control.xml
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/dbus_bindings/org.chromium.cras.Control.xml
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/dbus_bindings/org.chromium.cras.Control.xml
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/dbus_bindings/org.chromium.cras.Telephony.xml b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/dbus_bindings/org.chromium.cras.Telephony.xml
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/dbus_bindings/org.chromium.cras.Telephony.xml
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/dbus_bindings/org.chromium.cras.Telephony.xml
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/dbus_bindings/xmllint.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/dbus_bindings/xmllint.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/dbus_bindings/xmllint.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/dbus_bindings/xmllint.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/examples/cplay.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/examples/cplay.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/examples/cplay.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/examples/cplay.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/examples/cplay_buffer.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/examples/cplay_buffer.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/examples/cplay_buffer.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/examples/cplay_buffer.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/alsa_plugin/ctl_cras.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/alsa_plugin/ctl_cras.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/alsa_plugin/ctl_cras.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/alsa_plugin/ctl_cras.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/alsa_plugin/pcm_cras.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/alsa_plugin/pcm_cras.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/alsa_plugin/pcm_cras.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/alsa_plugin/pcm_cras.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/alsa_benchmark.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/alsa_benchmark.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/alsa_benchmark.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/alsa_benchmark.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/apm_benchmark.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/apm_benchmark.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/apm_benchmark.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/apm_benchmark.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/benchmark_util.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/benchmark_util.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/benchmark_util.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/benchmark_util.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/benchmark_util.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/benchmark_util.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/benchmark_util.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/benchmark_util.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/dsp_benchmark.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/dsp_benchmark.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/dsp_benchmark.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/dsp_benchmark.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/mixer_ops_benchmark.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/mixer_ops_benchmark.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/benchmark/mixer_ops_benchmark.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/benchmark/mixer_ops_benchmark.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/a2dp-codecs.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/a2dp-codecs.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/a2dp-codecs.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/a2dp-codecs.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/array.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/array.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/array.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/array.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/bluetooth.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/bluetooth.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/bluetooth.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/bluetooth.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/byte_buffer.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/byte_buffer.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/byte_buffer.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/byte_buffer.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_audio_codec.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_audio_codec.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_audio_codec.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_audio_codec.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_audio_format.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_audio_format.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_audio_format.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_audio_format.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_audio_format.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_audio_format.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_audio_format.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_audio_format.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_bindgen.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_bindgen.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_bindgen.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_bindgen.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_checksum.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_checksum.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_checksum.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_checksum.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_checksum.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_checksum.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_checksum.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_checksum.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_config.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_config.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_config.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_config.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_config.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_config.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_config.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_config.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_dbus_bindings.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_dbus_bindings.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_dbus_bindings.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_dbus_bindings.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_file_wait.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_file_wait.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_file_wait.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_file_wait.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_file_wait.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_file_wait.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_file_wait.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_file_wait.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_hats.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_hats.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_hats.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_hats.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_hats.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_hats.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_hats.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_hats.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_iodev_info.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_iodev_info.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_iodev_info.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_iodev_info.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_messages.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_messages.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_messages.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_messages.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_metrics.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_metrics.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_metrics.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_metrics.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_metrics.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_metrics.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_metrics.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_metrics.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_observer_ops.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_observer_ops.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_observer_ops.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_observer_ops.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_sbc_codec.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_sbc_codec.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_sbc_codec.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_sbc_codec.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_sbc_codec.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_sbc_codec.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_sbc_codec.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_sbc_codec.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_selinux_helper.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_selinux_helper.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_selinux_helper.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_selinux_helper.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_shm.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_shm.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_shm.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_shm.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_shm.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_shm.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_shm.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_shm.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_string.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_string.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_string.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_string.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_string.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_string.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_string.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_string.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_types.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_types.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_types.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_types.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_util.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_util.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_util.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_util.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_util.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_util.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_util.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_util.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_version.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_version.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/cras_version.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/cras_version.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/dumper.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/dumper.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/dumper.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/dumper.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/dumper.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/dumper.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/dumper.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/dumper.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/edid_utils.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/edid_utils.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/edid_utils.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/edid_utils.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/edid_utils.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/edid_utils.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/edid_utils.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/edid_utils.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/packet_status_logger.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/packet_status_logger.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/packet_status_logger.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/packet_status_logger.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/packet_status_logger.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/packet_status_logger.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/packet_status_logger.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/packet_status_logger.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/rtp.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/rtp.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/rtp.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/rtp.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/sample_buffer.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/sample_buffer.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/sample_buffer.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/sample_buffer.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/sfh.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/sfh.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/sfh.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/sfh.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/sfh.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/sfh.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/sfh.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/sfh.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/strlcpy.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/strlcpy.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/strlcpy.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/strlcpy.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/strlcpy.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/strlcpy.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/strlcpy.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/strlcpy.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/utlist.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/utlist.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/common/utlist.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/common/utlist.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/am.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/am.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/am.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/am.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/am.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/am.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/am.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/am.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/biquad.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/biquad.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/biquad.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/biquad.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/biquad.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/biquad.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/biquad.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/biquad.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/crossover.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/crossover.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/crossover.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/crossover.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/crossover.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/crossover.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/crossover.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/crossover.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/crossover2.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/crossover2.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/crossover2.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/crossover2.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/crossover2.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/crossover2.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/crossover2.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/crossover2.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/dcblock.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/dcblock.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/dcblock.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/dcblock.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/dcblock.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/dcblock.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/dcblock.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/dcblock.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc_kernel.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc_kernel.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc_kernel.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc_kernel.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc_kernel.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc_kernel.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc_kernel.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc_kernel.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc_math.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc_math.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc_math.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc_math.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc_math.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc_math.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/drc_math.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/drc_math.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/dsp_util.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/dsp_util.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/dsp_util.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/dsp_util.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/dsp_util.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/dsp_util.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/dsp_util.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/dsp_util.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/eq.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/eq.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/eq.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/eq.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/eq.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/eq.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/eq.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/eq.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/eq2.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/eq2.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/eq2.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/eq2.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/eq2.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/eq2.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/eq2.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/eq2.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/quad_rotation.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/quad_rotation.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/quad_rotation.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/quad_rotation.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/quad_rotation.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/quad_rotation.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/quad_rotation.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/quad_rotation.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/am_test.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/am_test.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/am_test.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/am_test.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/cmpraw.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/cmpraw.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/cmpraw.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/cmpraw.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/crossover2_test.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/crossover2_test.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/crossover2_test.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/crossover2_test.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/crossover_test.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/crossover_test.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/crossover_test.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/crossover_test.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/dcblock_test.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/dcblock_test.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/dcblock_test.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/dcblock_test.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/drc_test.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/drc_test.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/drc_test.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/drc_test.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/dsp_test_util.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/dsp_test_util.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/dsp_test_util.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/dsp_test_util.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/dsp_test_util.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/dsp_test_util.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/dsp_test_util.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/dsp_test_util.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/dsp_util_test.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/dsp_util_test.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/dsp_util_test.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/dsp_util_test.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/eq2_test.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/eq2_test.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/eq2_test.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/eq2_test.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/eq_test.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/eq_test.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/eq_test.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/eq_test.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/raw.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/raw.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/raw.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/raw.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/raw.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/raw.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/dsp/tests/raw.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/dsp/tests/raw.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/fuzz/cras_fl_media_fuzzer.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/fuzz/cras_fl_media_fuzzer.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/fuzz/cras_fl_media_fuzzer.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/fuzz/cras_fl_media_fuzzer.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/fuzz/cras_hfp_slc.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/fuzz/cras_hfp_slc.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/fuzz/cras_hfp_slc.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/fuzz/cras_hfp_slc.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/fuzz/rclient_message.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/fuzz/rclient_message.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/fuzz/rclient_message.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/fuzz/rclient_message.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/libcras/cras_client.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/libcras/cras_client.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/libcras/cras_client.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/libcras/cras_client.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/libcras/cras_client.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/libcras/cras_client.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/libcras/cras_client.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/libcras/cras_client.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/libcras/cras_helpers.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/libcras/cras_helpers.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/libcras/cras_helpers.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/libcras/cras_helpers.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/libcras/cras_helpers.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/libcras/cras_helpers.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/libcras/cras_helpers.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/libcras/cras_helpers.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/plc/cras_plc.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/plc/cras_plc.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/plc/cras_plc.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/plc/cras_plc.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/plc/cras_plc.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/plc/cras_plc.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/plc/cras_plc.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/plc/cras_plc.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/plc/cras_plc_test.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/plc/cras_plc_test.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/plc/cras_plc_test.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/plc/cras_plc_test.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/plc/parse_sco.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/plc/parse_sco.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/plc/parse_sco.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/plc/parse_sco.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/audio_thread.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/audio_thread.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/audio_thread.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/audio_thread.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/audio_thread.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/audio_thread.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/audio_thread.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/audio_thread.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/audio_thread_log.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/audio_thread_log.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/audio_thread_log.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/audio_thread_log.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/buffer_share.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/buffer_share.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/buffer_share.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/buffer_share.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/buffer_share.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/buffer_share.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/buffer_share.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/buffer_share.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_board_config.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_board_config.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_board_config.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_board_config.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_board_config.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_board_config.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_board_config.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_board_config.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_card_config.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_card_config.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_card_config.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_card_config.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_card_config.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_card_config.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_card_config.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_card_config.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_device_blocklist.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_device_blocklist.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_device_blocklist.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_device_blocklist.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_device_blocklist.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_device_blocklist.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/config/cras_device_blocklist.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/config/cras_device_blocklist.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_endpoint.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_endpoint.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_endpoint.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_endpoint.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_endpoint.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_endpoint.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_endpoint.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_endpoint.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_info.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_info.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_info.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_info.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_info.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_info.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_info.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_info.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_iodev.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_iodev.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_iodev.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_iodev.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_iodev.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_iodev.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_iodev.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_iodev.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_manager.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_manager.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_manager.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_manager.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_manager.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_manager.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_a2dp_manager.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_a2dp_manager.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alert.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alert.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alert.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alert.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alert.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alert.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alert.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alert.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_card.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_card.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_card.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_card.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_card.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_card.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_card.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_card.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_helpers.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_helpers.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_helpers.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_helpers.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_helpers.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_helpers.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_helpers.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_helpers.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_io.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_io.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_io.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_io.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_io.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_io.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_io.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_io.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_jack.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_jack.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_jack.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_jack.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_jack.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_jack.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_jack.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_jack.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer_name.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer_name.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer_name.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer_name.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer_name.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer_name.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer_name.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_mixer_name.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_plugin_io.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_plugin_io.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_plugin_io.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_plugin_io.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_plugin_io.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_plugin_io.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_plugin_io.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_plugin_io.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm.c
new file mode 100644
index 0000000..ebf843a
--- /dev/null
+++ b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm.c
@@ -0,0 +1,1308 @@
+/* Copyright 2012 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include <alsa/asoundlib.h>
+#include <alsa/use-case.h>
+#include <ctype.h>
+#include <string.h>
+#include <syslog.h>
+
+#include "cras_alsa_ucm.h"
+#include "cras_util.h"
+#include "strlcpy.h"
+#include "utlist.h"
+
+static const char jack_control_var[] = "JackControl";
+static const char jack_dev_var[] = "JackDev";
+static const char jack_switch_var[] = "JackSwitch";
+static const char edid_var[] = "EDIDFile";
+static const char cap_var[] = "CaptureControl";
+static const char override_type_name_var[] = "OverrideNodeType";
+static const char dsp_name_var[] = "DspName";
+static const char playback_mixer_elem_var[] = "PlaybackMixerElem";
+static const char capture_mixer_elem_var[] = "CaptureMixerElem";
+static const char min_buffer_level_var[] = "MinBufferLevel";
+static const char dma_period_var[] = "DmaPeriodMicrosecs";
+static const char disable_software_volume[] = "DisableSoftwareVolume";
+static const char playback_device_name_var[] = "PlaybackPCM";
+static const char playback_device_rate_var[] = "PlaybackRate";
+static const char playback_channels_var[] = "PlaybackChannels";
+static const char capture_device_name_var[] = "CapturePCM";
+static const char capture_device_rate_var[] = "CaptureRate";
+static const char capture_channel_map_var[] = "CaptureChannelMap";
+static const char capture_channels_var[] = "CaptureChannels";
+static const char coupled_mixers[] = "CoupledMixers";
+static const char dependent_device_name_var[] = "DependentPCM";
+static const char preempt_hotword_var[] = "PreemptHotword";
+static const char echo_reference_dev_name_var[] = "EchoReferenceDev";
+static const char rtc_proc_echo_cancellation_modifier[] =
+	"RTC Proc Echo Cancellation";
+static const char rtc_proc_noise_suppression_modifier[] =
+	"RTC Proc Noise Suppression";
+static const char rtc_proc_gain_control_modifier[] = "RTC Proc Gain Control";
+
+/* SectionModifier prefixes and suffixes. */
+static const char hotword_model_prefix[] = "Hotword Model";
+static const char swap_mode_suffix[] = "Swap Mode";
+static const char noise_cancellation_suffix[] = "Noise Cancellation";
+
+/*
+ * Set this value in a SectionDevice to specify the intrinsic sensitivity in
+ * 0.01 dBFS/Pa. It currently only supports input devices. You should get the
+ * value by recording samples without either hardware or software gain. We are
+ * still working on building a standard process for measuring it. The value you
+ * see now in our UCM is just estimated value. If it is set, CRAS will enable
+ * software gain and use the value as a reference for calculating the
+ * appropriate software gain to apply to the device to meet our target volume.
+ */
+static const char intrinsic_sensitivity_var[] = "IntrinsicSensitivity";
+
+/*
+ * Set this value in a SectionDevice to specify the default node gain in
+ * 0.01 dB.
+ */
+static const char default_node_gain[] = "DefaultNodeGain";
+static const char fully_specified_ucm_var[] = "FullySpecifiedUCM";
+static const char main_volume_names[] = "MainVolumeNames";
+
+/* Use case verbs corresponding to CRAS_STREAM_TYPE. */
+static const char *use_case_verbs[] = {
+	"HiFi",	  "Multimedia", "Voice Call",
+	"Speech", "Pro Audio",	"Accessibility",
+};
+
+static const size_t max_section_name_len = 100;
+
+/* Represents a list of section names found in UCM. */
+struct section_name {
+	const char *name;
+	struct section_name *prev, *next;
+};
+
+struct cras_use_case_mgr {
+	snd_use_case_mgr_t *mgr;
+	char *name;
+	unsigned int avail_use_cases;
+	enum CRAS_STREAM_TYPE use_case;
+	char *hotword_modifier;
+};
+
+static inline const char *uc_verb(struct cras_use_case_mgr *mgr)
+{
+	return use_case_verbs[mgr->use_case];
+}
+
+static int device_enabled(struct cras_use_case_mgr *mgr, const char *dev)
+{
+	const char **list;
+	unsigned int i;
+	int num_devs;
+	int enabled = 0;
+
+	num_devs = snd_use_case_get_list(mgr->mgr, "_enadevs", &list);
+	if (num_devs <= 0)
+		return num_devs;
+
+	for (i = 0; i < (unsigned int)num_devs; i++)
+		if (!strcmp(dev, list[i])) {
+			enabled = 1;
+			break;
+		}
+
+	snd_use_case_free_list(list, num_devs);
+	return enabled;
+}
+
+static int modifier_enabled(struct cras_use_case_mgr *mgr, const char *mod)
+{
+	const char **list;
+	unsigned int mod_idx;
+	int num_mods;
+
+	num_mods = snd_use_case_get_list(mgr->mgr, "_enamods", &list);
+	if (num_mods <= 0)
+		return num_mods;
+
+	for (mod_idx = 0; mod_idx < (unsigned int)num_mods; mod_idx++)
+		if (!strcmp(mod, list[mod_idx]))
+			break;
+
+	snd_use_case_free_list(list, num_mods);
+	return (mod_idx < (unsigned int)num_mods);
+}
+
+static int get_var(struct cras_use_case_mgr *mgr, const char *var,
+		   const char *dev, const char *verb, const char **value)
+{
+	char *id;
+	int rc;
+	size_t len = strlen(var) + strlen(dev) + strlen(verb) + 4;
+
+	id = (char *)malloc(len);
+	if (!id)
+		return -ENOMEM;
+	snprintf(id, len, "=%s/%s/%s", var, dev, verb);
+	rc = snd_use_case_get(mgr->mgr, id, value);
+
+	free((void *)id);
+	return rc;
+}
+
+static int get_int(struct cras_use_case_mgr *mgr, const char *var,
+		   const char *dev, const char *verb, int *value)
+{
+	const char *str_value;
+	int rc;
+
+	if (!value)
+		return -EINVAL;
+	rc = get_var(mgr, var, dev, verb, &str_value);
+	if (rc != 0)
+		return rc;
+	*value = atoi(str_value);
+	free((void *)str_value);
+	return 0;
+}
+
+static int ucm_set_modifier_enabled(struct cras_use_case_mgr *mgr,
+				    const char *mod, int enable)
+{
+	int rc;
+
+	rc = snd_use_case_set(mgr->mgr, enable ? "_enamod" : "_dismod", mod);
+	if (rc)
+		syslog(LOG_ERR, "Can not %s UCM modifier %s, rc = %d",
+		       enable ? "enable" : "disable", mod, rc);
+	return rc;
+}
+
+static int ucm_str_ends_with_suffix(const char *str, const char *suffix)
+{
+	if (!str || !suffix)
+		return 0;
+	size_t len_str = strlen(str);
+	size_t len_suffix = strlen(suffix);
+	if (len_suffix > len_str)
+		return 0;
+	return strncmp(str + len_str - len_suffix, suffix, len_suffix) == 0;
+}
+
+static int ucm_section_exists_with_name(struct cras_use_case_mgr *mgr,
+					const char *name,
+					const char *identifier)
+{
+	const char **list;
+	unsigned int i;
+	int num_entries;
+	int exist = 0;
+
+	num_entries = snd_use_case_get_list(mgr->mgr, identifier, &list);
+	if (num_entries <= 0)
+		return num_entries;
+
+	for (i = 0; i < (unsigned int)num_entries; i += 2) {
+		if (!list[i])
+			continue;
+
+		if (strcmp(list[i], name) == 0) {
+			exist = 1;
+			break;
+		}
+	}
+	snd_use_case_free_list(list, num_entries);
+	return exist;
+}
+
+static int ucm_section_exists_with_suffix(struct cras_use_case_mgr *mgr,
+					  const char *suffix,
+					  const char *identifier)
+{
+	const char **list;
+	unsigned int i;
+	int num_entries;
+	int exist = 0;
+
+	num_entries = snd_use_case_get_list(mgr->mgr, identifier, &list);
+	if (num_entries <= 0)
+		return num_entries;
+
+	for (i = 0; i < (unsigned int)num_entries; i += 2) {
+		if (!list[i])
+			continue;
+
+		if (ucm_str_ends_with_suffix(list[i], suffix)) {
+			exist = 1;
+			break;
+		}
+	}
+	snd_use_case_free_list(list, num_entries);
+	return exist;
+}
+
+static int ucm_mod_exists_with_suffix(struct cras_use_case_mgr *mgr,
+				      const char *suffix)
+{
+	char *identifier;
+	int rc;
+
+	identifier = snd_use_case_identifier("_modifiers/%s", uc_verb(mgr));
+	rc = ucm_section_exists_with_suffix(mgr, suffix, identifier);
+	free(identifier);
+	return rc;
+}
+
+static int ucm_mod_exists_with_name(struct cras_use_case_mgr *mgr,
+				    const char *name)
+{
+	char *identifier;
+	int rc;
+
+	identifier = snd_use_case_identifier("_modifiers/%s", uc_verb(mgr));
+	rc = ucm_section_exists_with_name(mgr, name, identifier);
+	free(identifier);
+	return rc;
+}
+
+/* Get a list of section names whose variable is the matched value. */
+static struct section_name *
+ucm_get_sections_for_var(struct cras_use_case_mgr *mgr, const char *var,
+			 const char *value, const char *identifier,
+			 enum CRAS_STREAM_DIRECTION direction)
+{
+	const char **list;
+	struct section_name *section_names = NULL, *s_name;
+	unsigned int i;
+	int num_entries;
+	int rc;
+
+	num_entries = snd_use_case_get_list(mgr->mgr, identifier, &list);
+	if (num_entries <= 0)
+		return NULL;
+
+	/* snd_use_case_get_list fills list with pairs of device name and
+	 * comment, so device names are in even-indexed elements. */
+	for (i = 0; i < (unsigned int)num_entries; i += 2) {
+		const char *this_value;
+
+		if (!list[i])
+			continue;
+
+		rc = get_var(mgr, var, list[i], uc_verb(mgr), &this_value);
+		if (rc)
+			continue;
+
+		if (!strcmp(value, this_value)) {
+			s_name = (struct section_name *)malloc(
+				sizeof(struct section_name));
+
+			if (!s_name) {
+				syslog(LOG_ERR, "Failed to allocate memory");
+				free((void *)this_value);
+				break;
+			}
+
+			s_name->name = strdup(list[i]);
+			DL_APPEND(section_names, s_name);
+		}
+		free((void *)this_value);
+	}
+
+	snd_use_case_free_list(list, num_entries);
+	return section_names;
+}
+
+static struct section_name *
+ucm_get_devices_for_var(struct cras_use_case_mgr *mgr, const char *var,
+			const char *value, enum CRAS_STREAM_DIRECTION dir)
+{
+	char *identifier;
+	struct section_name *section_names;
+
+	identifier = snd_use_case_identifier("_devices/%s", uc_verb(mgr));
+	section_names =
+		ucm_get_sections_for_var(mgr, var, value, identifier, dir);
+	free(identifier);
+	return section_names;
+}
+
+static const char *ucm_get_value_for_dev(struct cras_use_case_mgr *mgr,
+					 const char *value_var, const char *dev)
+{
+	const char *name = NULL;
+	int rc;
+
+	rc = get_var(mgr, value_var, dev, uc_verb(mgr), &name);
+	if (rc)
+		return NULL;
+
+	return name;
+}
+
+static inline const char *
+ucm_get_playback_device_name_for_dev(struct cras_use_case_mgr *mgr,
+				     const char *dev)
+{
+	return ucm_get_value_for_dev(mgr, playback_device_name_var, dev);
+}
+
+static inline const char *
+ucm_get_capture_device_name_for_dev(struct cras_use_case_mgr *mgr,
+				    const char *dev)
+{
+	return ucm_get_value_for_dev(mgr, capture_device_name_var, dev);
+}
+
+/* Gets the value of DependentPCM property. This is used to structure two
+ * SectionDevices under one cras iodev to avoid two PCMs be open at the
+ * same time because of restriction in lower layer driver or hardware.
+ */
+static inline const char *
+ucm_get_dependent_device_name_for_dev(struct cras_use_case_mgr *mgr,
+				      const char *dev)
+{
+	return ucm_get_value_for_dev(mgr, dependent_device_name_var, dev);
+}
+
+/* Get a list of mixer names specified in a UCM variable separated by ",".
+ * E.g. "Left Playback,Right Playback".
+ */
+static struct mixer_name *ucm_get_mixer_names(struct cras_use_case_mgr *mgr,
+					      const char *dev, const char *var,
+					      enum CRAS_STREAM_DIRECTION dir,
+					      mixer_name_type type)
+{
+	const char *names_in_string = NULL;
+	int rc;
+	char *tokens, *name;
+	char *laststr = NULL;
+	struct mixer_name *names = NULL;
+
+	rc = get_var(mgr, var, dev, uc_verb(mgr), &names_in_string);
+	if (rc)
+		return NULL;
+
+	tokens = strdup(names_in_string);
+	name = strtok_r(tokens, ",", &laststr);
+	while (name != NULL) {
+		names = mixer_name_add(names, name, dir, type);
+		name = strtok_r(NULL, ",", &laststr);
+	}
+	free((void *)names_in_string);
+	free(tokens);
+	return names;
+}
+
+/* Gets the modifier name of Noise Cancellation for the given node_name. */
+static void ucm_get_node_noise_cancellation_name(const char *node_name,
+						 char *mod_name)
+{
+	size_t len =
+		strlen(node_name) + 1 + strlen(noise_cancellation_suffix) + 1;
+	if (len > max_section_name_len) {
+		syslog(LOG_ERR,
+		       "Length of the given section name is %zu > %zu(max)",
+		       len, max_section_name_len);
+		len = max_section_name_len;
+	}
+	snprintf(mod_name, len, "%s %s", node_name, noise_cancellation_suffix);
+}
+
+/* Exported Interface */
+
+struct cras_use_case_mgr *ucm_create(const char *name)
+{
+	struct cras_use_case_mgr *mgr;
+	int rc;
+	const char **list;
+	int num_verbs, i, j;
+
+	assert_on_compile(ARRAY_SIZE(use_case_verbs) == CRAS_STREAM_NUM_TYPES);
+
+	if (!name)
+		return NULL;
+
+	mgr = (struct cras_use_case_mgr *)malloc(sizeof(*mgr));
+	if (!mgr)
+		return NULL;
+
+	mgr->name = strdup(name);
+	if (!mgr->name)
+		goto cleanup;
+
+	rc = snd_use_case_mgr_open(&mgr->mgr, name);
+	if (rc) {
+		syslog(LOG_WARNING, "Can not open ucm for card %s, rc = %d",
+		       name, rc);
+		goto cleanup;
+	}
+
+	mgr->avail_use_cases = 0;
+	mgr->hotword_modifier = NULL;
+	num_verbs = snd_use_case_get_list(mgr->mgr, "_verbs", &list);
+	for (i = 0; i < num_verbs; i += 2) {
+		for (j = 0; j < CRAS_STREAM_NUM_TYPES; ++j) {
+			if (strcmp(list[i], use_case_verbs[j]) == 0)
+				break;
+		}
+		if (j < CRAS_STREAM_NUM_TYPES)
+			mgr->avail_use_cases |= (1 << j);
+	}
+	if (num_verbs > 0)
+		snd_use_case_free_list(list, num_verbs);
+
+	rc = ucm_set_use_case(mgr, CRAS_STREAM_TYPE_DEFAULT);
+	if (rc)
+		goto cleanup_mgr;
+
+	return mgr;
+
+cleanup_mgr:
+	snd_use_case_mgr_close(mgr->mgr);
+cleanup:
+	free(mgr->name);
+	free(mgr);
+	return NULL;
+}
+
+void ucm_destroy(struct cras_use_case_mgr *mgr)
+{
+	snd_use_case_mgr_close(mgr->mgr);
+	free(mgr->hotword_modifier);
+	free(mgr->name);
+	free(mgr);
+}
+
+int ucm_set_use_case(struct cras_use_case_mgr *mgr,
+		     enum CRAS_STREAM_TYPE use_case)
+{
+	int rc;
+
+	if (mgr->avail_use_cases & (1 << use_case)) {
+		mgr->use_case = use_case;
+	} else {
+		syslog(LOG_ERR, "Unavailable use case %d for card %s", use_case,
+		       mgr->name);
+		return -1;
+	}
+
+	rc = snd_use_case_set(mgr->mgr, "_verb", uc_verb(mgr));
+	if (rc) {
+		syslog(LOG_ERR, "Can not set verb %s for card %s, rc = %d",
+		       uc_verb(mgr), mgr->name, rc);
+		return rc;
+	}
+
+	return 0;
+}
+
+int ucm_swap_mode_exists(struct cras_use_case_mgr *mgr)
+{
+	return ucm_mod_exists_with_suffix(mgr, swap_mode_suffix);
+}
+
+int ucm_enable_swap_mode(struct cras_use_case_mgr *mgr, const char *node_name,
+			 int enable)
+{
+	char *swap_mod = NULL;
+	int rc;
+	size_t len = strlen(node_name) + 1 + strlen(swap_mode_suffix) + 1;
+	swap_mod = (char *)malloc(len);
+	if (!swap_mod)
+		return -ENOMEM;
+	snprintf(swap_mod, len, "%s %s", node_name, swap_mode_suffix);
+	if (!ucm_mod_exists_with_name(mgr, swap_mod)) {
+		syslog(LOG_ERR, "Can not find swap mode modifier %s.",
+		       swap_mod);
+		free((void *)swap_mod);
+		return -EPERM;
+	}
+	if (modifier_enabled(mgr, swap_mod) == !!enable) {
+		free((void *)swap_mod);
+		return 0;
+	}
+	rc = ucm_set_modifier_enabled(mgr, swap_mod, enable);
+	free((void *)swap_mod);
+	return rc;
+}
+
+static int ucm_modifier_try_enable(struct cras_use_case_mgr *mgr, int enable,
+				   const char *name)
+{
+	if (!ucm_mod_exists_with_name(mgr, name)) {
+		syslog(LOG_ERR, "Can not find modifier %s.", name);
+		return -ENOTSUP;
+	}
+	if (modifier_enabled(mgr, name) == !!enable) {
+		syslog(LOG_DEBUG, "Modifier %s is already %s.", name,
+		       enable ? "enabled" : "disabled");
+		return 0;
+	}
+
+	syslog(LOG_DEBUG, "UCM %s Modifier %s", enable ? "enable" : "disable",
+	       name);
+	return ucm_set_modifier_enabled(mgr, name, enable);
+}
+
+int inline ucm_node_echo_cancellation_exists(struct cras_use_case_mgr *mgr)
+{
+	return ucm_mod_exists_with_name(mgr,
+					rtc_proc_echo_cancellation_modifier);
+}
+
+int inline ucm_enable_node_echo_cancellation(struct cras_use_case_mgr *mgr,
+					     int enable)
+{
+	return ucm_modifier_try_enable(mgr, enable,
+				       rtc_proc_echo_cancellation_modifier);
+}
+
+int inline ucm_node_noise_suppression_exists(struct cras_use_case_mgr *mgr)
+{
+	return ucm_mod_exists_with_name(mgr,
+					rtc_proc_noise_suppression_modifier);
+}
+
+int inline ucm_enable_node_noise_suppression(struct cras_use_case_mgr *mgr,
+					     int enable)
+{
+	return ucm_modifier_try_enable(mgr, enable,
+				       rtc_proc_noise_suppression_modifier);
+}
+
+int inline ucm_node_gain_control_exists(struct cras_use_case_mgr *mgr)
+{
+	return ucm_mod_exists_with_name(mgr, rtc_proc_gain_control_modifier);
+}
+
+int inline ucm_enable_node_gain_control(struct cras_use_case_mgr *mgr,
+					int enable)
+{
+	return ucm_modifier_try_enable(mgr, enable,
+				       rtc_proc_gain_control_modifier);
+}
+
+int ucm_node_noise_cancellation_exists(struct cras_use_case_mgr *mgr,
+				       const char *node_name)
+{
+	char node_modifier_name[max_section_name_len];
+
+	ucm_get_node_noise_cancellation_name(node_name, node_modifier_name);
+	return ucm_mod_exists_with_name(mgr, node_modifier_name);
+}
+
+int ucm_enable_node_noise_cancellation(struct cras_use_case_mgr *mgr,
+				       const char *node_name, int enable)
+{
+	char node_modifier_name[max_section_name_len];
+
+	ucm_get_node_noise_cancellation_name(node_name, node_modifier_name);
+	return ucm_modifier_try_enable(mgr, enable, node_modifier_name);
+}
+
+int ucm_set_enabled(struct cras_use_case_mgr *mgr, const char *dev, int enable)
+{
+	int rc;
+	if (device_enabled(mgr, dev) == !!enable)
+		return 0;
+	syslog(LOG_DEBUG, "UCM %s %s", enable ? "enable" : "disable", dev);
+	rc = snd_use_case_set(mgr->mgr, enable ? "_enadev" : "_disdev", dev);
+	if (rc && (rc != -ENOENT || ucm_has_fully_specified_ucm_flag(mgr))) {
+		syslog(LOG_ERR, "Can not %s UCM for device %s, rc = %d",
+		       enable ? "enable" : "disable", dev, rc);
+	}
+	return rc;
+}
+
+char *ucm_get_flag(struct cras_use_case_mgr *mgr, const char *flag_name)
+{
+	char *flag_value = NULL;
+	const char *value;
+	int rc;
+
+	/* Set device to empty string since flag is specified in verb section */
+	rc = get_var(mgr, flag_name, "", uc_verb(mgr), &value);
+	if (!rc) {
+		flag_value = strdup(value);
+		free((void *)value);
+	}
+
+	return flag_value;
+}
+
+char *ucm_get_cap_control(struct cras_use_case_mgr *mgr, const char *ucm_dev)
+{
+	char *control_name = NULL;
+	const char *value;
+	int rc;
+
+	rc = get_var(mgr, cap_var, ucm_dev, uc_verb(mgr), &value);
+	if (!rc) {
+		control_name = strdup(value);
+		free((void *)value);
+	}
+
+	return control_name;
+}
+
+inline const char *ucm_get_override_type_name(struct cras_use_case_mgr *mgr,
+					      const char *dev)
+{
+	return ucm_get_value_for_dev(mgr, override_type_name_var, dev);
+}
+
+char *ucm_get_dev_for_jack(struct cras_use_case_mgr *mgr, const char *jack,
+			   enum CRAS_STREAM_DIRECTION direction)
+{
+	struct section_name *section_names, *c;
+	char *ret = NULL;
+
+	section_names =
+		ucm_get_devices_for_var(mgr, jack_dev_var, jack, direction);
+
+	DL_FOREACH (section_names, c) {
+		if (!strcmp(c->name, "Mic")) {
+			/* Skip mic section for output */
+			if (direction == CRAS_STREAM_OUTPUT)
+				continue;
+		} else {
+			/* Only check mic for input. */
+			if (direction == CRAS_STREAM_INPUT)
+				continue;
+		}
+		ret = strdup(c->name);
+		break;
+	}
+
+	DL_FOREACH (section_names, c) {
+		DL_DELETE(section_names, c);
+		free((void *)c->name);
+		free(c);
+	}
+
+	return ret;
+}
+
+char *ucm_get_dev_for_mixer(struct cras_use_case_mgr *mgr, const char *mixer,
+			    enum CRAS_STREAM_DIRECTION dir)
+{
+	struct section_name *section_names = NULL, *c;
+	char *ret = NULL;
+
+	if (dir == CRAS_STREAM_OUTPUT) {
+		section_names = ucm_get_devices_for_var(
+			mgr, playback_mixer_elem_var, mixer, dir);
+	} else if (dir == CRAS_STREAM_INPUT) {
+		section_names = ucm_get_devices_for_var(
+			mgr, capture_mixer_elem_var, mixer, dir);
+	}
+
+	if (section_names)
+		ret = strdup(section_names->name);
+
+	DL_FOREACH (section_names, c) {
+		DL_DELETE(section_names, c);
+		free((void *)c->name);
+		free(c);
+	}
+
+	return ret;
+}
+
+inline const char *ucm_get_edid_file_for_dev(struct cras_use_case_mgr *mgr,
+					     const char *dev)
+{
+	return ucm_get_value_for_dev(mgr, edid_var, dev);
+}
+
+inline const char *ucm_get_dsp_name_for_dev(struct cras_use_case_mgr *mgr,
+					    const char *dev)
+{
+	return ucm_get_value_for_dev(mgr, dsp_name_var, dev);
+}
+
+int ucm_get_min_buffer_level(struct cras_use_case_mgr *mgr, unsigned int *level)
+{
+	int value;
+	int rc;
+
+	rc = get_int(mgr, min_buffer_level_var, "", uc_verb(mgr), &value);
+	if (rc)
+		return -ENOENT;
+	*level = value;
+
+	return 0;
+}
+
+unsigned int ucm_get_disable_software_volume(struct cras_use_case_mgr *mgr)
+{
+	int value;
+	int rc;
+
+	rc = get_int(mgr, disable_software_volume, "", uc_verb(mgr), &value);
+	if (rc)
+		return 0;
+
+	return value;
+}
+
+int ucm_get_default_node_gain(struct cras_use_case_mgr *mgr, const char *dev,
+			      long *gain)
+{
+	int value;
+	int rc;
+
+	rc = get_int(mgr, default_node_gain, dev, uc_verb(mgr), &value);
+	if (rc)
+		return rc;
+	*gain = value;
+	return 0;
+}
+
+int ucm_get_intrinsic_sensitivity(struct cras_use_case_mgr *mgr,
+				  const char *dev, long *sensitivity)
+{
+	int value;
+	int rc;
+
+	rc = get_int(mgr, intrinsic_sensitivity_var, dev, uc_verb(mgr), &value);
+	if (rc)
+		return rc;
+	*sensitivity = value;
+	return 0;
+}
+
+int ucm_get_preempt_hotword(struct cras_use_case_mgr *mgr, const char *dev)
+{
+	int value;
+	int rc;
+
+	rc = get_int(mgr, preempt_hotword_var, dev, uc_verb(mgr), &value);
+	if (rc)
+		return 0;
+	return value;
+}
+
+static int get_device_index_from_target(const char *target_device_name);
+
+int ucm_get_alsa_dev_idx_for_dev(struct cras_use_case_mgr *mgr, const char *dev,
+				 enum CRAS_STREAM_DIRECTION direction)
+{
+	const char *pcm_name = NULL;
+	int dev_idx = -1;
+
+	if (direction == CRAS_STREAM_OUTPUT)
+		pcm_name = ucm_get_playback_device_name_for_dev(mgr, dev);
+	else if (direction == CRAS_STREAM_INPUT)
+		pcm_name = ucm_get_capture_device_name_for_dev(mgr, dev);
+
+	if (pcm_name) {
+		dev_idx = get_device_index_from_target(pcm_name);
+		free((void *)pcm_name);
+	}
+	return dev_idx;
+}
+
+inline const char *
+ucm_get_echo_reference_dev_name_for_dev(struct cras_use_case_mgr *mgr,
+					const char *dev)
+{
+	return ucm_get_value_for_dev(mgr, echo_reference_dev_name_var, dev);
+}
+
+int ucm_get_sample_rate_for_dev(struct cras_use_case_mgr *mgr, const char *dev,
+				enum CRAS_STREAM_DIRECTION direction)
+{
+	int value;
+	int rc;
+	const char *var_name;
+
+	if (direction == CRAS_STREAM_OUTPUT)
+		var_name = playback_device_rate_var;
+	else if (direction == CRAS_STREAM_INPUT)
+		var_name = capture_device_rate_var;
+	else
+		return -EINVAL;
+
+	rc = get_int(mgr, var_name, dev, uc_verb(mgr), &value);
+	if (rc)
+		return rc;
+
+	return value;
+}
+
+int ucm_get_channels_for_dev(struct cras_use_case_mgr *mgr, const char *dev,
+			     enum CRAS_STREAM_DIRECTION direction,
+			     size_t *channels)
+{
+	int value;
+	int rc;
+	const char *var_name;
+
+	if (direction == CRAS_STREAM_OUTPUT)
+		var_name = playback_channels_var;
+	else if (direction == CRAS_STREAM_INPUT)
+		var_name = capture_channels_var;
+	else
+		return -EINVAL;
+
+	rc = get_int(mgr, var_name, dev, uc_verb(mgr), &value);
+	if (rc)
+		return rc;
+	if (value < 0)
+		return -1;
+
+	*channels = (size_t)value;
+	return 0;
+}
+
+int ucm_get_capture_chmap_for_dev(struct cras_use_case_mgr *mgr,
+				  const char *dev, int8_t *channel_layout)
+{
+	const char *var_str;
+	char *tokens, *token;
+	int i, rc;
+
+	rc = get_var(mgr, capture_channel_map_var, dev, uc_verb(mgr), &var_str);
+	if (rc)
+		return rc;
+
+	tokens = strdup(var_str);
+	token = strtok(tokens, " ");
+	for (i = 0; token && (i < CRAS_CH_MAX); i++) {
+		channel_layout[i] = atoi(token);
+		token = strtok(NULL, " ");
+	}
+
+	free((void *)tokens);
+	free((void *)var_str);
+	return (i == CRAS_CH_MAX) ? 0 : -EINVAL;
+}
+
+struct mixer_name *ucm_get_coupled_mixer_names(struct cras_use_case_mgr *mgr,
+					       const char *dev)
+{
+	return ucm_get_mixer_names(mgr, dev, coupled_mixers, CRAS_STREAM_OUTPUT,
+				   MIXER_NAME_VOLUME);
+}
+
+static int get_device_index_from_target(const char *target_device_name)
+{
+	/* Expects a string in the form: hw:card-name,<num> */
+	const char *pos = target_device_name;
+	if (!pos)
+		return -1;
+	while (*pos && *pos != ',')
+		++pos;
+	if (*pos == ',') {
+		++pos;
+		return atoi(pos);
+	}
+	return -1;
+}
+
+static const char *ucm_get_dir_for_device(struct cras_use_case_mgr *mgr,
+					  const char *dev_name,
+					  enum CRAS_STREAM_DIRECTION *dir)
+{
+	const char *pcm_name;
+
+	pcm_name = ucm_get_playback_device_name_for_dev(mgr, dev_name);
+
+	if (pcm_name) {
+		*dir = CRAS_STREAM_OUTPUT;
+		return pcm_name;
+	}
+
+	pcm_name = ucm_get_capture_device_name_for_dev(mgr, dev_name);
+	if (pcm_name) {
+		*dir = CRAS_STREAM_INPUT;
+		return pcm_name;
+	}
+
+	*dir = CRAS_STREAM_UNDEFINED;
+	return NULL;
+}
+
+static int ucm_parse_device_section(struct cras_use_case_mgr *mgr,
+				    const char *dev,
+				    struct ucm_section **sections)
+{
+	enum CRAS_STREAM_DIRECTION dir;
+	int dev_idx = -1;
+	int dependent_dev_idx = -1;
+	const char *jack_name = NULL;
+	const char *jack_type = NULL;
+	const char *jack_dev = NULL;
+	const char *jack_control = NULL;
+	const char *mixer_name = NULL;
+	struct mixer_name *m_name;
+	int rc = 0;
+	const char *pcm_name;
+	const char *dependent_dev_name = NULL;
+	struct ucm_section *dev_sec;
+	const char *dev_name;
+
+	dev_name = strdup(dev);
+	if (!dev_name)
+		return 0;
+
+	pcm_name = ucm_get_dir_for_device(mgr, dev_name, &dir);
+
+	if (pcm_name)
+		dev_idx = get_device_index_from_target(pcm_name);
+
+	if (dir == CRAS_STREAM_UNDEFINED) {
+		syslog(LOG_ERR,
+		       "UCM configuration for device '%s' missing"
+		       " PlaybackPCM or CapturePCM definition.",
+		       dev_name);
+		rc = -EINVAL;
+		goto error_cleanup;
+	}
+
+	dependent_dev_name =
+		ucm_get_dependent_device_name_for_dev(mgr, dev_name);
+	if (dependent_dev_name) {
+		dependent_dev_idx =
+			get_device_index_from_target(dependent_dev_name);
+	}
+
+	jack_dev = ucm_get_jack_dev_for_dev(mgr, dev_name);
+	jack_control = ucm_get_jack_control_for_dev(mgr, dev_name);
+	if (dir == CRAS_STREAM_OUTPUT)
+		mixer_name = ucm_get_playback_mixer_elem_for_dev(mgr, dev_name);
+	else if (dir == CRAS_STREAM_INPUT)
+		mixer_name = ucm_get_capture_mixer_elem_for_dev(mgr, dev_name);
+
+	if (jack_dev) {
+		jack_name = jack_dev;
+		jack_type = "gpio";
+	} else if (jack_control) {
+		jack_name = jack_control;
+		jack_type = "hctl";
+	}
+
+	dev_sec = ucm_section_create(dev_name, pcm_name, dev_idx,
+				     dependent_dev_idx, dir, jack_name,
+				     jack_type);
+
+	if (!dev_sec) {
+		syslog(LOG_ERR, "Failed to allocate memory.");
+		rc = -ENOMEM;
+		goto error_cleanup;
+	}
+
+	dev_sec->jack_switch = ucm_get_jack_switch_for_dev(mgr, dev_name);
+
+	if (mixer_name) {
+		rc = ucm_section_set_mixer_name(dev_sec, mixer_name);
+		if (rc)
+			goto error_cleanup;
+	}
+
+	m_name = ucm_get_mixer_names(mgr, dev_name, coupled_mixers, dir,
+				     MIXER_NAME_VOLUME);
+	ucm_section_concat_coupled(dev_sec, m_name);
+
+	DL_APPEND(*sections, dev_sec);
+	ucm_section_dump(dev_sec);
+error_cleanup:
+	free((void *)dev_name);
+	free((void *)dependent_dev_name);
+	free((void *)jack_dev);
+	free((void *)jack_control);
+	free((void *)mixer_name);
+	free((void *)pcm_name);
+	return rc;
+}
+
+struct ucm_section *ucm_get_sections(struct cras_use_case_mgr *mgr)
+{
+	struct ucm_section *sections = NULL;
+	const char **list;
+	int num_devs;
+	int i;
+	char *identifier;
+
+	/* Find the list of all mixers using the control names defined in
+	 * the header definintion for this function.  */
+	identifier = snd_use_case_identifier("_devices/%s", uc_verb(mgr));
+	num_devs = snd_use_case_get_list(mgr->mgr, identifier, &list);
+	free(identifier);
+
+	/* snd_use_case_get_list fills list with pairs of device name and
+	 * comment, so device names are in even-indexed elements. */
+	for (i = 0; i < num_devs; i += 2) {
+		if (ucm_parse_device_section(mgr, list[i], &sections) < 0) {
+			ucm_section_free_list(sections);
+			sections = NULL;
+			break;
+		}
+	}
+
+	if (num_devs > 0)
+		snd_use_case_free_list(list, num_devs);
+	return sections;
+}
+
+char *ucm_get_hotword_models(struct cras_use_case_mgr *mgr)
+{
+	const char **list;
+	int i, num_entries;
+	int models_len = 0;
+	int ret = -ENOMEM;
+	char *models = NULL;
+	const char *model_name;
+	char *identifier;
+	size_t buf_size;
+
+	identifier = snd_use_case_identifier("_modifiers/%s", uc_verb(mgr));
+	if (!identifier)
+		goto err;
+
+	num_entries = snd_use_case_get_list(mgr->mgr, identifier, &list);
+	free(identifier);
+	if (num_entries < 0) {
+		ret = num_entries;
+		goto err;
+	}
+
+	if (num_entries == 0)
+		return NULL;
+
+	buf_size = num_entries * (CRAS_MAX_HOTWORD_MODEL_NAME_SIZE + 1);
+	models = (char *)malloc(buf_size);
+	if (!models) {
+		snd_use_case_free_list(list, num_entries);
+		goto err;
+	}
+
+	for (i = 0; i < num_entries; i += 2) {
+		if (!list[i])
+			continue;
+
+		if (strncmp(list[i], hotword_model_prefix,
+			    strlen(hotword_model_prefix)))
+			continue;
+
+		model_name = list[i] + strlen(hotword_model_prefix);
+		while (isspace(*model_name))
+			model_name++;
+
+		if (strlen(model_name) > CRAS_MAX_HOTWORD_MODEL_NAME_SIZE) {
+			syslog(LOG_ERR,
+			       "Ignore hotword model %s because the it is"
+			       "too long.",
+			       list[i]);
+			continue;
+		}
+
+		if (models_len != 0)
+			models[models_len++] = ',';
+
+		strlcpy(models + models_len, model_name, buf_size - models_len);
+		models_len += strlen(model_name);
+	}
+	models[models_len++] = 0;
+	snd_use_case_free_list(list, num_entries);
+
+	return models;
+err:
+	syslog(LOG_ERR, "Failed to get hotword due to error: %d", ret);
+	return NULL;
+}
+
+void ucm_disable_all_hotword_models(struct cras_use_case_mgr *mgr)
+{
+	const char **list;
+	int num_enmods, mod_idx;
+
+	if (!mgr)
+		return;
+
+	/* Disable all currently enabled hotword model modifiers. */
+	num_enmods = snd_use_case_get_list(mgr->mgr, "_enamods", &list);
+	if (num_enmods <= 0)
+		return;
+
+	for (mod_idx = 0; mod_idx < num_enmods; mod_idx++) {
+		if (!strncmp(list[mod_idx], hotword_model_prefix,
+			     strlen(hotword_model_prefix)))
+			ucm_set_modifier_enabled(mgr, list[mod_idx], 0);
+	}
+	snd_use_case_free_list(list, num_enmods);
+}
+
+static int ucm_is_modifier_enabled(struct cras_use_case_mgr *mgr,
+				   char *modifier, long *value)
+{
+	int rc;
+	char *id;
+	size_t len = strlen(modifier) + 11 + 1;
+
+	id = (char *)malloc(len);
+
+	if (!id)
+		return -ENOMEM;
+
+	snprintf(id, len, "_modstatus/%s", modifier);
+	rc = snd_use_case_geti(mgr->mgr, id, value);
+	free(id);
+	return rc;
+}
+
+int ucm_enable_hotword_model(struct cras_use_case_mgr *mgr)
+{
+	long mod_status;
+
+	if (!mgr->hotword_modifier)
+		return -EINVAL;
+
+	ucm_is_modifier_enabled(mgr, mgr->hotword_modifier, &mod_status);
+
+	if (!mod_status)
+		return ucm_set_modifier_enabled(mgr, mgr->hotword_modifier, 1);
+
+	return -EINVAL;
+}
+
+int ucm_set_hotword_model(struct cras_use_case_mgr *mgr, const char *model)
+{
+	char *model_mod;
+	long mod_status = 0;
+	size_t model_mod_size =
+		strlen(model) + 1 + strlen(hotword_model_prefix) + 1;
+
+	model_mod = (char *)malloc(model_mod_size);
+
+	if (!model_mod)
+		return -ENOMEM;
+	snprintf(model_mod, model_mod_size, "%s %s", hotword_model_prefix,
+		 model);
+	if (!ucm_mod_exists_with_name(mgr, model_mod)) {
+		free((void *)model_mod);
+		return -EINVAL;
+	}
+
+	if (mgr->hotword_modifier &&
+	    !strncmp(mgr->hotword_modifier, model_mod, model_mod_size)) {
+		free((void *)model_mod);
+		return 0;
+	}
+
+	/* If check failed, just move on, dont fail incoming model */
+	if (mgr->hotword_modifier)
+		ucm_is_modifier_enabled(mgr, mgr->hotword_modifier,
+					&mod_status);
+
+	ucm_disable_all_hotword_models(mgr);
+	free(mgr->hotword_modifier);
+	mgr->hotword_modifier = model_mod;
+	if (mod_status)
+		return ucm_enable_hotword_model(mgr);
+	return 0;
+}
+
+int ucm_has_fully_specified_ucm_flag(struct cras_use_case_mgr *mgr)
+{
+	char *flag;
+	int ret = 0;
+	flag = ucm_get_flag(mgr, fully_specified_ucm_var);
+	if (!flag)
+		return 0;
+	ret = !strcmp(flag, "1");
+	free(flag);
+	return ret;
+}
+
+inline const char *
+ucm_get_playback_mixer_elem_for_dev(struct cras_use_case_mgr *mgr,
+				    const char *dev)
+{
+	return ucm_get_value_for_dev(mgr, playback_mixer_elem_var, dev);
+}
+
+inline const char *
+ucm_get_capture_mixer_elem_for_dev(struct cras_use_case_mgr *mgr,
+				   const char *dev)
+{
+	return ucm_get_value_for_dev(mgr, capture_mixer_elem_var, dev);
+}
+
+struct mixer_name *ucm_get_main_volume_names(struct cras_use_case_mgr *mgr)
+{
+	return ucm_get_mixer_names(mgr, "", main_volume_names,
+				   CRAS_STREAM_OUTPUT, MIXER_NAME_MAIN_VOLUME);
+}
+
+int ucm_list_section_devices_by_device_name(
+	struct cras_use_case_mgr *mgr, enum CRAS_STREAM_DIRECTION direction,
+	const char *device_name, ucm_list_section_devices_callback cb,
+	void *cb_arg)
+{
+	int listed = 0;
+	struct section_name *section_names, *c;
+	const char *var;
+	char *identifier;
+
+	if (direction == CRAS_STREAM_OUTPUT)
+		var = playback_device_name_var;
+	else if (direction == CRAS_STREAM_INPUT)
+		var = capture_device_name_var;
+	else
+		return 0;
+
+	identifier = snd_use_case_identifier("_devices/%s", uc_verb(mgr));
+	section_names = ucm_get_sections_for_var(mgr, var, device_name,
+						 identifier, direction);
+	free(identifier);
+	if (!section_names)
+		return 0;
+
+	DL_FOREACH (section_names, c) {
+		cb(c->name, cb_arg);
+		listed++;
+	}
+
+	DL_FOREACH (section_names, c) {
+		DL_DELETE(section_names, c);
+		free((void *)c->name);
+		free(c);
+	}
+	return listed;
+}
+
+inline const char *ucm_get_jack_control_for_dev(struct cras_use_case_mgr *mgr,
+						const char *dev)
+{
+	return ucm_get_value_for_dev(mgr, jack_control_var, dev);
+}
+
+inline const char *ucm_get_jack_dev_for_dev(struct cras_use_case_mgr *mgr,
+					    const char *dev)
+{
+	return ucm_get_value_for_dev(mgr, jack_dev_var, dev);
+}
+
+int ucm_get_jack_switch_for_dev(struct cras_use_case_mgr *mgr, const char *dev)
+{
+	int value;
+
+	int rc = get_int(mgr, jack_switch_var, dev, uc_verb(mgr), &value);
+	if (rc || value < 0)
+		return -1;
+	return value;
+}
+
+unsigned int ucm_get_dma_period_for_dev(struct cras_use_case_mgr *mgr,
+					const char *dev)
+{
+	int value;
+
+	int rc = get_int(mgr, dma_period_var, dev, uc_verb(mgr), &value);
+	if (rc || value < 0)
+		return 0;
+	return value;
+}
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm_section.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm_section.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm_section.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm_section.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm_section.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm_section.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm_section.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_alsa_ucm_section.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_apm_reverse.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_apm_reverse.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_apm_reverse.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_apm_reverse.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_apm_reverse.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_apm_reverse.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_apm_reverse.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_apm_reverse.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_audio_area.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_audio_area.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_audio_area.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_audio_area.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_audio_area.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_audio_area.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_audio_area.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_audio_area.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_audio_thread_monitor.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_audio_thread_monitor.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_audio_thread_monitor.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_audio_thread_monitor.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_audio_thread_monitor.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_audio_thread_monitor.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_audio_thread_monitor.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_audio_thread_monitor.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_adapter.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_adapter.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_adapter.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_adapter.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_adapter.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_adapter.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_adapter.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_adapter.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_battery_provider.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_battery_provider.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_battery_provider.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_battery_provider.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_battery_provider.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_battery_provider.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_battery_provider.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_battery_provider.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_constants.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_constants.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_constants.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_constants.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_device.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_device.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_device.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_device.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_device.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_device.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_device.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_device.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_endpoint.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_endpoint.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_endpoint.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_endpoint.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_endpoint.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_endpoint.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_endpoint.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_endpoint.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_io.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_io.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_io.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_io.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_io.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_io.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_io.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_io.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_log.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_log.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_log.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_log.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_log.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_log.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_log.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_log.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_manager.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_manager.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_manager.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_manager.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_manager.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_manager.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_manager.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_manager.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_player.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_player.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_player.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_player.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_player.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_player.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_player.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_player.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_policy.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_policy.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_policy.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_policy.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_policy.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_policy.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_policy.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_policy.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_profile.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_profile.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_profile.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_profile.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_profile.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_profile.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_profile.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_profile.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_transport.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_transport.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_transport.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_transport.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_transport.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_transport.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_bt_transport.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_bt_transport.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_capture_rclient.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_capture_rclient.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_capture_rclient.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_capture_rclient.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_capture_rclient.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_capture_rclient.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_capture_rclient.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_capture_rclient.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_control_rclient.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_control_rclient.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_control_rclient.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_control_rclient.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_control_rclient.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_control_rclient.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_control_rclient.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_control_rclient.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus_control.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus_control.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus_control.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus_control.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus_control.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus_control.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus_control.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus_control.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus_util.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus_util.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus_util.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus_util.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus_util.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus_util.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dbus_util.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dbus_util.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_device_monitor.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_device_monitor.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_device_monitor.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_device_monitor.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_device_monitor.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_device_monitor.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_device_monitor.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_device_monitor.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dlc_stub.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dlc_stub.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dlc_stub.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dlc_stub.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_ini.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_ini.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_ini.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_ini.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_ini.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_ini.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_ini.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_ini.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_mod_builtin.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_mod_builtin.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_mod_builtin.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_mod_builtin.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_mod_ladspa.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_mod_ladspa.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_mod_ladspa.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_mod_ladspa.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_module.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_module.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_module.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_module.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_pipeline.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_pipeline.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_pipeline.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_pipeline.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_pipeline.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_pipeline.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_dsp_pipeline.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_dsp_pipeline.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_empty_iodev.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_empty_iodev.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_empty_iodev.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_empty_iodev.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_empty_iodev.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_empty_iodev.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_empty_iodev.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_empty_iodev.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_expr.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_expr.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_expr.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_expr.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_expr.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_expr.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_expr.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_expr.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_featured.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_featured.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_featured.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_featured.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_featured.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_featured.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_featured.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_featured.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_featured_stub.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_featured_stub.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_featured_stub.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_featured_stub.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_manager.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_manager.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_manager.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_manager.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_manager.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_manager.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_manager.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_manager.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_media.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_media.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_media.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_media.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_media.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_media.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_media.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_media.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_media_adapter.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_media_adapter.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_media_adapter.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_media_adapter.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_media_adapter.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_media_adapter.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_media_adapter.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_media_adapter.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_pcm_iodev.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_pcm_iodev.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_pcm_iodev.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_pcm_iodev.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_pcm_iodev.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_pcm_iodev.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fl_pcm_iodev.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fl_pcm_iodev.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_floop_iodev.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_floop_iodev.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_floop_iodev.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_floop_iodev.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_floop_iodev.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_floop_iodev.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_floop_iodev.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_floop_iodev.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fmt_conv.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fmt_conv.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fmt_conv.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fmt_conv.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fmt_conv.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fmt_conv.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fmt_conv.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fmt_conv.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fmt_conv_ops.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fmt_conv_ops.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fmt_conv_ops.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fmt_conv_ops.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fmt_conv_ops.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fmt_conv_ops.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_fmt_conv_ops.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_fmt_conv_ops.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_gpio_jack.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_gpio_jack.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_gpio_jack.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_gpio_jack.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_gpio_jack.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_gpio_jack.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_gpio_jack.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_gpio_jack.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_ag_profile.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_ag_profile.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_ag_profile.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_ag_profile.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_ag_profile.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_ag_profile.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_ag_profile.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_ag_profile.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_alsa_iodev.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_alsa_iodev.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_alsa_iodev.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_alsa_iodev.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_alsa_iodev.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_alsa_iodev.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_alsa_iodev.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_alsa_iodev.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_iodev.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_iodev.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_iodev.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_iodev.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_iodev.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_iodev.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_iodev.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_iodev.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_manager.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_manager.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_manager.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_manager.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_manager.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_manager.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_manager.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_manager.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_slc.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_slc.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_slc.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_slc.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_slc.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_slc.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hfp_slc.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hfp_slc.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hotword_handler.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hotword_handler.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hotword_handler.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hotword_handler.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hotword_handler.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hotword_handler.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_hotword_handler.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_hotword_handler.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_iodev.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_iodev.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_iodev.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_iodev.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_iodev.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_iodev.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_iodev.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_iodev.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_iodev_list.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_iodev_list.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_iodev_list.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_iodev_list.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_iodev_list.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_iodev_list.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_iodev_list.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_iodev_list.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_loopback_iodev.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_loopback_iodev.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_loopback_iodev.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_loopback_iodev.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_loopback_iodev.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_loopback_iodev.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_loopback_iodev.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_loopback_iodev.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_main_message.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_main_message.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_main_message.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_main_message.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_main_message.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_main_message.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_main_message.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_main_message.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_main_thread_log.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_main_thread_log.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_main_thread_log.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_main_thread_log.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_mix.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_mix.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_mix.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_mix.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_mix.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_mix.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_mix.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_mix.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_mix_ops.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_mix_ops.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_mix_ops.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_mix_ops.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_mix_ops.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_mix_ops.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_mix_ops.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_mix_ops.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_non_empty_audio_handler.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_non_empty_audio_handler.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_non_empty_audio_handler.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_non_empty_audio_handler.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_non_empty_audio_handler.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_non_empty_audio_handler.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_non_empty_audio_handler.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_non_empty_audio_handler.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_observer.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_observer.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_observer.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_observer.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_observer.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_observer.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_observer.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_observer.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_playback_rclient.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_playback_rclient.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_playback_rclient.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_playback_rclient.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_playback_rclient.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_playback_rclient.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_playback_rclient.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_playback_rclient.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_ramp.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_ramp.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_ramp.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_ramp.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_ramp.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_ramp.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_ramp.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_ramp.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rclient.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rclient.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rclient.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rclient.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rclient.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rclient.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rclient.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rclient.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rclient_util.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rclient_util.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rclient_util.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rclient_util.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rclient_util.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rclient_util.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rclient_util.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rclient_util.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rstream.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rstream.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rstream.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rstream.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rstream.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rstream.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rstream.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rstream.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rstream_config.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rstream_config.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rstream_config.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rstream_config.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rstream_config.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rstream_config.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rstream_config.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rstream_config.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rtc.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rtc.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rtc.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rtc.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rtc.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rtc.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_rtc.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_rtc.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sco.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sco.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sco.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sco.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sco.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sco.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sco.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sco.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_server.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_server.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_server.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_server.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_server.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_server.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_server.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_server.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_server_metrics.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_server_metrics.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_server_metrics.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_server_metrics.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_server_metrics.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_server_metrics.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_server_metrics.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_server_metrics.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util_stub.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util_stub.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util_stub.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr_bt_util_stub.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr_stub.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr_stub.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_sr_stub.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_sr_stub.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_stream_apm.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_stream_apm.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_stream_apm.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_stream_apm.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_stream_apm.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_stream_apm.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_stream_apm.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_stream_apm.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_stream_apm_noop.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_stream_apm_noop.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_stream_apm_noop.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_stream_apm_noop.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_system_state.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_system_state.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_system_state.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_system_state.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_system_state.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_system_state.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_system_state.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_system_state.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_telephony.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_telephony.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_telephony.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_telephony.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_telephony.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_telephony.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_telephony.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_telephony.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_tm.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_tm.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_tm.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_tm.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_tm.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_tm.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_tm.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_tm.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_udev.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_udev.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_udev.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_udev.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_udev.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_udev.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_udev.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_udev.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_unified_rclient.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_unified_rclient.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_unified_rclient.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_unified_rclient.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_unified_rclient.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_unified_rclient.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_unified_rclient.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_unified_rclient.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_utf8.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_utf8.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_utf8.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_utf8.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_utf8.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_utf8.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_utf8.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_utf8.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_volume_curve.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_volume_curve.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_volume_curve.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_volume_curve.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_volume_curve.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_volume_curve.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/cras_volume_curve.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/cras_volume_curve.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/dev_io.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/dev_io.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/dev_io.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/dev_io.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/dev_io.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/dev_io.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/dev_io.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/dev_io.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/dev_stream.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/dev_stream.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/dev_stream.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/dev_stream.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/dev_stream.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/dev_stream.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/dev_stream.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/dev_stream.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/ewma_power.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/ewma_power.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/ewma_power.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/ewma_power.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/ewma_power.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/ewma_power.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/ewma_power.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/ewma_power.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/float_buffer.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/float_buffer.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/float_buffer.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/float_buffer.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/iniparser_wrapper.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/iniparser_wrapper.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/iniparser_wrapper.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/iniparser_wrapper.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/input_data.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/input_data.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/input_data.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/input_data.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/input_data.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/input_data.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/input_data.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/input_data.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/linear_resampler.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/linear_resampler.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/linear_resampler.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/linear_resampler.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/linear_resampler.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/linear_resampler.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/linear_resampler.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/linear_resampler.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/polled_interval_checker.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/polled_interval_checker.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/polled_interval_checker.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/polled_interval_checker.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/polled_interval_checker.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/polled_interval_checker.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/polled_interval_checker.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/polled_interval_checker.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/rust/include/cras_dlc.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/rust/include/cras_dlc.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/rust/include/cras_dlc.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/rust/include/cras_dlc.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/rust/include/rate_estimator.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/rust/include/rate_estimator.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/rust/include/rate_estimator.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/rust/include/rate_estimator.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/server_stream.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/server_stream.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/server_stream.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/server_stream.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/server_stream.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/server_stream.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/server_stream.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/server_stream.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/softvol_curve.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/softvol_curve.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/softvol_curve.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/softvol_curve.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/softvol_curve.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/softvol_curve.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/softvol_curve.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/softvol_curve.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/stream_list.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/stream_list.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/stream_list.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/stream_list.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/stream_list.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/stream_list.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/stream_list.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/stream_list.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/test_iodev.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/test_iodev.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/test_iodev.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/test_iodev.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/test_iodev.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/test_iodev.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/server/test_iodev.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/server/test_iodev.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/a2dp_info_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/a2dp_info_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/a2dp_info_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/a2dp_info_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/a2dp_iodev_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/a2dp_iodev_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/a2dp_iodev_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/a2dp_iodev_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/a2dp_manager_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/a2dp_manager_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/a2dp_manager_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/a2dp_manager_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alert_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alert_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alert_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alert_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_card_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_card_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_card_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_card_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_helpers_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_helpers_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_helpers_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_helpers_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_io_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_io_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_io_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_io_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_jack_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_jack_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_jack_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_jack_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_mixer_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_mixer_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_mixer_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_mixer_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_ucm_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_ucm_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/alsa_ucm_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/alsa_ucm_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/am_mock.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/am_mock.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/am_mock.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/am_mock.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/apm_reverse_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/apm_reverse_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/apm_reverse_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/apm_reverse_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/array_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/array_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/array_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/array_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_area_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_area_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_area_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_area_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_format_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_format_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_format_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_format_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_test_gui.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_test_gui.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_test_gui.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_test_gui.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_thread_monitor_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_thread_monitor_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_thread_monitor_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_thread_monitor_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_thread_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_thread_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_thread_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_thread_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_thread_unittest_obsolete.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_thread_unittest_obsolete.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/audio_thread_unittest_obsolete.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/audio_thread_unittest_obsolete.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/biquad_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/biquad_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/biquad_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/biquad_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/bt_device_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/bt_device_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/bt_device_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/bt_device_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/bt_io_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/bt_io_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/bt_io_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/bt_io_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/bt_manager_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/bt_manager_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/bt_manager_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/bt_manager_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/bt_policy_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/bt_policy_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/bt_policy_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/bt_policy_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/bt_profile_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/bt_profile_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/bt_profile_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/bt_profile_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/buffer_share_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/buffer_share_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/buffer_share_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/buffer_share_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/byte_buffer_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/byte_buffer_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/byte_buffer_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/byte_buffer_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/capture_rclient_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/capture_rclient_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/capture_rclient_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/capture_rclient_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/card_config_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/card_config_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/card_config_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/card_config_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/checksum_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/checksum_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/checksum_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/checksum_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/control_rclient_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/control_rclient_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/control_rclient_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/control_rclient_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_abi_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_abi_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_abi_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_abi_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_client_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_client_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_client_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_client_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_dsp_pipeline_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_dsp_pipeline_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_dsp_pipeline_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_dsp_pipeline_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_rtc_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_rtc_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_rtc_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_rtc_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_sco_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_sco_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_sco_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_sco_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_selinux_helper_unittest.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_selinux_helper_unittest.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_selinux_helper_unittest.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_selinux_helper_unittest.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_sr_bt_util_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_sr_bt_util_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_sr_bt_util_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_sr_bt_util_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_sr_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_sr_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_sr_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_sr_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_tm_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_tm_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/cras_tm_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/cras_tm_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dbus_test.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dbus_test.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dbus_test.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dbus_test.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dbus_test.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dbus_test.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dbus_test.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dbus_test.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dev_io_stubs.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dev_io_stubs.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dev_io_stubs.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dev_io_stubs.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dev_io_stubs.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dev_io_stubs.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dev_io_stubs.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dev_io_stubs.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dev_io_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dev_io_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dev_io_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dev_io_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dev_stream_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dev_stream_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dev_stream_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dev_stream_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/device_blocklist_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/device_blocklist_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/device_blocklist_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/device_blocklist_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/device_monitor_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/device_monitor_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/device_monitor_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/device_monitor_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dsp_core_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dsp_core_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dsp_core_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dsp_core_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dsp_ini_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dsp_ini_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dsp_ini_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dsp_ini_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dsp_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dsp_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dsp_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dsp_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dumper_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dumper_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/dumper_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/dumper_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/edid_utils_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/edid_utils_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/edid_utils_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/edid_utils_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/empty_audio_stub.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/empty_audio_stub.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/empty_audio_stub.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/empty_audio_stub.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/empty_iodev_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/empty_iodev_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/empty_iodev_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/empty_iodev_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/ewma_power_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/ewma_power_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/ewma_power_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/ewma_power_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/expr_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/expr_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/expr_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/expr_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/file_wait_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/file_wait_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/file_wait_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/file_wait_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/fl_pcm_iodev_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/fl_pcm_iodev_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/fl_pcm_iodev_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/fl_pcm_iodev_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/float_buffer_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/float_buffer_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/float_buffer_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/float_buffer_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/floop_iodev_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/floop_iodev_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/floop_iodev_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/floop_iodev_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/fmt_conv_ops_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/fmt_conv_ops_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/fmt_conv_ops_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/fmt_conv_ops_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/fmt_conv_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/fmt_conv_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/fmt_conv_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/fmt_conv_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/hfp_ag_profile_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/hfp_ag_profile_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/hfp_ag_profile_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/hfp_ag_profile_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/hfp_alsa_iodev_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/hfp_alsa_iodev_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/hfp_alsa_iodev_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/hfp_alsa_iodev_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/hfp_iodev_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/hfp_iodev_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/hfp_iodev_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/hfp_iodev_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/hfp_manager_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/hfp_manager_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/hfp_manager_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/hfp_manager_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/hfp_slc_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/hfp_slc_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/hfp_slc_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/hfp_slc_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/input_data_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/input_data_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/input_data_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/input_data_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/iodev_list_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/iodev_list_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/iodev_list_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/iodev_list_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/iodev_stub.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/iodev_stub.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/iodev_stub.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/iodev_stub.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/iodev_stub.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/iodev_stub.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/iodev_stub.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/iodev_stub.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/iodev_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/iodev_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/iodev_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/iodev_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/linear_resampler_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/linear_resampler_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/linear_resampler_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/linear_resampler_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/loopback_iodev_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/loopback_iodev_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/loopback_iodev_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/loopback_iodev_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/messages_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/messages_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/messages_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/messages_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/metrics_stub.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/metrics_stub.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/metrics_stub.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/metrics_stub.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/metrics_stub.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/metrics_stub.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/metrics_stub.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/metrics_stub.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/mix_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/mix_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/mix_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/mix_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/observer_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/observer_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/observer_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/observer_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/playback_rclient_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/playback_rclient_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/playback_rclient_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/playback_rclient_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/polled_interval_checker_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/polled_interval_checker_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/polled_interval_checker_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/polled_interval_checker_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/ramp_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/ramp_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/ramp_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/ramp_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/rate_estimator_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/rate_estimator_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/rate_estimator_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/rate_estimator_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/rstream_stub.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/rstream_stub.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/rstream_stub.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/rstream_stub.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/rstream_stub.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/rstream_stub.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/rstream_stub.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/rstream_stub.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/rstream_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/rstream_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/rstream_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/rstream_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sample_buffer_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sample_buffer_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sample_buffer_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sample_buffer_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sbc_codec_stub.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sbc_codec_stub.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sbc_codec_stub.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sbc_codec_stub.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sbc_codec_stub.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sbc_codec_stub.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sbc_codec_stub.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sbc_codec_stub.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/server_metrics_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/server_metrics_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/server_metrics_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/server_metrics_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/shm_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/shm_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/shm_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/shm_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/softvol_curve_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/softvol_curve_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/softvol_curve_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/softvol_curve_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sr_bt_util_stub.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sr_bt_util_stub.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sr_bt_util_stub.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sr_bt_util_stub.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sr_bt_util_stub.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sr_bt_util_stub.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sr_bt_util_stub.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sr_bt_util_stub.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sr_stub.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sr_stub.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sr_stub.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sr_stub.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sr_stub.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sr_stub.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/sr_stub.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/sr_stub.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/stream_apm_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/stream_apm_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/stream_apm_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/stream_apm_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/stream_list_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/stream_list_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/stream_list_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/stream_list_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/string_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/string_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/string_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/string_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/system_state_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/system_state_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/system_state_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/system_state_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/test_util.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/test_util.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/test_util.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/test_util.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/timing_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/timing_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/timing_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/timing_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/utf8_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/utf8_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/utf8_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/utf8_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/util_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/util_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/util_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/util_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/volume_curve_unittest.cc b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/volume_curve_unittest.cc
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tests/volume_curve_unittest.cc
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tests/volume_curve_unittest.cc
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tools/cras_monitor/cras_monitor.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tools/cras_monitor/cras_monitor.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tools/cras_monitor/cras_monitor.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tools/cras_monitor/cras_monitor.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tools/cras_router/cras_router.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tools/cras_router/cras_router.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tools/cras_router/cras_router.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tools/cras_router/cras_router.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tools/cras_test_client/cras_test_client.c b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tools/cras_test_client/cras_test_client.c
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/src/tools/cras_test_client/cras_test_client.c
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/src/tools/cras_test_client/cras_test_client.c
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/tools/create_volume_curve.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/tools/create_volume_curve.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/cras/tools/create_volume_curve.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/cras/tools/create_volume_curve.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_thread_log_viewer/example.html b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_thread_log_viewer/example.html
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_thread_log_viewer/example.html
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_thread_log_viewer/example.html
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_thread_log_viewer/viewer_c3.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_thread_log_viewer/viewer_c3.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_thread_log_viewer/viewer_c3.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_thread_log_viewer/viewer_c3.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/conf2ini.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/conf2ini.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/conf2ini.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/conf2ini.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/conf2ini2.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/conf2ini2.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/conf2ini2.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/conf2ini2.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.css b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.css
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.css
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.css
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.html b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.html
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.html
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.html
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.js b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.js
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.js
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/frontend/audio.js
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/frontend/google_drive_picker.js b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/frontend/google_drive_picker.js
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/frontend/google_drive_picker.js
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/frontend/google_drive_picker.js
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/frontend/setup_credential.js b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/frontend/setup_credential.js
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/audio_tuning/frontend/setup_credential.js
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/audio_tuning/frontend/setup_credential.js
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/ini_editor.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/ini_editor.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/ini_editor.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/ini_editor.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/ini_editor_unittest.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/ini_editor_unittest.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/ini_editor_unittest.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/ini_editor_unittest.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/analysis.js b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/analysis.js
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/analysis.js
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/analysis.js
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.css b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.css
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.css
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.css
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.html b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.html
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.html
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.html
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.js b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.js
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.js
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/audio.js
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/recorder.js b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/recorder.js
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/recorder.js
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/recorder.js
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/source.js b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/source.js
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/mic_testing/frontend/source.js
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/mic_testing/frontend/source.js
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/ucmlint/draft_comments.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/ucmlint/draft_comments.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/ucmlint/draft_comments.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/ucmlint/draft_comments.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/ucmlint/lint_cl.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/ucmlint/lint_cl.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/ucmlint/lint_cl.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/ucmlint/lint_cl.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/ucmlint/ucmlint.py b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/ucmlint/ucmlint.py
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/ucmlint/ucmlint.py
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/ucmlint/ucmlint.py
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/volume_tuning/volume.css b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/volume_tuning/volume.css
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/volume_tuning/volume.css
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/volume_tuning/volume.css
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/volume_tuning/volume.html b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/volume_tuning/volume.html
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/volume_tuning/volume.html
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/volume_tuning/volume.html
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/volume_tuning/volume.js b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/volume_tuning/volume.js
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/scripts/volume_tuning/volume.js
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/scripts/volume_tuning/volume.js
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/sof_sys/generator/wrapper.h b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/sof_sys/generator/wrapper.h
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/sof_sys/generator/wrapper.h
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/sof_sys/generator/wrapper.h
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/ubsan_blocklist.txt b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/ubsan_blocklist.txt
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/ubsan_blocklist.txt
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/ubsan_blocklist.txt
diff --git a/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/unblocked_terms.txt b/chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/unblocked_terms.txt
similarity index 100%
rename from chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2675/work/adhd-0.0.6/unblocked_terms.txt
rename to chroot/build/arm-generic/tmp/portage/media-sound/adhd-0.0.6-r2676/work/adhd-0.0.6/unblocked_terms.txt
diff --git a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/meson-log.txt b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/meson-log.txt
index 74c2c92..3f77ecf 100644
--- a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/meson-log.txt
+++ b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/meson-log.txt
@@ -1,4 +1,4 @@
-Build started at 2022-09-15T20:54:02.187753
+Build started at 2022-09-16T03:02:44.683799
 Main binary: /usr/bin/python3.6
 Build Options: -Ddefault_library=shared -Ddefault_programmer_name=internal -Dconfig_atahpt=false -Dconfig_atapromise=false -Dconfig_atavia=false -Dconfig_buspirate_spi=false -Dconfig_ch341a_spi=false -Dconfig_dediprog=false -Dconfig_developerbox_spi=false -Dconfig_digilent_spi=false -Dconfig_drkaiser=false -Dconfig_dummy=true -Dconfig_ft2232_spi=true -Dconfig_gfxnvidia=false -Dconfig_internal=true -Dconfig_it8212=true -Dconfig_jlink_spi=false -Dconfig_linux_mtd=true -Dconfig_linux_spi=true -Dconfig_mediatek_i2c_spi=true -Dconfig_mstarddc_spi=false -Dconfig_nic3com=false -Dconfig_nicintel_eeprom=false -Dconfig_nicintel_spi=false -Dconfig_nicintel=false -Dconfig_nicnatsemi=false -Dconfig_nicrealtek=false -Dconfig_ogp_spi=false -Dconfig_parade_lspcon=true -Dconfig_pickit2_spi=false -Dconfig_pony_spi=false -Dconfig_raiden_debug_spi=true -Dconfig_rayer_spi=false -Dconfig_realtek_mst_i2c_spi=true -Dconfig_satamv=false -Dconfig_satasii=false -Dconfig_serprog=true -Dconfig_stlinkv3_spi=true -Dconfig_usbblaster_spi=true -Dprint_wiki=true -Dprefix=/usr -Dlibdir=lib -Dlocalstatedir=/var/lib -Dsysconfdir=/etc -Dbuildtype=plain -Dwrap_mode=nodownload -Dbuild.pkg_config_path=/usr/share/pkgconfig -Dpkg_config_path=/usr/lib/pkgconfig:/usr/share/pkgconfig '--cross-file /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/meson.armv7a-cros-linux-gnueabihf.arm.ini' '--native-file /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/meson.x86_64-pc-linux-gnu.arm.ini'
 Python system: Linux
@@ -47,8 +47,8 @@
 Target machine cpu family: arm
 Target machine cpu: armv7a
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpzj5po60q
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpzj5po60q/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpzj5po60q/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wshadow 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp49psuhc8
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp49psuhc8/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp49psuhc8/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wshadow 
 
 Code:
  extern int i;
@@ -60,8 +60,8 @@
  
 Compiler for C supports arguments -Wshadow: YES 
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmppm16g8yy
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmppm16g8yy/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmppm16g8yy/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wmissing-prototypes 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpimfdk4pl
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpimfdk4pl/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpimfdk4pl/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wmissing-prototypes 
 
 Code:
  extern int i;
@@ -73,8 +73,8 @@
  
 Compiler for C supports arguments -Wmissing-prototypes: YES 
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpw8ot54v6
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpw8ot54v6/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpw8ot54v6/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wwrite-strings 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpmc5rbtrx
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpmc5rbtrx/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpmc5rbtrx/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wwrite-strings 
 
 Code:
  extern int i;
@@ -86,8 +86,8 @@
  
 Compiler for C supports arguments -Wwrite-strings: YES 
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpf_zxo9xx
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpf_zxo9xx/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpf_zxo9xx/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wunused-parameter -Wno-unused-parameter 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpdgt3fws5
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpdgt3fws5/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpdgt3fws5/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wunused-parameter -Wno-unused-parameter 
 
 Code:
  extern int i;
@@ -99,8 +99,8 @@
  
 Compiler for C supports arguments -Wno-unused-parameter: YES 
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpoxadmu6f
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpoxadmu6f/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpoxadmu6f/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Waddress-of-packed-member -Wno-address-of-packed-member 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpsvnyzes2
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpsvnyzes2/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpsvnyzes2/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Waddress-of-packed-member -Wno-address-of-packed-member 
 
 Code:
  extern int i;
@@ -112,8 +112,8 @@
  
 Compiler for C supports arguments -Wno-address-of-packed-member: YES 
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpf4do09pg
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpf4do09pg/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpf4do09pg/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wenum-conversion -Wno-enum-conversion 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmposaypbgk
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmposaypbgk/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmposaypbgk/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wenum-conversion -Wno-enum-conversion 
 
 Code:
  extern int i;
@@ -125,8 +125,8 @@
  
 Compiler for C supports arguments -Wno-enum-conversion: YES 
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp2su_21i8
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp2su_21i8/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp2su_21i8/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wmissing-braces -Wno-missing-braces 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp7d917ds3
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp7d917ds3/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp7d917ds3/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wmissing-braces -Wno-missing-braces 
 
 Code:
  extern int i;
@@ -138,8 +138,8 @@
  
 Compiler for C supports arguments -Wno-missing-braces: YES 
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp30u8wc2a
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp30u8wc2a/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp30u8wc2a/output.exe -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -std=c99 -Wl,-O2 -Wl,--as-needed -Wl,--gc-sections -Wl,--icf=all 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpiqs6r4g6
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpiqs6r4g6/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpiqs6r4g6/output.exe -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -std=c99 -Wl,-O2 -Wl,--as-needed -Wl,--gc-sections -Wl,--icf=all 
 
 Code:
  
@@ -166,8 +166,8 @@
  
 Checking for function "clock_gettime" : YES 
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpyed3xfku
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpyed3xfku/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpyed3xfku/output.exe -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -std=c99 -Wl,-O2 -Wl,--as-needed -Wl,--gc-sections -Wl,--icf=all 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpbeys3sdu
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpbeys3sdu/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpbeys3sdu/output.exe -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -std=c99 -Wl,-O2 -Wl,--as-needed -Wl,--gc-sections -Wl,--icf=all 
 
 Code:
  
@@ -194,8 +194,8 @@
  
 Checking for function "strnlen" : YES 
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp__p_sgi7
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp__p_sgi7/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp__p_sgi7/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -std=c99 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpz5z7o8l8
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpz5z7o8l8/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpz5z7o8l8/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -std=c99 
 
 Code:
  
@@ -247,8 +247,8 @@
 Called `/build/arm-generic/build/bin/pkg-config --libs libusb-1.0` -> 0
 -L/build/arm-generic/usr/lib -lusb-1.0
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp19m1c0u5
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp19m1c0u5/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp19m1c0u5/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp2wyrcnl4
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp2wyrcnl4/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp2wyrcnl4/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
 
 Code:
  #include <stdio.h>
@@ -262,8 +262,8 @@
 Compiler stderr:
  
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpi5f29gqe
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpi5f29gqe/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpi5f29gqe/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpvcksb65b
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpvcksb65b/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpvcksb65b/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
 
 Code:
  #include <stdio.h>
@@ -274,8 +274,8 @@
 Compiler stderr:
  
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpf3147tng
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpf3147tng/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpf3147tng/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpr66iglvj
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpr66iglvj/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpr66iglvj/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
 
 Code:
  #include <stdio.h>
@@ -286,8 +286,8 @@
 Compiler stderr:
  
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpxrio0eq7
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpxrio0eq7/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpxrio0eq7/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp_pfla_8s
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp_pfla_8s/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp_pfla_8s/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
 
 Code:
  #include <stdio.h>
@@ -298,8 +298,8 @@
 Compiler stderr:
  
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpc88zfet0
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpc88zfet0/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpc88zfet0/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpv27qjhw8
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpv27qjhw8/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpv27qjhw8/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
 
 Code:
  #include <stdio.h>
@@ -310,8 +310,8 @@
 Compiler stderr:
  
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpra4asp4t
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpra4asp4t/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpra4asp4t/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpfkg1asg6
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpfkg1asg6/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpfkg1asg6/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
 
 Code:
  #include <stdio.h>
@@ -320,14 +320,14 @@
 Compiler stdout:
  
 Compiler stderr:
- /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpra4asp4t/testfile.c:3:39: error: 'a' declared as an array with a negative size
+ /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpfkg1asg6/testfile.c:3:39: error: 'a' declared as an array with a negative size
         int main(void) { static int a[1-2*!(sizeof(void *) > 7)]; a[0]=0; return 0; }
                                       ^~~~~~~~~~~~~~~~~~~~~~~~~
 1 error generated.
 
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpjnrl3ujc
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpjnrl3ujc/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpjnrl3ujc/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpta2sefyf
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpta2sefyf/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpta2sefyf/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
 
 Code:
  #include <stdio.h>
@@ -338,8 +338,8 @@
 Compiler stderr:
  
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmphxxhcduj
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmphxxhcduj/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmphxxhcduj/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp9aqbuanc
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp9aqbuanc/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmp9aqbuanc/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument 
 
 Code:
  #include <stdio.h>
@@ -350,8 +350,8 @@
 Compiler stderr:
  
 Running compile:
-Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpaitz59ra
-Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpaitz59ra/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpaitz59ra/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument --print-search-dirs 
+Working directory:  /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpxwy_o1bu
+Command line:  armv7a-cros-linux-gnueabihf-clang /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpxwy_o1bu/testfile.c -o /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-private/tmpxwy_o1bu/output.obj -c -Os -pipe -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument --print-search-dirs 
 
 Code:
  
diff --git a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.json b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.json
index 28424c0..b79708e 100644
--- a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.json
+++ b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.json
@@ -1 +1 @@
-{"name": "cmocka test flashrom", "stdout": "Running [PosixPath('/mnt/host/source/src/platform2/common-mk/platform2_test.py'), '--sysroot', '/build/arm-generic', '--', '/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/tests/flashrom_unit_tests']\n[==========] Running 7 test(s).\n[ RUN      ] address_to_bits_test_success\n[       OK ] address_to_bits_test_success\n[ RUN      ] bitcount_test_success\n[       OK ] bitcount_test_success\n[ RUN      ] minmax_test_success\n[       OK ] minmax_test_success\n[ RUN      ] strcat_realloc_test_success\n[       OK ] strcat_realloc_test_success\n[ RUN      ] tolower_string_test_success\n[       OK ] tolower_string_test_success\n[ RUN      ] reverse_byte_test_success\n[       OK ] reverse_byte_test_success\n[ RUN      ] reverse_bytes_test_success\n[       OK ] reverse_bytes_test_success\n[==========] 7 test(s) run.\n[==========] Running 1 test(s).\n[ RUN      ] flashbuses_to_text_test_success\n[       OK ] flashbuses_to_text_test_success\n[==========] 1 test(s) run.\n[==========] Running 11 test(s).\n[ RUN      ] spi_write_enable_test_success\n[       OK ] spi_write_enable_test_success\n[ RUN      ] spi_write_disable_test_success\n[       OK ] spi_write_disable_test_success\n[ RUN      ] spi_read_chunked_test_success\n[       OK ] spi_read_chunked_test_success\n[ RUN      ] probe_spi_rdid_test_success\n[       OK ] probe_spi_rdid_test_success\n[ RUN      ] probe_spi_rdid4_test_success\n[       OK ] probe_spi_rdid4_test_success\n[ RUN      ] probe_spi_rems_test_success\n[       OK ] probe_spi_rems_test_success\n[ RUN      ] probe_spi_res1_test_success\n[       OK ] probe_spi_res1_test_success\n[ RUN      ] probe_spi_res2_test_success\n[       OK ] probe_spi_res2_test_success\n[ RUN      ] probe_spi_res3_test_success\n[       OK ] probe_spi_res3_test_success\n[ RUN      ] probe_spi_at25f_test_success\n[       OK ] probe_spi_at25f_test_success\n[ RUN      ] probe_spi_st95_test_success\n[       OK ] probe_spi_st95_test_success\n[==========] 11 test(s) run.\n[==========] Running 17 test(s).\n[ RUN      ] dummy_basic_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=dummy ...\n... flashrom_programmer_init for programmer=dummy successful\nTesting flashrom_programmer_shutdown for programmer=dummy ...\n... flashrom_programmer_shutdown for programmer=dummy successful\n[       OK ] dummy_basic_lifecycle_test_success\n[ RUN      ] dummy_probe_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=dummy ...\n... flashrom_programmer_init for programmer=dummy successful\nTesting flashrom_flash_probe for programmer=dummy, chip=W25Q128.V ... \n... flashrom_flash_probe for programmer=dummy successful\nTesting flashrom_programmer_shutdown for programmer=dummy ...\n... flashrom_programmer_shutdown for programmer=dummy successful\n[       OK ] dummy_probe_lifecycle_test_success\n[ RUN      ] dummy_probe_variable_size_test_success\nTesting flashrom_programmer_init for programmer=dummy ...\n... flashrom_programmer_init for programmer=dummy successful\nTesting flashrom_flash_probe for programmer=dummy, chip=Opaque flash chip ... \n... flashrom_flash_probe for programmer=dummy successful\nTesting flashrom_programmer_shutdown for programmer=dummy ...\n... flashrom_programmer_shutdown for programmer=dummy successful\n[       OK ] dummy_probe_variable_size_test_success\n[ RUN      ] dummy_init_fails_unhandled_param_test_success\nTesting init error path for programmer=dummy with params: bus=spi,emulate=INVALID,unhandled=value ...\n... init failed with error code 1 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] dummy_init_fails_unhandled_param_test_success\n[ RUN      ] dummy_init_success_invalid_param_test_success\nTesting init error path for programmer=dummy with params: bus=spi,emulate=W25Q128FV,invalid=value ...\n... init failed with error code -238 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] dummy_init_success_invalid_param_test_success\n[ RUN      ] dummy_init_success_unhandled_param_test_success\nTesting init error path for programmer=dummy with params: bus=spi,emulate=W25Q128FV,voltage=3.5V ...\n... init failed with error code -238 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] dummy_init_success_unhandled_param_test_success\n[ RUN      ] nicrealtek_basic_lifecycle_test_success\n[  SKIPPED ] nicrealtek_basic_lifecycle_test_success\n[ RUN      ] raiden_debug_basic_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=raiden_debug_spi ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap_libusb_init is called\n__wrap_libusb_get_device_list is called\n__wrap_libusb_get_bus_number is called\n__wrap_libusb_get_device_address is called\n__wrap_libusb_get_device_descriptor is called\n__wrap_libusb_get_config_descriptor is called\n__wrap_libusb_ref_device is called\n__wrap_libusb_free_device_list is called\n__wrap_libusb_open is called\n__wrap_libusb_get_configuration is called\n__wrap_libusb_set_auto_detach_kernel_driver is called\n__wrap_libusb_claim_interface is called\n__wrap_libusb_control_transfer is called\n... flashrom_programmer_init for programmer=raiden_debug_spi successful\nTesting flashrom_programmer_shutdown for programmer=raiden_debug_spi ...\n__wrap_libusb_control_transfer is called\n__wrap_libusb_unref_device is called\n__wrap_libusb_free_config_descriptor is called\n__wrap_libusb_exit is called\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=raiden_debug_spi successful\n[       OK ] raiden_debug_basic_lifecycle_test_success\n[ RUN      ] dediprog_basic_lifecycle_test_success\n[  SKIPPED ] dediprog_basic_lifecycle_test_success\n[ RUN      ] linux_mtd_probe_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=linux_mtd ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap_stat64 is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_stat64 is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap_setvbuf is called\n... flashrom_programmer_init for programmer=linux_mtd successful\nTesting flashrom_flash_probe for programmer=linux_mtd, chip=Opaque flash chip ... \n... flashrom_flash_probe for programmer=linux_mtd successful\nTesting flashrom_programmer_shutdown for programmer=linux_mtd ...\n__wrap_fclose is called\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=linux_mtd successful\n[       OK ] linux_mtd_probe_lifecycle_test_success\n[ RUN      ] linux_spi_probe_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=linux_spi ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap___open64_2 is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_fopen64 is called\n__wrap___fgets_chk is called\n__wrap_fclose is called\n... flashrom_programmer_init for programmer=linux_spi successful\nTesting flashrom_flash_probe for programmer=linux_spi, chip=W25Q128.V ... \n__wrap_ioctl is called\n__wrap_ioctl is called\n... flashrom_flash_probe for programmer=linux_spi successful\nTesting flashrom_programmer_shutdown for programmer=linux_spi ...\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=linux_spi successful\n[       OK ] linux_spi_probe_lifecycle_test_success\n[ RUN      ] parade_lspcon_basic_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=parade_lspcon ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap___open64_2 is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n... flashrom_programmer_init for programmer=parade_lspcon successful\nTesting flashrom_programmer_shutdown for programmer=parade_lspcon ...\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=parade_lspcon successful\n[       OK ] parade_lspcon_basic_lifecycle_test_success\n[ RUN      ] parade_lspcon_no_allow_brick_test_success\nTesting init error path for programmer=parade_lspcon with params: bus=254 ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap_flock is called\n... init failed with error code -1 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] parade_lspcon_no_allow_brick_test_success\n[ RUN      ] mediatek_i2c_spi_basic_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=mediatek_i2c_spi ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap___open64_2 is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n... flashrom_programmer_init for programmer=mediatek_i2c_spi successful\nTesting flashrom_programmer_shutdown for programmer=mediatek_i2c_spi ...\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=mediatek_i2c_spi successful\n[       OK ] mediatek_i2c_spi_basic_lifecycle_test_success\n[ RUN      ] mediatek_i2c_no_allow_brick_test_success\nTesting init error path for programmer=mediatek_i2c_spi with params: bus=254 ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap_flock is called\n... init failed with error code -1 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] mediatek_i2c_no_allow_brick_test_success\n[ RUN      ] realtek_mst_basic_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=realtek_mst_i2c_spi ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap___open64_2 is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n... flashrom_programmer_init for programmer=realtek_mst_i2c_spi successful\nTesting flashrom_programmer_shutdown for programmer=realtek_mst_i2c_spi ...\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=realtek_mst_i2c_spi successful\n[       OK ] realtek_mst_basic_lifecycle_test_success\n[ RUN      ] realtek_mst_no_allow_brick_test_success\nTesting init error path for programmer=realtek_mst_i2c_spi with params: bus=254,enter_isp=0 ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap_flock is called\n... init failed with error code -1 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] realtek_mst_no_allow_brick_test_success\n[==========] 17 test(s) run.\n[==========] Running 6 test(s).\n[ RUN      ] included_regions_dont_overlap_test_success\nCreating layout... done\nAdding and including first region... done, second (non-overlapping) region... done\nAsserting included regions do not overlap... done\nReleasing layout... done\n[       OK ] included_regions_dont_overlap_test_success\n[ RUN      ] included_regions_overlap_test_success\nCreating layout... done\nAdding and including first region... done, second (overlapping) region... done\nAsserting included regions overlap... done\nReleasing layout... done\n[       OK ] included_regions_overlap_test_success\n[ RUN      ] region_not_included_overlap_test_success\nCreating layout... done\nAdding and including first region... done, second (overlapping) region, not included... done\nAsserting included regions do not overlap... done\nReleasing layout... done\n[       OK ] region_not_included_overlap_test_success\n[ RUN      ] layout_pass_sanity_checks_test_success\nCreating layout with one included region... done\nAsserting region range... done\nLayout passes sanity checks... done\nReleasing layout... done\n[       OK ] layout_pass_sanity_checks_test_success\n[ RUN      ] layout_region_invalid_address_test_success\nCreating layout with one included region... done\nLayout does not pass sanity checks... done\nReleasing layout... done\n[       OK ] layout_region_invalid_address_test_success\n[ RUN      ] layout_region_invalid_range_test_success\nCreating layout with one included region... done\nLayout does not pass sanity checks... done\nReleasing layout... done\n[       OK ] layout_region_invalid_range_test_success\n[==========] 6 test(s) run.\n[==========] Running 8 test(s).\n[ RUN      ] erase_chip_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"\"... done\nErase chip operation started.\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\nUnlock chip called\nRead chip called with start=0x0, len=0x800000\nErase chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] erase_chip_test_success\n[ RUN      ] erase_chip_with_dummyflasher_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"bus=spi,emulate=W25Q128FV\"... done\nErase chip operation started.\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\nErase chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] erase_chip_with_dummyflasher_test_success\n[ RUN      ] read_chip_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"\"... done\nRead chip operation started.\nUnlock chip called\nRead chip called with start=0x0, len=0x800000\n__wrap_fopen64 is called\n__wrap_fwrite is called\n__wrap_fflush is called\n__wrap_fclose is called\nRead chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] read_chip_test_success\n[ RUN      ] read_chip_with_dummyflasher_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"bus=spi,emulate=W25Q128FV\"... done\nRead chip operation started.\n__wrap_fopen64 is called\n__wrap_fwrite is called\n__wrap_fflush is called\n__wrap_fclose is called\nRead chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] read_chip_with_dummyflasher_test_success\n[ RUN      ] write_chip_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"\"... done\nWrite chip operation started.\n__wrap_fileno is called\n__wrap_fdopen is called\n__wrap_fileno is called\n__wrap_fstat64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\nUnlock chip called\nRead chip called with start=0x0, len=0x800000\nWrite chip called with start=0x0, len=0x200000\nWrite chip called with start=0x200000, len=0x200000\nWrite chip called with start=0x400000, len=0x200000\nWrite chip called with start=0x600000, len=0x200000\nWrite chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] write_chip_test_success\n[ RUN      ] write_chip_with_dummyflasher_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"bus=spi,emulate=W25Q128FV\"... done\nWrite chip operation started.\n__wrap_fileno is called\n__wrap_fdopen is called\n__wrap_fileno is called\n__wrap_fstat64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\nWrite chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] write_chip_with_dummyflasher_test_success\n[ RUN      ] verify_chip_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"\"... done\nVerify chip operation started.\n__wrap_fileno is called\n__wrap_fdopen is called\n__wrap_fileno is called\n__wrap_fstat64 is called\n__wrap_fread is called\n__wrap_fclose is called\nUnlock chip called\nRead chip called with start=0x0, len=0x800000\nVerify chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] verify_chip_test_success\n[ RUN      ] verify_chip_with_dummyflasher_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"bus=spi,emulate=W25Q128FV\"... done\nWrite chip operation started.\n__wrap_fileno is called\n__wrap_fdopen is called\n__wrap_fileno is called\n__wrap_fstat64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\nWrite chip operation done.\nVerify chip operation started.\nVerify chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] verify_chip_with_dummyflasher_test_success\n[==========] 8 test(s) run.\n[==========] Running 6 test(s).\n[ RUN      ] invalid_wp_range_dummyflasher_test_success\n[       OK ] invalid_wp_range_dummyflasher_test_success\n[ RUN      ] set_wp_range_dummyflasher_test_success\n[       OK ] set_wp_range_dummyflasher_test_success\n[ RUN      ] switch_wp_mode_dummyflasher_test_success\n[       OK ] switch_wp_mode_dummyflasher_test_success\n[ RUN      ] wp_init_from_status_dummyflasher_test_success\n[       OK ] wp_init_from_status_dummyflasher_test_success\n[ RUN      ] full_chip_erase_with_wp_dummyflasher_test_success\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\n[       OK ] full_chip_erase_with_wp_dummyflasher_test_success\n[ RUN      ] partial_chip_erase_with_wp_dummyflasher_test_success\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\n[       OK ] partial_chip_erase_with_wp_dummyflasher_test_success\n[==========] 6 test(s) run.\n", "result": "OK", "starttime": 1663300449.6151478, "duration": 10.830296993255615, "returncode": 0, "env": {"SANDBOX_MESSAGE_P@TH": "/proc/11552/fd/2", "SLOT": "0/0", "SHELL": "/bin/bash", "RUBY_TARGETS": "", "PORTAGE_INST_UID": "0", "KERNEL_ABI": "arm", "PORTAGE_PYTHONPATH": "/usr/lib64/python3.6/site-packages", "QEMU_SOFTMMU_TARGETS": "", "PORTAGE_FEATURES": "allow-missing-manifests assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg clean-logs config-protect-if-modified distlocks fixlafiles force-mirror ipc-sandbox multilib-strict network-sandbox noclean nodoc noinfo noman parallel-fetch parallel-install protect-owned sandbox sfperms splitdebug test unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr", "cros_setup_hooks_run": "booya", "ESYSROOT": "/build/arm-generic", "PYTHON_COMPAT_OVERRIDE": "python3_6", "LESS": "-R -M --shift 5", "SUDO_GID": "1000", "BOTO_CONFIG": "", "ROOTPATH": "/opt/bin:/usr/lib/llvm/bin", "USE_EXPAND_VALUES_KERNEL": "AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt", "PORTAGE_PYTHON": "/usr/bin/python3.6m", "PYTHON_SINGLE_TARGET": "", "BOARD_COMPILER_FLAGS": "-march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard", "PROFILE_ONLY_VARIABLES": "ARCH ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND", "SYMLINK_LIB": "no", "TSAN_OPTIONS": " log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan", "PKG_CONFIG_PATH": "/usr/lib/pkgconfig", "SANDBOX_ACTIVE": "armedandready", "LLVM_PROFILE_FILE": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/coverage_logs/flashrom-0.9.9_%9m.profraw", "LINUX_FIRMWARE": "", "USERLAND": "GNU", "CPU_FLAGS_X86": "", "PKG_TMPDIR": "/build/arm-generic/tmp/portage/._unmerge_", "PKGUSE": "", "USE_EXPAND_VALUES_USERLAND": "BSD GNU", "CHOST_arm": "arm-unknown-linux-gnu", "TTY_CONSOLE": "", "SANDBOX_ON": "1", "IUSE_EFFECTIVE": "alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 asan atahpt atapromise atavia buspirate_spi ch341a_spi coverage cros_host cros_workon_tree_0dba356809d0cb42d50019f80cc5ef75686e418f dediprog developerbox_spi digilent_spi drkaiser dummy elibc_AIX elibc_Cygwin elibc_Darwin elibc_DragonFly elibc_FreeBSD elibc_HPUX elibc_Interix elibc_NetBSD elibc_OpenBSD elibc_SunOS elibc_Winnt elibc_bionic elibc_glibc elibc_mingw elibc_mintlib elibc_musl elibc_uclibc ft2232_spi fuzzer gfxnvidia hppa hppa-hpux ia64 ia64-hpux ia64-linux internal it8212 jlink_spi kernel_AIX kernel_Darwin kernel_FreeBSD kernel_HPUX kernel_NetBSD kernel_OpenBSD kernel_SunOS kernel_Winnt kernel_freemint kernel_linux linux_mtd linux_spi m68k m68k-mint mediatek_i2c_spi mips msan mstarddc_spi nic3com nicintel nicintel_eeprom nicintel_spi nicnatsemi nicrealtek nios2 ogp_spi parade_lspcon pickit2_spi pony_spi ppc ppc-aix ppc-macos ppc-openbsd ppc64 ppc64-linux prefix prefix-guest prefix-stack raiden_debug_spi rayer_spi realtek_mst_i2c_spi riscv s390 satamv satasii serprog sh sparc sparc-fbsd sparc-solaris sparc64-freebsd sparc64-solaris static stlinkv3_spi test tsan ubsan usbblaster_spi userland_BSD userland_GNU wiki x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt", "EPREFIX": "", "STRINGS": "llvm-strings", "EBUILD_PHASE_FUNC": "src_test", "RESUMECOMMAND_CIPD": "/mnt/host/source/chromite/bin/fetch_cipd \"${URI}\" \"${DISTDIR}/${FILE}\"", "CAMERAS": "", "CURL_SSL": "", "PORTAGE_IPC_DAEMON": "1", "PORTAGE_BUNZIP2_COMMAND": "lbzip2 -d", "PROPERTIES": "live live", "EBUILD_PHASE": "test", "IUSE_IMPLICIT": "prefix prefix-guest prefix-stack", "FRITZCAPI_CARDS": "", "CXXEXCEPTIONS_FLAGS": "-fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables", "SUDO_COMMAND": "/bin/bash -c FEATURES=\"noclean test\" parallel_emerge --board arm-generic chromeos-base/libchrome chromeos-base/system_api chromeos-base/libbrillo chromeos-base/libhwsec-foundation chromeos-base/tpm_manager-client chromeos-base/libtpmcrypto chromeos-base/libhwsec chromeos-base/metrics chromeos-base/attestation-client chromeos-base/tpm_manager chromeos-base/chaps media-libs/cros-camera-libfs chromeos-base/cros-camera-android-deps chromeos-base/chromeos-config-tools chromeos-base/bootstat chromeos-base/shill-client chromeos-base/power_manager-client chromeos-base/cryptohome-client chromeos-base/secure-erase-file chromeos-base/cbor chromeos-base/bootlockbox-client chromeos-base/biod_proxy chromeos-base/attestation chromeos-base/chromeos-common-script chromeos-base/cros-camera-libs chromeos-base/libmems chromeos-base/session_manager-client chromeos-base/shill chromeos-base/shill-net chromeos-base/runtime_probe dev-libs/libutf chromeos-base/libpasswordprovider chromeos-base/libcontainer chromeos-base/libchromeos-ui chromeos-base/cryptohome chromeos-base/chromeos-storage-info chromeos-base/oobe_config chromeos-base/imageloader media-libs/cros-camera-hal-usb chromeos-base/verity chromeos-base/libec chromeos-base/libiioservice_ipc chromeos-base/permission_broker-client chromeos-base/mojo_service_manager chromeos-base/mems_setup chromeos-base/patchpanel-client chromeos-base/patchpanel chromeos-base/debugd-client chromeos-base/missive chromeos-base/runtime_probe-client dev-libs/libtextclassifier chromeos-base/chromeos-login chromeos-base/chromeos-init chromeos-base/shill-dbus-client chromeos-base/ml-client chromeos-base/libipp chromeos-base/update_engine-client chromeos-base/imageloader-client chromeos-base/dlcservice-client chromeos-base/vm_protos chromeos-base/libcrossystem chromeos-base/hardware_verifier_proto chromeos-base/modemfwd-proto chromeos-base/wilco-dtc-grpc-protos chromeos-base/policy-go-proto chromeos-base/chaps-client chromeos-base/p2p chromeos-base/modem-utilities chromeos-base/u2fd-client dev-libs/modp_b64 chromeos-base/secanomalyd chromeos-base/cros-camera chromeos-base/chromeos-installer chromeos-base/dev-install chromeos-base/rgbkbd chromeos-base/cros-disks chromeos-base/iioservice_simpleclient chromeos-base/lorgnette chromeos-base/chromeos-imageburner chromeos-base/iioservice chromeos-base/system-proxy chromeos-base/fusebox chromeos-base/hpsd chromeos-base/lexmark-fax-pnh chromeos-base/libvda-gpu-tests chromeos-base/secure-wipe chromeos-base/croslog chromeos-base/tpm_softclear_utils chromeos-base/cros-camera-tool chromeos-base/spaced chromeos-base/diagnostics chromeos-base/hps-tool chromeos-base/featured chromeos-base/hardware_verifier chromeos-base/ml chromeos-base/debugd chromeos-base/run_oci chromeos-base/permission_broker chromeos-base/kerberos chromeos-base/perfetto_simple_producer chromeos-base/smbprovider chromeos-base/chromeos-trim chromeos-base/dns-proxy chromeos-base/mist chromeos-base/hwsec-test-utils chromeos-base/power_manager chromeos-base/print_tools chromeos-base/dlp chromeos-base/smbfs chromeos-base/dlcservice chromeos-base/crash-reporter chromeos-base/usb_bouncer chromeos-base/policy_utils media-libs/cros-camera-libjea_test media-libs/cros-camera-document-scanning-test media-libs/cros-camera-test media-libs/cros-camera-usb-tests media-libs/cros-camera-libcamera_connector_test", "PORTAGE_SIGPIPE_STATUS": "141", "OFFICE_IMPLEMENTATION": "", "CBUILD": "x86_64-pc-linux-gnu", "SUDO_USER": "chrome-bot", "DEFAULT_ABI": "arm", "BUILD_CXX": "x86_64-pc-linux-gnu-clang++", "LIBDIR_arm": "lib", "FPMCU_FIRMWARE": "", "ALSA_CARDS": "", "ABI_S390": "", "KERNEL": "linux", "FFLAGS": "-O2", "EDITOR": "/usr/bin/vi", "ED": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/image", "PORTAGE_ARCHLIST": "alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips ppc ppc-aix ppc-macos ppc-openbsd ppc64 ppc64-linux s390 sh sparc sparc-fbsd sparc-solaris sparc64-freebsd sparc64-solaris x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt", "EBUILD": "/mnt/host/source/src/third_party/chromiumos-overlay/sys-apps/flashrom/flashrom-0.9.9-r1469.ebuild", "INHERITED": " cros-constants cros-credentials eutils toolchain-funcs multilib flag-o-matic git-2 cros-workon multiprocessing ninja-utils python-utils-r1 meson cros-sanitizers", "OPENMPI_RM": "", "EBUILD_MASTER_PID": "11605", "PORTAGE_REPO_NAME": "chromiumos", "PWD": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9", "FETCHCOMMAND_AB": "/mnt/host/source/chromite/bin/abutil fetch \"${URI}\" \"${DISTDIR}/${FILE}\"", "PORTAGE_RESTRICT": "", "PORTAGE_DOCOMPRESS_SIZE_LIMIT": "128", "LOGNAME": "chrome-bot", "CXXEXCEPTIONS": "0", "EXEOPTIONS": "-m0755", "CTARGET_default": "armv7a-cros-linux-gnueabihf", "DEFINED_PHASES": " compile configure info install setup test unpack", "PORTAGE_BINPKG_TAR_OPTS": "--checkpoint=1000", "SANDBOX_VERBOSE": "1", "PORTAGE_WORKDIR_MODE": "0755", "PKGDIR": "/build/arm-generic/packages/", "FILESDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/files", "RESUMECOMMAND_GS": "bash -c 'BOTO_CONFIG= /mnt/host/source/chromite/bin/gs_fetch_binpkg \"${URI}\" \"${DISTDIR}/${FILE}\"'", "DIROPTIONS": "-m0755", "MAKEOPTS": "-j32", "PORTAGE_CONFIGROOT": "/build/arm-generic/", "PM_EBUILD_HOOK_DIR": "/build/arm-generic/etc/portage/env", "CXX": "armv7a-cros-linux-gnueabihf-clang++", "CXXFLAGS": " -Os -pipe  -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections", "PORTAGE_OVERRIDE_EPREFIX": "", "XAUTHORITY": "/home/chronos/.Xauthority", "BUILD_CC": "x86_64-pc-linux-gnu-clang", "ABI_PPC": "", "T": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp", "S": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9", "P": "flashrom-0.9.9", "U_BOOT_FDT_USE": "", "D": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/image", "A": "", "CATEGORY": "sys-apps", "EC_FIRMWARE_EXTRA": "", "LD_PRELOAD": "libsandbox.so", "PYTHON_TARGETS": "", "ENLIGHTENMENT_MODULES": "", "CALLIGRA_FEATURES": "", "GI_TYPELIB_PATH": "/usr/local/lib/girepository-1.0:/usr/lib/girepository-1.0", "LDFLAGS": "-Wl,-O2 -Wl,--as-needed  -Wl,--gc-sections -Wl,--icf=all", "EBEEP_IGNORE": "1", "HOME": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir", "LIBREOFFICE_EXTENSIONS": "", "NETBEANS": "apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml", "LANG": "en_US.UTF-8", "PORTAGE_COMPRESS": "pigz", "WORKDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work", "QEMU_USER_TARGETS": "", "DRACUT_MODULES": "", "INSOPTIONS": "-m0644", "SANDBOX_LIB": "libsandbox.so", "UWSGI_PLUGINS": "", "CROS_BASE_RUSTFLAGS": "-Ctarget-feature=+armv7-a,+neon", "COLUMNS": "80", "BROOT": "", "BOARD_USE": "", "PORTAGE_TMPDIR": "/build/arm-generic/tmp", "CXX_FOR_BUILD": "x86_64-pc-linux-gnu-clang++", "LINGUAS": "", "PORTAGE_COLORMAP": "GOOD=$'\u001b[32;01m'\nWARN=$'\u001b[33;01m'\nBAD=$'\u001b[31;01m'\nHILITE=$'\u001b[36m'\nBRACKET=$'\u001b[34;01m'\nNORMAL=$'\u001b[0m'", "SANDBOX_READ": "/:/build/arm-generic/tmp/portage", "LCD_DEVICES": "", "FEATURES": "allow-missing-manifests assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg clean-logs config-protect-if-modified distlocks fixlafiles force-mirror ipc-sandbox multilib-strict network-sandbox noclean nodoc noinfo noman parallel-fetch parallel-install protect-owned sandbox sfperms splitdebug test unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr", "NETBEANS_MODULES": "", "TMPDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp", "INSTALL_MASK": "   /usr/lib*/*.la   /etc/init.d /etc/conf.d   /etc/logrotate.d   /etc/sandbox.d   /usr/share/bash-completion   /usr/share/locale ", "PORTAGE_BIN_PATH": "/usr/lib/portage/python3.6", "_E_INSDESTTREE_": "", "SANDBOX_METHOD": "any", "LD": "armv7a-cros-linux-gnueabihf-ld.lld", "POSTSUBMIT_BINHOST": "gs://chromeos-prebuilt/board/arm-generic/postsubmit-R108-15119.0.0-39982-8802937358584190913/packages", "OPENMPI_OFED_FEATURES": "", "NM_FOR_BUILD": "llvm-nm", "ABI_ARM": "", "PORTAGE_INTERNAL_CALLER": "1", "PORTAGE_COMPRESSION_COMMAND": "zstd -3", "PVR": "0.9.9-r1469", "MARCH_TUNE": "", "PKG_LOGDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/logging", "READELF": "llvm-readelf", "CPU_FLAGS_ARM": "", "ASAN_OPTIONS": " log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan detect_stack_use_after_return=0", "KEYWORDS": "*", "PORTAGE_COMPRESS_EXCLUDE_SUFFIXES": "css gif htm[l]? jp[e]?g js pdf png", "STRIP_FOR_BUILD": "llvm-strip", "FULL_BINHOST": "gs://chromeos-prebuilt/board/arm-generic/full-R107-15117.0.0-rc3/packages/", "PORTAGE_BUILD_USER": "chrome-bot", "VCSID": "0.9.9-r1469-bf82e6be443883de436a54f49ace638782314b5f", "OPENMPI_FABRICS": "", "CHROMEOS_KERNEL_SPLITCONFIG": "chromiumos-arm", "NGINX_MODULES_MAIL": "", "USE_EXPAND_UNPREFIXED": "ARCH", "PORT_LOGDIR": "/build/arm-generic/tmp/portage/logs/", "MOPREFIX": "flashrom", "EC_FIRMWARE": "", "_E_EXEDESTTREE_": "", "MOZ_GMP_PATH": "/build/arm-generic/usr/lib/nsbrowser/plugins/gmp-gmpopenh264/system-installed", "FFTOOLS": "", "OFED_DRIVERS": "", "LLVM_TARGETS": "", "LIRC_DEVICES": "", "FETCHCOMMAND_SSH": "bash -c \"x=\\${2#ssh://} ; host=\\${x%%/*} ; port=\\${host##*:} ; host=\\${host%:*} ; [[ \\${host} = \\${port} ]] && port= ; exec rsync --rsh=\\\"ssh \\${port:+-p\\${port}} \\${3}\\\" -avP \\\"\\${host}:/\\${x#*/}\\\" \\\"\\$1\\\"\" rsync \"${DISTDIR}/${FILE}\" \"${URI}\" \"${PORTAGE_SSH_OPTS}\"", "PORTAGE_PYM_PATH": "/usr/lib64/python3.6/site-packages", "OZONE_PLATFORM_DEFAULT": "", "FCFLAGS": "-O2", "CHROMEOS_KERNEL_FAMILY": "", "EPAUSE_IGNORE": "1", "LSAN_OPTIONS": " print_suppressions=0", "TERM": "unknown", "BOOTSTRAP_USE": "cxx unicode python_targets_python3_2 python_targets_python2_7", "OBJCOPY_FOR_BUILD": "llvm-objcopy", "LESSOPEN": "|lesspipe %s", "EROOT": "/build/arm-generic", "CC_FOR_BUILD": "x86_64-pc-linux-gnu-clang", "AT_SYS_M4DIR": "${SYSROOT}/usr/share/aclocal", "PORTAGE_XATTR_EXCLUDE": "btrfs.* security.evm security.ima \tsecurity.selinux system.nfs4_acl user.apache_handler \tuser.Beagle.* user.dublincore.* user.mime_encoding user.xdg.*", "PORTAGE_LOG_FILE": "/build/arm-generic/tmp/portage/logs/sys-apps:flashrom-0.9.9-r1469:20220916-035354.log", "NOCOLOR": "true", "PORTAGE_DEBUG": "0", "CROS_WORKON_SRCROOT": "/mnt/host/source", "RESUMECOMMAND_AB": "/mnt/host/source/chromite/bin/abutil fetch \"${URI}\" \"${DISTDIR}/${FILE}\"", "OZONE_PLATFORM": "", "RESTRICT": "", "GCE_METADATA_HOST": "127.0.0.1:33101", "SANDBOX_DEBUG": "0", "PORTAGE_DEPCACHEDIR": "/var/cache/edb/dep", "AR": "llvm-ar", "ARCH": "arm", "NGINX_MODULES_HTTP": "", "ROOT": "/build/arm-generic", "VIDEO_CARDS": "", "ROS_MESSAGES": "", "ABI_X86": "", "TEMP": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp", "USE_EXPAND_VALUES_ARCH": "alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt", "INPUT_DEVICES": "", "OBJDUMP_FOR_BUILD": "llvm-objdump", "FOO2ZJS_DEVICES": "", "PORTAGE_COMPRESS_FLAGS": "-3", "SHLVL": "1", "AR_FOR_BUILD": "llvm-ar", "DISTDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/distdir", "NM": "llvm-nm", "PORTAGE_REPOSITORIES": "[DEFAULT]\nauto-sync = yes\nmain-repo = portage-stable\nstrict-misc-digests = true\nsync-allow-hardlinks = true\nsync-rcu = false\n\n[arm-generic]\nauto-sync = yes\nlocation = /mnt/host/source/src/overlays/overlay-arm-generic\nmasters = portage-stable chromiumos eclass-overlay\npriority = 2\nstrict-misc-digests = true\nsync-allow-hardlinks = true\nsync-rcu = false\n\n[chromiumos]\nauto-sync = yes\nlocation = /mnt/host/source/src/third_party/chromiumos-overlay\nmasters = portage-stable eclass-overlay\npriority = 0\nstrict-misc-digests = true\nsync-allow-hardlinks = true\nsync-rcu = false\n\n[eclass-overlay]\nauto-sync = yes\nlocation = /mnt/host/source/src/third_party/eclass-overlay\nmasters = \npriority = 1\nstrict-misc-digests = true\nsync-allow-hardlinks = true\nsync-rcu = false\n\n[portage-stable]\nauto-sync = yes\nlocation = /mnt/host/source/src/third_party/portage-stable\nmasters = eclass-overlay\npriority = -1000\nstrict-misc-digests = true\nsync-allow-hardlinks = true\nsync-rcu = false\n", "APACHE2_MPMS": "", "SANDBOX_WRITE": ":/build/arm-generic/tmp/portage:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir/.bash_history:/dev/console:/dev/fd:/dev/full:/dev/null:/dev/ptmx:/dev/pts/:/dev/pty:/dev/shm:/dev/tts:/dev/tty:/dev/vc/:/dev/zero:/proc/self/fd:/tmp/:/usr/lib/cf:/usr/lib/conftest:/usr/lib32/cf:/usr/lib32/conftest:/usr/lib64/cf:/usr/lib64/conftest:/usr/tmp/:/usr/tmp/cf:/usr/tmp/conftest:/var/tmp/", "CHOST_default": "armv7a-cros-linux-gnueabihf", "XFCE_PLUGINS": "", "GPSD_PROTOCOLS": "", "LC_MESSAGES": "C", "FETCHCOMMAND_CIPD": "/mnt/host/source/chromite/bin/fetch_cipd \"${URI}\" \"${DISTDIR}/${FILE}\"", "XTABLES_ADDONS": "", "LICENSE": "GPL-2", "PYTHONDONTWRITEBYTECODE": "1", "SYSROOT": "/build/arm-generic", "UBSAN_OPTIONS": " log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan:symbolize=1:print_stacktrace=1", "VOICEMAIL_STORAGE": "", "U_BOOT_CONFIG_USE": "", "PV": "0.9.9", "RESUMECOMMAND_SSH": "bash -c \"x=\\${2#ssh://} ; host=\\${x%%/*} ; port=\\${host##*:} ; host=\\${host%:*} ; [[ \\${host} = \\${port} ]] && port= ; exec rsync --rsh=\\\"ssh \\${port:+-p\\${port}} \\${3}\\\" -avP \\\"\\${host}:/\\${x#*/}\\\" \\\"\\$1\\\"\" rsync \"${DISTDIR}/${FILE}\" \"${URI}\" \"${PORTAGE_SSH_OPTS}\"", "SANDBOX_LOG": "/tmp/sandbox-11552.log", "PR": "r1469", "STRIP_MASK": "*.nexe /firmware/*.elf", "COLLECTD_PLUGINS": "", "PN": "flashrom", "XARGS": "xargs -r", "SANE_BACKENDS": "", "USE_EXPAND_IMPLICIT": "ARCH ELIBC KERNEL USERLAND", "PF": "flashrom-0.9.9-r1469", "USE_EXPAND_VALUES_ELIBC": "AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt", "LD_LIBRARY_PATH": "/usr/local/lib", "CROS_ARTIFACTS_TMP_DIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/cros-artifacts", "PORTAGE_BASHRC": "/build/arm-generic/etc/portage/bashrc", "CXXLD_FOR_BUILD": "x86_64-pc-linux-gnu-clang++", "ACCEPT_LICENSE": "GPL-2", "BUILD_PREFIX": "/build/arm-generic/tmp/portage", "MERGE_TYPE": "source", "ABI_MIPS": "", "_E_DOCDESTTREE_": "", "_E_DESTTREE_": "/usr", "BOARD_RUSTFLAGS": "-Ctarget-feature=+armv7-a,+neon", "COMMON_COMPILER_FLAGS": "", "PORTAGE_ACTUAL_DISTDIR": "/var/cache/chromeos-cache/distfiles", "OBJCOPY": "llvm-objcopy", "RANLIB_FOR_BUILD": "llvm-ranlib", "CCACHE_DISABLE": "1", "LIBDIR_default": "lib", "PKG_INSTALL_MASK": "   /usr/lib*/*.la   /etc/init.d /etc/conf.d   /etc/logrotate.d   /etc/sandbox.d   /usr/share/bash-completion   /usr/share/locale ", "SANDBOX_PREDICT": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir:/dev/crypto:/proc/self/coredump_filter:/dev/random:/proc/self/coredump_filter:/usr/share/cache/fontconfig:/", "FCDSL_CARDS": "", "LIBOPTIONS": "-m0644", "GRUB_PLATFORMS": "", "OBJC_FOR_BUILD": "x86_64-pc-linux-gnu-clang", "SANDBOX_DENY": "", "EBUILD_DEATH_HOOKS": " cros_log_failed_packages cros-workon_on_die_rebase_check asan_death_hook", "STRIP": "llvm-strip", "LC_COLLATE": "C", "OBJC": "x86_64-pc-linux-gnu-clang", "MSAN_OPTIONS": " log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan", "CHOST": "armv7a-cros-linux-gnueabihf", "TMP": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp", "PORTAGE_INST_GID": "0", "OBJDUMP": "llvm-objdump", "PATH": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/build-toolchain-wrappers:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/build-toolchain-wrappers/gnu_tools:/usr/lib/portage/python3.6/ebuild-helpers/xattr:/usr/lib/portage/python3.6/ebuild-helpers:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/bin:/build/arm-generic/build/bin", "SANDBOX_DEBUG_LOG": "/tmp/sandbox-debug-11552.log", "PORTAGE_BUILDDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469", "PORTAGE_BZIP2_COMMAND": "lbzip2 -z", "PORTAGE_USERNAME": "chrome-bot", "NGINX_MODULES_STREAM": "", "USE": "arm dummy elibc_glibc ft2232_spi internal it8212 kernel_linux linux_mtd linux_spi mediatek_i2c_spi parade_lspcon raiden_debug_spi realtek_mst_i2c_spi serprog stlinkv3_spi test usbblaster_spi userland_GNU wiki", "PHP_TARGETS": "", "READELF_FOR_BUILD": "llvm-readelf", "CC": "armv7a-cros-linux-gnueabihf-clang", "TESTS": "", "CCLD_FOR_BUILD": "x86_64-pc-linux-gnu-clang", "BOARD_OVERLAY": "/mnt/host/source/src/overlays/overlay-arm-generic", "CFLAGS": " -Os -pipe  -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections", "USE_EXPAND": "ABI_ARM ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS BOARD_USE CALLIGRA_FEATURES CAMERAS CHROMEOS_KERNEL_FAMILY COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS CROS_WORKON_TREE CURL_SSL DRACUT_MODULES DVB_CARDS EC_FIRMWARE EC_FIRMWARE_EXTRA ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FOO2ZJS_DEVICES FPMCU_FIRMWARE FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LINUX_FIRMWARE LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM OZONE_PLATFORM OZONE_PLATFORM_DEFAULT PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS TESTS TTY_CONSOLE USERLAND UWSGI_PLUGINS U_BOOT_CONFIG_USE U_BOOT_FDT_USE VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS", "SANDBOX_BASHRC": "/usr/share/sandbox/sandbox.bashrc", "CROSSCOMPILE_OPTS": "", "SUDO_UID": "1000", "MULTILIB_ABIS": "arm", "STRINGS_FOR_BUILD": "llvm-strings", "LIBDIR_x86": "lib", "PORTAGE_GID": "250", "FETCHCOMMAND_GS": "bash -c 'BOTO_CONFIG= /mnt/host/source/chromite/bin/gs_fetch_binpkg \"${URI}\" \"${DISTDIR}/${FILE}\"'", "MAIL": "/var/mail/root", "PORTAGE_BUILD_GROUP": "portage", "BASHRC_FILESDIR": "/mnt/host/source/src/third_party/chromiumos-overlay/sys-apps/flashrom/files", "APACHE2_MODULES": "", "ELIBC": "glibc", "EAPI": "7", "RANLIB": "llvm-ranlib", "ABI": "arm", "ECLASS_DEPTH": "0", "PORTAGE_BASHRC_FILES": "/mnt/host/source/src/third_party/chromiumos-overlay/profiles/base/profile.bashrc\n/mnt/host/source/src/third_party/chromiumos-overlay/profiles/targets/chromeos/profile.bashrc", "CROS_WORKON_TREE": "0dba356809d0cb42d50019f80cc5ef75686e418f", "OLDPWD": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir", "BUILD_LD": "x86_64-pc-linux-gnu-ld.lld", "MONKEYD_PLUGINS": "", "EMERGE_FROM": "ebuild", "LADSPA_PATH": "/usr/lib/ladspa", "PKG_CONFIG": "/build/arm-generic/build/bin/pkg-config", "DVB_CARDS": "", "_": "/usr/bin/meson", "MESON_EXE_WRAPPER": "/mnt/host/source/src/platform2/common-mk/meson_test.py", "MALLOC_PERTURB_": "127"}, "command": ["/mnt/host/source/src/platform2/common-mk/meson_test.py", "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/tests/flashrom_unit_tests"], "stderr": "[  PASSED  ] 7 test(s).\n[  PASSED  ] 1 test(s).\n[  PASSED  ] 11 test(s).\n[  PASSED  ] 15 test(s).\n[  SKIPPED ] 2 test(s), listed below:\n[  SKIPPED ] nicrealtek_basic_lifecycle_test_success\n[  SKIPPED ] dediprog_basic_lifecycle_test_success\n\n 2 SKIPPED TEST(S)\n[  PASSED  ] 6 test(s).\n[  PASSED  ] 8 test(s).\n[  PASSED  ] 6 test(s).\n"}
+{"name": "cmocka test flashrom", "stdout": "Running [PosixPath('/mnt/host/source/src/platform2/common-mk/platform2_test.py'), '--sysroot', '/build/arm-generic', '--', '/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/tests/flashrom_unit_tests']\n[==========] Running 7 test(s).\n[ RUN      ] address_to_bits_test_success\n[       OK ] address_to_bits_test_success\n[ RUN      ] bitcount_test_success\n[       OK ] bitcount_test_success\n[ RUN      ] minmax_test_success\n[       OK ] minmax_test_success\n[ RUN      ] strcat_realloc_test_success\n[       OK ] strcat_realloc_test_success\n[ RUN      ] tolower_string_test_success\n[       OK ] tolower_string_test_success\n[ RUN      ] reverse_byte_test_success\n[       OK ] reverse_byte_test_success\n[ RUN      ] reverse_bytes_test_success\n[       OK ] reverse_bytes_test_success\n[==========] 7 test(s) run.\n[==========] Running 1 test(s).\n[ RUN      ] flashbuses_to_text_test_success\n[       OK ] flashbuses_to_text_test_success\n[==========] 1 test(s) run.\n[==========] Running 11 test(s).\n[ RUN      ] spi_write_enable_test_success\n[       OK ] spi_write_enable_test_success\n[ RUN      ] spi_write_disable_test_success\n[       OK ] spi_write_disable_test_success\n[ RUN      ] spi_read_chunked_test_success\n[       OK ] spi_read_chunked_test_success\n[ RUN      ] probe_spi_rdid_test_success\n[       OK ] probe_spi_rdid_test_success\n[ RUN      ] probe_spi_rdid4_test_success\n[       OK ] probe_spi_rdid4_test_success\n[ RUN      ] probe_spi_rems_test_success\n[       OK ] probe_spi_rems_test_success\n[ RUN      ] probe_spi_res1_test_success\n[       OK ] probe_spi_res1_test_success\n[ RUN      ] probe_spi_res2_test_success\n[       OK ] probe_spi_res2_test_success\n[ RUN      ] probe_spi_res3_test_success\n[       OK ] probe_spi_res3_test_success\n[ RUN      ] probe_spi_at25f_test_success\n[       OK ] probe_spi_at25f_test_success\n[ RUN      ] probe_spi_st95_test_success\n[       OK ] probe_spi_st95_test_success\n[==========] 11 test(s) run.\n[==========] Running 17 test(s).\n[ RUN      ] dummy_basic_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=dummy ...\n... flashrom_programmer_init for programmer=dummy successful\nTesting flashrom_programmer_shutdown for programmer=dummy ...\n... flashrom_programmer_shutdown for programmer=dummy successful\n[       OK ] dummy_basic_lifecycle_test_success\n[ RUN      ] dummy_probe_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=dummy ...\n... flashrom_programmer_init for programmer=dummy successful\nTesting flashrom_flash_probe for programmer=dummy, chip=W25Q128.V ... \n... flashrom_flash_probe for programmer=dummy successful\nTesting flashrom_programmer_shutdown for programmer=dummy ...\n... flashrom_programmer_shutdown for programmer=dummy successful\n[       OK ] dummy_probe_lifecycle_test_success\n[ RUN      ] dummy_probe_variable_size_test_success\nTesting flashrom_programmer_init for programmer=dummy ...\n... flashrom_programmer_init for programmer=dummy successful\nTesting flashrom_flash_probe for programmer=dummy, chip=Opaque flash chip ... \n... flashrom_flash_probe for programmer=dummy successful\nTesting flashrom_programmer_shutdown for programmer=dummy ...\n... flashrom_programmer_shutdown for programmer=dummy successful\n[       OK ] dummy_probe_variable_size_test_success\n[ RUN      ] dummy_init_fails_unhandled_param_test_success\nTesting init error path for programmer=dummy with params: bus=spi,emulate=INVALID,unhandled=value ...\n... init failed with error code 1 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] dummy_init_fails_unhandled_param_test_success\n[ RUN      ] dummy_init_success_invalid_param_test_success\nTesting init error path for programmer=dummy with params: bus=spi,emulate=W25Q128FV,invalid=value ...\n... init failed with error code -238 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] dummy_init_success_invalid_param_test_success\n[ RUN      ] dummy_init_success_unhandled_param_test_success\nTesting init error path for programmer=dummy with params: bus=spi,emulate=W25Q128FV,voltage=3.5V ...\n... init failed with error code -238 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] dummy_init_success_unhandled_param_test_success\n[ RUN      ] nicrealtek_basic_lifecycle_test_success\n[  SKIPPED ] nicrealtek_basic_lifecycle_test_success\n[ RUN      ] raiden_debug_basic_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=raiden_debug_spi ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap_libusb_init is called\n__wrap_libusb_get_device_list is called\n__wrap_libusb_get_bus_number is called\n__wrap_libusb_get_device_address is called\n__wrap_libusb_get_device_descriptor is called\n__wrap_libusb_get_config_descriptor is called\n__wrap_libusb_ref_device is called\n__wrap_libusb_free_device_list is called\n__wrap_libusb_open is called\n__wrap_libusb_get_configuration is called\n__wrap_libusb_set_auto_detach_kernel_driver is called\n__wrap_libusb_claim_interface is called\n__wrap_libusb_control_transfer is called\n... flashrom_programmer_init for programmer=raiden_debug_spi successful\nTesting flashrom_programmer_shutdown for programmer=raiden_debug_spi ...\n__wrap_libusb_control_transfer is called\n__wrap_libusb_unref_device is called\n__wrap_libusb_free_config_descriptor is called\n__wrap_libusb_exit is called\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=raiden_debug_spi successful\n[       OK ] raiden_debug_basic_lifecycle_test_success\n[ RUN      ] dediprog_basic_lifecycle_test_success\n[  SKIPPED ] dediprog_basic_lifecycle_test_success\n[ RUN      ] linux_mtd_probe_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=linux_mtd ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap_stat64 is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_stat64 is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap_setvbuf is called\n... flashrom_programmer_init for programmer=linux_mtd successful\nTesting flashrom_flash_probe for programmer=linux_mtd, chip=Opaque flash chip ... \n... flashrom_flash_probe for programmer=linux_mtd successful\nTesting flashrom_programmer_shutdown for programmer=linux_mtd ...\n__wrap_fclose is called\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=linux_mtd successful\n[       OK ] linux_mtd_probe_lifecycle_test_success\n[ RUN      ] linux_spi_probe_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=linux_spi ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap___open64_2 is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_fopen64 is called\n__wrap___fgets_chk is called\n__wrap_fclose is called\n... flashrom_programmer_init for programmer=linux_spi successful\nTesting flashrom_flash_probe for programmer=linux_spi, chip=W25Q128.V ... \n__wrap_ioctl is called\n__wrap_ioctl is called\n... flashrom_flash_probe for programmer=linux_spi successful\nTesting flashrom_programmer_shutdown for programmer=linux_spi ...\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=linux_spi successful\n[       OK ] linux_spi_probe_lifecycle_test_success\n[ RUN      ] parade_lspcon_basic_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=parade_lspcon ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap___open64_2 is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n... flashrom_programmer_init for programmer=parade_lspcon successful\nTesting flashrom_programmer_shutdown for programmer=parade_lspcon ...\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=parade_lspcon successful\n[       OK ] parade_lspcon_basic_lifecycle_test_success\n[ RUN      ] parade_lspcon_no_allow_brick_test_success\nTesting init error path for programmer=parade_lspcon with params: bus=254 ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap_flock is called\n... init failed with error code -1 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] parade_lspcon_no_allow_brick_test_success\n[ RUN      ] mediatek_i2c_spi_basic_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=mediatek_i2c_spi ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap___open64_2 is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n... flashrom_programmer_init for programmer=mediatek_i2c_spi successful\nTesting flashrom_programmer_shutdown for programmer=mediatek_i2c_spi ...\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=mediatek_i2c_spi successful\n[       OK ] mediatek_i2c_spi_basic_lifecycle_test_success\n[ RUN      ] mediatek_i2c_no_allow_brick_test_success\nTesting init error path for programmer=mediatek_i2c_spi with params: bus=254 ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap_flock is called\n... init failed with error code -1 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] mediatek_i2c_no_allow_brick_test_success\n[ RUN      ] realtek_mst_basic_lifecycle_test_success\nTesting flashrom_programmer_init for programmer=realtek_mst_i2c_spi ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap___open64_2 is called\n__wrap_ioctl is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n... flashrom_programmer_init for programmer=realtek_mst_i2c_spi successful\nTesting flashrom_programmer_shutdown for programmer=realtek_mst_i2c_spi ...\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_read is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_ioctl is called\n__wrap_write is called\n__wrap_flock is called\n... flashrom_programmer_shutdown for programmer=realtek_mst_i2c_spi successful\n[       OK ] realtek_mst_basic_lifecycle_test_success\n[ RUN      ] realtek_mst_no_allow_brick_test_success\nTesting init error path for programmer=realtek_mst_i2c_spi with params: bus=254,enter_isp=0 ...\n__wrap_open64 is called\n__wrap_flock is called\n__wrap_flock is called\n... init failed with error code -1 as expected\nRunning programmer shutdown in case anything got registered...\n... completed\n[       OK ] realtek_mst_no_allow_brick_test_success\n[==========] 17 test(s) run.\n[==========] Running 6 test(s).\n[ RUN      ] included_regions_dont_overlap_test_success\nCreating layout... done\nAdding and including first region... done, second (non-overlapping) region... done\nAsserting included regions do not overlap... done\nReleasing layout... done\n[       OK ] included_regions_dont_overlap_test_success\n[ RUN      ] included_regions_overlap_test_success\nCreating layout... done\nAdding and including first region... done, second (overlapping) region... done\nAsserting included regions overlap... done\nReleasing layout... done\n[       OK ] included_regions_overlap_test_success\n[ RUN      ] region_not_included_overlap_test_success\nCreating layout... done\nAdding and including first region... done, second (overlapping) region, not included... done\nAsserting included regions do not overlap... done\nReleasing layout... done\n[       OK ] region_not_included_overlap_test_success\n[ RUN      ] layout_pass_sanity_checks_test_success\nCreating layout with one included region... done\nAsserting region range... done\nLayout passes sanity checks... done\nReleasing layout... done\n[       OK ] layout_pass_sanity_checks_test_success\n[ RUN      ] layout_region_invalid_address_test_success\nCreating layout with one included region... done\nLayout does not pass sanity checks... done\nReleasing layout... done\n[       OK ] layout_region_invalid_address_test_success\n[ RUN      ] layout_region_invalid_range_test_success\nCreating layout with one included region... done\nLayout does not pass sanity checks... done\nReleasing layout... done\n[       OK ] layout_region_invalid_range_test_success\n[==========] 6 test(s) run.\n[==========] Running 8 test(s).\n[ RUN      ] erase_chip_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"\"... done\nErase chip operation started.\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\nUnlock chip called\nRead chip called with start=0x0, len=0x800000\nErase chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] erase_chip_test_success\n[ RUN      ] erase_chip_with_dummyflasher_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"bus=spi,emulate=W25Q128FV\"... done\nErase chip operation started.\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\nErase chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] erase_chip_with_dummyflasher_test_success\n[ RUN      ] read_chip_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"\"... done\nRead chip operation started.\nUnlock chip called\nRead chip called with start=0x0, len=0x800000\n__wrap_fopen64 is called\n__wrap_fwrite is called\n__wrap_fflush is called\n__wrap_fclose is called\nRead chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] read_chip_test_success\n[ RUN      ] read_chip_with_dummyflasher_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"bus=spi,emulate=W25Q128FV\"... done\nRead chip operation started.\n__wrap_fopen64 is called\n__wrap_fwrite is called\n__wrap_fflush is called\n__wrap_fclose is called\nRead chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] read_chip_with_dummyflasher_test_success\n[ RUN      ] write_chip_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"\"... done\nWrite chip operation started.\n__wrap_fileno is called\n__wrap_fdopen is called\n__wrap_fileno is called\n__wrap_fstat64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\nUnlock chip called\nRead chip called with start=0x0, len=0x800000\nWrite chip called with start=0x0, len=0x200000\nWrite chip called with start=0x200000, len=0x200000\nWrite chip called with start=0x400000, len=0x200000\nWrite chip called with start=0x600000, len=0x200000\nWrite chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] write_chip_test_success\n[ RUN      ] write_chip_with_dummyflasher_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"bus=spi,emulate=W25Q128FV\"... done\nWrite chip operation started.\n__wrap_fileno is called\n__wrap_fdopen is called\n__wrap_fileno is called\n__wrap_fstat64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\nWrite chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] write_chip_with_dummyflasher_test_success\n[ RUN      ] verify_chip_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"\"... done\nVerify chip operation started.\n__wrap_fileno is called\n__wrap_fdopen is called\n__wrap_fileno is called\n__wrap_fstat64 is called\n__wrap_fread is called\n__wrap_fclose is called\nUnlock chip called\nRead chip called with start=0x0, len=0x800000\nVerify chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] verify_chip_test_success\n[ RUN      ] verify_chip_with_dummyflasher_test_success\nCreating layout with one included region... done\nDummyflasher initialising with param=\"bus=spi,emulate=W25Q128FV\"... done\nWrite chip operation started.\n__wrap_fileno is called\n__wrap_fdopen is called\n__wrap_fileno is called\n__wrap_fstat64 is called\n__wrap_fread is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\nWrite chip operation done.\nVerify chip operation started.\nVerify chip operation done.\nDummyflasher shutdown... done\nReleasing layout... done\n[       OK ] verify_chip_with_dummyflasher_test_success\n[==========] 8 test(s) run.\n[==========] Running 6 test(s).\n[ RUN      ] invalid_wp_range_dummyflasher_test_success\n[       OK ] invalid_wp_range_dummyflasher_test_success\n[ RUN      ] set_wp_range_dummyflasher_test_success\n[       OK ] set_wp_range_dummyflasher_test_success\n[ RUN      ] switch_wp_mode_dummyflasher_test_success\n[       OK ] switch_wp_mode_dummyflasher_test_success\n[ RUN      ] wp_init_from_status_dummyflasher_test_success\n[       OK ] wp_init_from_status_dummyflasher_test_success\n[ RUN      ] full_chip_erase_with_wp_dummyflasher_test_success\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\n[       OK ] full_chip_erase_with_wp_dummyflasher_test_success\n[ RUN      ] partial_chip_erase_with_wp_dummyflasher_test_success\n__wrap_fopen64 is called\n__wrap___vfprintf_chk is called\n__wrap_fclose is called\n[       OK ] partial_chip_erase_with_wp_dummyflasher_test_success\n[==========] 6 test(s) run.\n", "result": "OK", "starttime": 1663322572.185981, "duration": 11.006221771240234, "returncode": 0, "env": {"SANDBOX_MESSAGE_P@TH": "/proc/11800/fd/2", "SLOT": "0/0", "SHELL": "/bin/bash", "RUBY_TARGETS": "", "PORTAGE_INST_UID": "0", "KERNEL_ABI": "arm", "PORTAGE_PYTHONPATH": "/usr/lib64/python3.6/site-packages", "QEMU_SOFTMMU_TARGETS": "", "PORTAGE_FEATURES": "allow-missing-manifests assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg clean-logs config-protect-if-modified distlocks fixlafiles force-mirror ipc-sandbox multilib-strict network-sandbox noclean nodoc noinfo noman parallel-fetch parallel-install protect-owned sandbox sfperms splitdebug test unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr", "cros_setup_hooks_run": "booya", "ESYSROOT": "/build/arm-generic", "PYTHON_COMPAT_OVERRIDE": "python3_6", "LESS": "-R -M --shift 5", "SUDO_GID": "1000", "BOTO_CONFIG": "", "ROOTPATH": "/opt/bin:/usr/lib/llvm/bin", "USE_EXPAND_VALUES_KERNEL": "AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt", "PORTAGE_PYTHON": "/usr/bin/python3.6m", "PYTHON_SINGLE_TARGET": "", "BOARD_COMPILER_FLAGS": "-march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard", "PROFILE_ONLY_VARIABLES": "ARCH ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND", "SYMLINK_LIB": "no", "TSAN_OPTIONS": " log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan", "PKG_CONFIG_PATH": "/usr/lib/pkgconfig", "SANDBOX_ACTIVE": "armedandready", "LLVM_PROFILE_FILE": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/coverage_logs/flashrom-0.9.9_%9m.profraw", "LINUX_FIRMWARE": "", "USERLAND": "GNU", "CPU_FLAGS_X86": "", "PKG_TMPDIR": "/build/arm-generic/tmp/portage/._unmerge_", "PKGUSE": "", "USE_EXPAND_VALUES_USERLAND": "BSD GNU", "CHOST_arm": "arm-unknown-linux-gnu", "TTY_CONSOLE": "", "SANDBOX_ON": "1", "IUSE_EFFECTIVE": "alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 asan atahpt atapromise atavia buspirate_spi ch341a_spi coverage cros_host cros_workon_tree_0dba356809d0cb42d50019f80cc5ef75686e418f dediprog developerbox_spi digilent_spi drkaiser dummy elibc_AIX elibc_Cygwin elibc_Darwin elibc_DragonFly elibc_FreeBSD elibc_HPUX elibc_Interix elibc_NetBSD elibc_OpenBSD elibc_SunOS elibc_Winnt elibc_bionic elibc_glibc elibc_mingw elibc_mintlib elibc_musl elibc_uclibc ft2232_spi fuzzer gfxnvidia hppa hppa-hpux ia64 ia64-hpux ia64-linux internal it8212 jlink_spi kernel_AIX kernel_Darwin kernel_FreeBSD kernel_HPUX kernel_NetBSD kernel_OpenBSD kernel_SunOS kernel_Winnt kernel_freemint kernel_linux linux_mtd linux_spi m68k m68k-mint mediatek_i2c_spi mips msan mstarddc_spi nic3com nicintel nicintel_eeprom nicintel_spi nicnatsemi nicrealtek nios2 ogp_spi parade_lspcon pickit2_spi pony_spi ppc ppc-aix ppc-macos ppc-openbsd ppc64 ppc64-linux prefix prefix-guest prefix-stack raiden_debug_spi rayer_spi realtek_mst_i2c_spi riscv s390 satamv satasii serprog sh sparc sparc-fbsd sparc-solaris sparc64-freebsd sparc64-solaris static stlinkv3_spi test tsan ubsan usbblaster_spi userland_BSD userland_GNU wiki x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt", "EPREFIX": "", "STRINGS": "llvm-strings", "EBUILD_PHASE_FUNC": "src_test", "RESUMECOMMAND_CIPD": "/mnt/host/source/chromite/bin/fetch_cipd \"${URI}\" \"${DISTDIR}/${FILE}\"", "CAMERAS": "", "CURL_SSL": "", "PORTAGE_IPC_DAEMON": "1", "PORTAGE_BUNZIP2_COMMAND": "lbzip2 -d", "PROPERTIES": "live live", "EBUILD_PHASE": "test", "IUSE_IMPLICIT": "prefix prefix-guest prefix-stack", "FRITZCAPI_CARDS": "", "CXXEXCEPTIONS_FLAGS": "-fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables", "SUDO_COMMAND": "/bin/bash -c FEATURES=\"noclean test\" parallel_emerge --board arm-generic chromeos-base/libchrome chromeos-base/system_api chromeos-base/libbrillo chromeos-base/libhwsec-foundation chromeos-base/tpm_manager-client chromeos-base/libtpmcrypto chromeos-base/libhwsec chromeos-base/metrics chromeos-base/attestation-client chromeos-base/tpm_manager chromeos-base/chaps media-libs/cros-camera-libfs chromeos-base/cros-camera-android-deps chromeos-base/chromeos-config-tools chromeos-base/bootstat chromeos-base/shill-client chromeos-base/power_manager-client chromeos-base/cryptohome-client chromeos-base/secure-erase-file chromeos-base/cbor chromeos-base/bootlockbox-client chromeos-base/biod_proxy chromeos-base/attestation chromeos-base/chromeos-common-script chromeos-base/cros-camera-libs chromeos-base/libmems chromeos-base/session_manager-client chromeos-base/shill chromeos-base/shill-net chromeos-base/runtime_probe dev-libs/libutf chromeos-base/libpasswordprovider chromeos-base/libcontainer chromeos-base/libchromeos-ui chromeos-base/cryptohome chromeos-base/chromeos-storage-info chromeos-base/oobe_config chromeos-base/imageloader media-libs/cros-camera-hal-usb chromeos-base/verity chromeos-base/libec chromeos-base/libiioservice_ipc chromeos-base/permission_broker-client chromeos-base/mojo_service_manager chromeos-base/mems_setup chromeos-base/patchpanel-client chromeos-base/patchpanel chromeos-base/debugd-client chromeos-base/missive chromeos-base/runtime_probe-client dev-libs/libtextclassifier chromeos-base/chromeos-login chromeos-base/chromeos-init chromeos-base/shill-dbus-client chromeos-base/ml-client chromeos-base/libipp chromeos-base/update_engine-client chromeos-base/imageloader-client chromeos-base/dlcservice-client chromeos-base/vm_protos chromeos-base/libcrossystem chromeos-base/hardware_verifier_proto chromeos-base/modemfwd-proto chromeos-base/wilco-dtc-grpc-protos chromeos-base/policy-go-proto chromeos-base/chaps-client chromeos-base/p2p chromeos-base/modem-utilities chromeos-base/u2fd-client dev-libs/modp_b64 chromeos-base/secanomalyd chromeos-base/cros-camera chromeos-base/chromeos-installer chromeos-base/dev-install chromeos-base/rgbkbd chromeos-base/cros-disks chromeos-base/iioservice_simpleclient chromeos-base/lorgnette chromeos-base/chromeos-imageburner chromeos-base/iioservice chromeos-base/system-proxy chromeos-base/fusebox chromeos-base/hpsd chromeos-base/lexmark-fax-pnh chromeos-base/libvda-gpu-tests chromeos-base/secure-wipe chromeos-base/croslog chromeos-base/tpm_softclear_utils chromeos-base/cros-camera-tool chromeos-base/spaced chromeos-base/diagnostics chromeos-base/hps-tool chromeos-base/featured chromeos-base/hardware_verifier chromeos-base/ml chromeos-base/debugd chromeos-base/run_oci chromeos-base/permission_broker chromeos-base/kerberos chromeos-base/perfetto_simple_producer chromeos-base/smbprovider chromeos-base/chromeos-trim chromeos-base/dns-proxy chromeos-base/mist chromeos-base/hwsec-test-utils chromeos-base/power_manager chromeos-base/print_tools chromeos-base/dlp chromeos-base/smbfs chromeos-base/dlcservice chromeos-base/crash-reporter chromeos-base/usb_bouncer chromeos-base/policy_utils media-libs/cros-camera-libjea_test media-libs/cros-camera-document-scanning-test media-libs/cros-camera-test media-libs/cros-camera-usb-tests media-libs/cros-camera-libcamera_connector_test", "PORTAGE_SIGPIPE_STATUS": "141", "OFFICE_IMPLEMENTATION": "", "CBUILD": "x86_64-pc-linux-gnu", "SUDO_USER": "chrome-bot", "DEFAULT_ABI": "arm", "BUILD_CXX": "x86_64-pc-linux-gnu-clang++", "LIBDIR_arm": "lib", "FPMCU_FIRMWARE": "", "ALSA_CARDS": "", "ABI_S390": "", "KERNEL": "linux", "FFLAGS": "-O2", "EDITOR": "/usr/bin/vi", "ED": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/image", "PORTAGE_ARCHLIST": "alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips ppc ppc-aix ppc-macos ppc-openbsd ppc64 ppc64-linux s390 sh sparc sparc-fbsd sparc-solaris sparc64-freebsd sparc64-solaris x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt", "EBUILD": "/mnt/host/source/src/third_party/chromiumos-overlay/sys-apps/flashrom/flashrom-0.9.9-r1469.ebuild", "INHERITED": " cros-constants cros-credentials eutils toolchain-funcs multilib flag-o-matic git-2 cros-workon multiprocessing ninja-utils python-utils-r1 meson cros-sanitizers", "OPENMPI_RM": "", "EBUILD_MASTER_PID": "11822", "PORTAGE_REPO_NAME": "chromiumos", "PWD": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9", "FETCHCOMMAND_AB": "/mnt/host/source/chromite/bin/abutil fetch \"${URI}\" \"${DISTDIR}/${FILE}\"", "PORTAGE_RESTRICT": "", "PORTAGE_DOCOMPRESS_SIZE_LIMIT": "128", "LOGNAME": "chrome-bot", "CXXEXCEPTIONS": "0", "EXEOPTIONS": "-m0755", "CTARGET_default": "armv7a-cros-linux-gnueabihf", "DEFINED_PHASES": " compile configure info install setup test unpack", "PORTAGE_BINPKG_TAR_OPTS": "--checkpoint=1000", "SANDBOX_VERBOSE": "1", "PORTAGE_WORKDIR_MODE": "0755", "PKGDIR": "/build/arm-generic/packages/", "FILESDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/files", "RESUMECOMMAND_GS": "bash -c 'BOTO_CONFIG= /mnt/host/source/chromite/bin/gs_fetch_binpkg \"${URI}\" \"${DISTDIR}/${FILE}\"'", "DIROPTIONS": "-m0755", "MAKEOPTS": "-j32", "PORTAGE_CONFIGROOT": "/build/arm-generic/", "PM_EBUILD_HOOK_DIR": "/build/arm-generic/etc/portage/env", "CXX": "armv7a-cros-linux-gnueabihf-clang++", "CXXFLAGS": " -Os -pipe  -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections", "PORTAGE_OVERRIDE_EPREFIX": "", "XAUTHORITY": "/home/chronos/.Xauthority", "BUILD_CC": "x86_64-pc-linux-gnu-clang", "ABI_PPC": "", "T": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp", "S": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9", "P": "flashrom-0.9.9", "U_BOOT_FDT_USE": "", "D": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/image", "A": "", "CATEGORY": "sys-apps", "EC_FIRMWARE_EXTRA": "", "LD_PRELOAD": "libsandbox.so", "PYTHON_TARGETS": "", "ENLIGHTENMENT_MODULES": "", "CALLIGRA_FEATURES": "", "GI_TYPELIB_PATH": "/usr/local/lib/girepository-1.0:/usr/lib/girepository-1.0", "LDFLAGS": "-Wl,-O2 -Wl,--as-needed  -Wl,--gc-sections -Wl,--icf=all", "EBEEP_IGNORE": "1", "HOME": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir", "LIBREOFFICE_EXTENSIONS": "", "NETBEANS": "apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml", "LANG": "en_US.UTF-8", "PORTAGE_COMPRESS": "pigz", "WORKDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work", "QEMU_USER_TARGETS": "", "DRACUT_MODULES": "", "INSOPTIONS": "-m0644", "SANDBOX_LIB": "libsandbox.so", "UWSGI_PLUGINS": "", "CROS_BASE_RUSTFLAGS": "-Ctarget-feature=+armv7-a,+neon", "COLUMNS": "80", "BROOT": "", "BOARD_USE": "", "PORTAGE_TMPDIR": "/build/arm-generic/tmp", "CXX_FOR_BUILD": "x86_64-pc-linux-gnu-clang++", "LINGUAS": "", "PORTAGE_COLORMAP": "GOOD=$'\u001b[32;01m'\nWARN=$'\u001b[33;01m'\nBAD=$'\u001b[31;01m'\nHILITE=$'\u001b[36m'\nBRACKET=$'\u001b[34;01m'\nNORMAL=$'\u001b[0m'", "SANDBOX_READ": "/:/build/arm-generic/tmp/portage", "LCD_DEVICES": "", "FEATURES": "allow-missing-manifests assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg clean-logs config-protect-if-modified distlocks fixlafiles force-mirror ipc-sandbox multilib-strict network-sandbox noclean nodoc noinfo noman parallel-fetch parallel-install protect-owned sandbox sfperms splitdebug test unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr", "NETBEANS_MODULES": "", "TMPDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp", "INSTALL_MASK": "   /usr/lib*/*.la   /etc/init.d /etc/conf.d   /etc/logrotate.d   /etc/sandbox.d   /usr/share/bash-completion   /usr/share/locale ", "PORTAGE_BIN_PATH": "/usr/lib/portage/python3.6", "_E_INSDESTTREE_": "", "SANDBOX_METHOD": "any", "LD": "armv7a-cros-linux-gnueabihf-ld.lld", "POSTSUBMIT_BINHOST": "gs://chromeos-prebuilt/board/arm-generic/postsubmit-R108-15119.0.0-39982-8802937358584190913/packages", "OPENMPI_OFED_FEATURES": "", "NM_FOR_BUILD": "llvm-nm", "ABI_ARM": "", "PORTAGE_INTERNAL_CALLER": "1", "PORTAGE_COMPRESSION_COMMAND": "zstd -3", "PVR": "0.9.9-r1469", "MARCH_TUNE": "", "PKG_LOGDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/logging", "READELF": "llvm-readelf", "CPU_FLAGS_ARM": "", "ASAN_OPTIONS": " log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan detect_stack_use_after_return=0", "KEYWORDS": "*", "PORTAGE_COMPRESS_EXCLUDE_SUFFIXES": "css gif htm[l]? jp[e]?g js pdf png", "STRIP_FOR_BUILD": "llvm-strip", "FULL_BINHOST": "gs://chromeos-prebuilt/board/arm-generic/full-R107-15117.0.0-rc3/packages/", "PORTAGE_BUILD_USER": "chrome-bot", "VCSID": "0.9.9-r1469-bf82e6be443883de436a54f49ace638782314b5f", "OPENMPI_FABRICS": "", "CHROMEOS_KERNEL_SPLITCONFIG": "chromiumos-arm", "NGINX_MODULES_MAIL": "", "USE_EXPAND_UNPREFIXED": "ARCH", "PORT_LOGDIR": "/build/arm-generic/tmp/portage/logs/", "MOPREFIX": "flashrom", "EC_FIRMWARE": "", "_E_EXEDESTTREE_": "", "MOZ_GMP_PATH": "/build/arm-generic/usr/lib/nsbrowser/plugins/gmp-gmpopenh264/system-installed", "FFTOOLS": "", "OFED_DRIVERS": "", "LLVM_TARGETS": "", "LIRC_DEVICES": "", "FETCHCOMMAND_SSH": "bash -c \"x=\\${2#ssh://} ; host=\\${x%%/*} ; port=\\${host##*:} ; host=\\${host%:*} ; [[ \\${host} = \\${port} ]] && port= ; exec rsync --rsh=\\\"ssh \\${port:+-p\\${port}} \\${3}\\\" -avP \\\"\\${host}:/\\${x#*/}\\\" \\\"\\$1\\\"\" rsync \"${DISTDIR}/${FILE}\" \"${URI}\" \"${PORTAGE_SSH_OPTS}\"", "PORTAGE_PYM_PATH": "/usr/lib64/python3.6/site-packages", "OZONE_PLATFORM_DEFAULT": "", "FCFLAGS": "-O2", "CHROMEOS_KERNEL_FAMILY": "", "EPAUSE_IGNORE": "1", "LSAN_OPTIONS": " print_suppressions=0", "TERM": "unknown", "BOOTSTRAP_USE": "cxx unicode python_targets_python3_2 python_targets_python2_7", "OBJCOPY_FOR_BUILD": "llvm-objcopy", "LESSOPEN": "|lesspipe %s", "EROOT": "/build/arm-generic", "CC_FOR_BUILD": "x86_64-pc-linux-gnu-clang", "AT_SYS_M4DIR": "${SYSROOT}/usr/share/aclocal", "PORTAGE_XATTR_EXCLUDE": "btrfs.* security.evm security.ima \tsecurity.selinux system.nfs4_acl user.apache_handler \tuser.Beagle.* user.dublincore.* user.mime_encoding user.xdg.*", "PORTAGE_LOG_FILE": "/build/arm-generic/tmp/portage/logs/sys-apps:flashrom-0.9.9-r1469:20220916-100238.log", "NOCOLOR": "true", "PORTAGE_DEBUG": "0", "CROS_WORKON_SRCROOT": "/mnt/host/source", "RESUMECOMMAND_AB": "/mnt/host/source/chromite/bin/abutil fetch \"${URI}\" \"${DISTDIR}/${FILE}\"", "OZONE_PLATFORM": "", "RESTRICT": "", "GCE_METADATA_HOST": "127.0.0.1:46605", "SANDBOX_DEBUG": "0", "PORTAGE_DEPCACHEDIR": "/var/cache/edb/dep", "AR": "llvm-ar", "ARCH": "arm", "NGINX_MODULES_HTTP": "", "ROOT": "/build/arm-generic", "VIDEO_CARDS": "", "ROS_MESSAGES": "", "ABI_X86": "", "TEMP": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp", "USE_EXPAND_VALUES_ARCH": "alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt", "INPUT_DEVICES": "", "OBJDUMP_FOR_BUILD": "llvm-objdump", "FOO2ZJS_DEVICES": "", "PORTAGE_COMPRESS_FLAGS": "-3", "SHLVL": "1", "AR_FOR_BUILD": "llvm-ar", "DISTDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/distdir", "NM": "llvm-nm", "PORTAGE_REPOSITORIES": "[DEFAULT]\nauto-sync = yes\nmain-repo = portage-stable\nstrict-misc-digests = true\nsync-allow-hardlinks = true\nsync-rcu = false\n\n[arm-generic]\nauto-sync = yes\nlocation = /mnt/host/source/src/overlays/overlay-arm-generic\nmasters = portage-stable chromiumos eclass-overlay\npriority = 2\nstrict-misc-digests = true\nsync-allow-hardlinks = true\nsync-rcu = false\n\n[chromiumos]\nauto-sync = yes\nlocation = /mnt/host/source/src/third_party/chromiumos-overlay\nmasters = portage-stable eclass-overlay\npriority = 0\nstrict-misc-digests = true\nsync-allow-hardlinks = true\nsync-rcu = false\n\n[eclass-overlay]\nauto-sync = yes\nlocation = /mnt/host/source/src/third_party/eclass-overlay\nmasters = \npriority = 1\nstrict-misc-digests = true\nsync-allow-hardlinks = true\nsync-rcu = false\n\n[portage-stable]\nauto-sync = yes\nlocation = /mnt/host/source/src/third_party/portage-stable\nmasters = eclass-overlay\npriority = -1000\nstrict-misc-digests = true\nsync-allow-hardlinks = true\nsync-rcu = false\n", "APACHE2_MPMS": "", "SANDBOX_WRITE": ":/build/arm-generic/tmp/portage:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir/.bash_history:/dev/console:/dev/fd:/dev/full:/dev/null:/dev/ptmx:/dev/pts/:/dev/pty:/dev/shm:/dev/tts:/dev/tty:/dev/vc/:/dev/zero:/proc/self/fd:/tmp/:/usr/lib/cf:/usr/lib/conftest:/usr/lib32/cf:/usr/lib32/conftest:/usr/lib64/cf:/usr/lib64/conftest:/usr/tmp/:/usr/tmp/cf:/usr/tmp/conftest:/var/tmp/", "CHOST_default": "armv7a-cros-linux-gnueabihf", "XFCE_PLUGINS": "", "GPSD_PROTOCOLS": "", "LC_MESSAGES": "C", "FETCHCOMMAND_CIPD": "/mnt/host/source/chromite/bin/fetch_cipd \"${URI}\" \"${DISTDIR}/${FILE}\"", "XTABLES_ADDONS": "", "LICENSE": "GPL-2", "PYTHONDONTWRITEBYTECODE": "1", "SYSROOT": "/build/arm-generic", "UBSAN_OPTIONS": " log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan:symbolize=1:print_stacktrace=1", "VOICEMAIL_STORAGE": "", "U_BOOT_CONFIG_USE": "", "PV": "0.9.9", "RESUMECOMMAND_SSH": "bash -c \"x=\\${2#ssh://} ; host=\\${x%%/*} ; port=\\${host##*:} ; host=\\${host%:*} ; [[ \\${host} = \\${port} ]] && port= ; exec rsync --rsh=\\\"ssh \\${port:+-p\\${port}} \\${3}\\\" -avP \\\"\\${host}:/\\${x#*/}\\\" \\\"\\$1\\\"\" rsync \"${DISTDIR}/${FILE}\" \"${URI}\" \"${PORTAGE_SSH_OPTS}\"", "SANDBOX_LOG": "/var/log/sandbox/sandbox-11800.log", "PR": "r1469", "STRIP_MASK": "*.nexe /firmware/*.elf", "COLLECTD_PLUGINS": "", "PN": "flashrom", "XARGS": "xargs -r", "SANE_BACKENDS": "", "USE_EXPAND_IMPLICIT": "ARCH ELIBC KERNEL USERLAND", "PF": "flashrom-0.9.9-r1469", "USE_EXPAND_VALUES_ELIBC": "AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt", "LD_LIBRARY_PATH": "/usr/local/lib", "CROS_ARTIFACTS_TMP_DIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/cros-artifacts", "PORTAGE_BASHRC": "/build/arm-generic/etc/portage/bashrc", "CXXLD_FOR_BUILD": "x86_64-pc-linux-gnu-clang++", "ACCEPT_LICENSE": "GPL-2", "BUILD_PREFIX": "/build/arm-generic/tmp/portage", "MERGE_TYPE": "source", "ABI_MIPS": "", "_E_DOCDESTTREE_": "", "_E_DESTTREE_": "/usr", "BOARD_RUSTFLAGS": "-Ctarget-feature=+armv7-a,+neon", "COMMON_COMPILER_FLAGS": "", "PORTAGE_ACTUAL_DISTDIR": "/var/cache/chromeos-cache/distfiles", "OBJCOPY": "llvm-objcopy", "RANLIB_FOR_BUILD": "llvm-ranlib", "CCACHE_DISABLE": "1", "LIBDIR_default": "lib", "PKG_INSTALL_MASK": "   /usr/lib*/*.la   /etc/init.d /etc/conf.d   /etc/logrotate.d   /etc/sandbox.d   /usr/share/bash-completion   /usr/share/locale ", "SANDBOX_PREDICT": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir:/dev/crypto:/proc/self/coredump_filter:/dev/random:/proc/self/coredump_filter:/usr/share/cache/fontconfig:/", "FCDSL_CARDS": "", "LIBOPTIONS": "-m0644", "GRUB_PLATFORMS": "", "OBJC_FOR_BUILD": "x86_64-pc-linux-gnu-clang", "SANDBOX_DENY": "", "EBUILD_DEATH_HOOKS": " cros_log_failed_packages cros-workon_on_die_rebase_check asan_death_hook", "STRIP": "llvm-strip", "LC_COLLATE": "C", "OBJC": "x86_64-pc-linux-gnu-clang", "MSAN_OPTIONS": " log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan", "CHOST": "armv7a-cros-linux-gnueabihf", "TMP": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp", "PORTAGE_INST_GID": "0", "OBJDUMP": "llvm-objdump", "PATH": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/build-toolchain-wrappers:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/build-toolchain-wrappers/gnu_tools:/usr/lib/portage/python3.6/ebuild-helpers/xattr:/usr/lib/portage/python3.6/ebuild-helpers:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/bin:/build/arm-generic/build/bin", "SANDBOX_DEBUG_LOG": "/var/log/sandbox/sandbox-debug-11800.log", "PORTAGE_BUILDDIR": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469", "PORTAGE_BZIP2_COMMAND": "lbzip2 -z", "PORTAGE_USERNAME": "chrome-bot", "NGINX_MODULES_STREAM": "", "USE": "arm dummy elibc_glibc ft2232_spi internal it8212 kernel_linux linux_mtd linux_spi mediatek_i2c_spi parade_lspcon raiden_debug_spi realtek_mst_i2c_spi serprog stlinkv3_spi test usbblaster_spi userland_GNU wiki", "PHP_TARGETS": "", "READELF_FOR_BUILD": "llvm-readelf", "CC": "armv7a-cros-linux-gnueabihf-clang", "TESTS": "", "CCLD_FOR_BUILD": "x86_64-pc-linux-gnu-clang", "BOARD_OVERLAY": "/mnt/host/source/src/overlays/overlay-arm-generic", "CFLAGS": " -Os -pipe  -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections", "USE_EXPAND": "ABI_ARM ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS BOARD_USE CALLIGRA_FEATURES CAMERAS CHROMEOS_KERNEL_FAMILY COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS CROS_WORKON_TREE CURL_SSL DRACUT_MODULES DVB_CARDS EC_FIRMWARE EC_FIRMWARE_EXTRA ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FOO2ZJS_DEVICES FPMCU_FIRMWARE FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LINUX_FIRMWARE LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM OZONE_PLATFORM OZONE_PLATFORM_DEFAULT PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS TESTS TTY_CONSOLE USERLAND UWSGI_PLUGINS U_BOOT_CONFIG_USE U_BOOT_FDT_USE VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS", "SANDBOX_BASHRC": "/usr/share/sandbox/sandbox.bashrc", "CROSSCOMPILE_OPTS": "", "SUDO_UID": "1000", "MULTILIB_ABIS": "arm", "STRINGS_FOR_BUILD": "llvm-strings", "LIBDIR_x86": "lib", "PORTAGE_GID": "250", "FETCHCOMMAND_GS": "bash -c 'BOTO_CONFIG= /mnt/host/source/chromite/bin/gs_fetch_binpkg \"${URI}\" \"${DISTDIR}/${FILE}\"'", "MAIL": "/var/mail/root", "PORTAGE_BUILD_GROUP": "portage", "BASHRC_FILESDIR": "/mnt/host/source/src/third_party/chromiumos-overlay/sys-apps/flashrom/files", "APACHE2_MODULES": "", "ELIBC": "glibc", "EAPI": "7", "RANLIB": "llvm-ranlib", "ABI": "arm", "ECLASS_DEPTH": "0", "PORTAGE_BASHRC_FILES": "/mnt/host/source/src/third_party/chromiumos-overlay/profiles/base/profile.bashrc\n/mnt/host/source/src/third_party/chromiumos-overlay/profiles/targets/chromeos/profile.bashrc", "CROS_WORKON_TREE": "0dba356809d0cb42d50019f80cc5ef75686e418f", "OLDPWD": "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir", "BUILD_LD": "x86_64-pc-linux-gnu-ld.lld", "MONKEYD_PLUGINS": "", "EMERGE_FROM": "ebuild", "LADSPA_PATH": "/usr/lib/ladspa", "PKG_CONFIG": "/build/arm-generic/build/bin/pkg-config", "DVB_CARDS": "", "_": "/usr/bin/meson", "MESON_EXE_WRAPPER": "/mnt/host/source/src/platform2/common-mk/meson_test.py", "MALLOC_PERTURB_": "63"}, "command": ["/mnt/host/source/src/platform2/common-mk/meson_test.py", "/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/tests/flashrom_unit_tests"], "stderr": "[  PASSED  ] 7 test(s).\n[  PASSED  ] 1 test(s).\n[  PASSED  ] 11 test(s).\n[  PASSED  ] 15 test(s).\n[  SKIPPED ] 2 test(s), listed below:\n[  SKIPPED ] nicrealtek_basic_lifecycle_test_success\n[  SKIPPED ] dediprog_basic_lifecycle_test_success\n\n 2 SKIPPED TEST(S)\n[  PASSED  ] 6 test(s).\n[  PASSED  ] 8 test(s).\n[  PASSED  ] 6 test(s).\n"}
diff --git a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.junit.xml b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.junit.xml
index 5aecfe4..84ebed9 100644
--- a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.junit.xml
+++ b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.junit.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<testsuites errors="0" failures="0" tests="1"><testsuite errors="0" failures="0" name="flashromutils" skipped="0" tests="1" time="10.830296993255615"><testcase classname="flashromutils" name="cmocka test flashrom" time="10.830296993255615"><system-out>Running [PosixPath('/mnt/host/source/src/platform2/common-mk/platform2_test.py'), '--sysroot', '/build/arm-generic', '--', '/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/tests/flashrom_unit_tests']
+<testsuites errors="0" failures="0" tests="1"><testsuite errors="0" failures="0" name="flashromutils" skipped="0" tests="1" time="11.006221771240234"><testcase classname="flashromutils" name="cmocka test flashrom" time="11.006221771240234"><system-out>Running [PosixPath('/mnt/host/source/src/platform2/common-mk/platform2_test.py'), '--sysroot', '/build/arm-generic', '--', '/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/tests/flashrom_unit_tests']
 [==========] Running 7 test(s).
 [ RUN      ] address_to_bits_test_success
 [       OK ] address_to_bits_test_success
diff --git a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.txt b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.txt
index 1a499c7..905578b 100644
--- a/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.txt
+++ b/chroot/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/meson-logs/testlog.txt
@@ -1,11 +1,11 @@
-Log of Meson test suite run on 2022-09-15T20:54:09.613461
+Log of Meson test suite run on 2022-09-16T03:02:52.184324
 
-Inherited environment: SANDBOX_MESSAGE_P@TH=/proc/11552/fd/2 SLOT=0/0 SHELL=/bin/bash RUBY_TARGETS='' PORTAGE_INST_UID=0 KERNEL_ABI=arm PORTAGE_PYTHONPATH=/usr/lib64/python3.6/site-packages QEMU_SOFTMMU_TARGETS='' PORTAGE_FEATURES='allow-missing-manifests assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg clean-logs config-protect-if-modified distlocks fixlafiles force-mirror ipc-sandbox multilib-strict network-sandbox noclean nodoc noinfo noman parallel-fetch parallel-install protect-owned sandbox sfperms splitdebug test unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr' cros_setup_hooks_run=booya ESYSROOT=/build/arm-generic PYTHON_COMPAT_OVERRIDE=python3_6 LESS='-R -M --shift 5' SUDO_GID=1000 BOTO_CONFIG='' ROOTPATH=/opt/bin:/usr/lib/llvm/bin USE_EXPAND_VALUES_KERNEL='AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt' PORTAGE_PYTHON=/usr/bin/python3.6m PYTHON_SINGLE_TARGET='' BOARD_COMPILER_FLAGS='-march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard' PROFILE_ONLY_VARIABLES='ARCH ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND' SYMLINK_LIB=no TSAN_OPTIONS=' log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan' PKG_CONFIG_PATH=/usr/lib/pkgconfig SANDBOX_ACTIVE=armedandready LLVM_PROFILE_FILE=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/coverage_logs/flashrom-0.9.9_%9m.profraw LINUX_FIRMWARE='' USERLAND=GNU CPU_FLAGS_X86='' PKG_TMPDIR=/build/arm-generic/tmp/portage/._unmerge_ PKGUSE='' USE_EXPAND_VALUES_USERLAND='BSD GNU' CHOST_arm=arm-unknown-linux-gnu TTY_CONSOLE='' SANDBOX_ON=1 IUSE_EFFECTIVE='alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 asan atahpt atapromise atavia buspirate_spi ch341a_spi coverage cros_host cros_workon_tree_0dba356809d0cb42d50019f80cc5ef75686e418f dediprog developerbox_spi digilent_spi drkaiser dummy elibc_AIX elibc_Cygwin elibc_Darwin elibc_DragonFly elibc_FreeBSD elibc_HPUX elibc_Interix elibc_NetBSD elibc_OpenBSD elibc_SunOS elibc_Winnt elibc_bionic elibc_glibc elibc_mingw elibc_mintlib elibc_musl elibc_uclibc ft2232_spi fuzzer gfxnvidia hppa hppa-hpux ia64 ia64-hpux ia64-linux internal it8212 jlink_spi kernel_AIX kernel_Darwin kernel_FreeBSD kernel_HPUX kernel_NetBSD kernel_OpenBSD kernel_SunOS kernel_Winnt kernel_freemint kernel_linux linux_mtd linux_spi m68k m68k-mint mediatek_i2c_spi mips msan mstarddc_spi nic3com nicintel nicintel_eeprom nicintel_spi nicnatsemi nicrealtek nios2 ogp_spi parade_lspcon pickit2_spi pony_spi ppc ppc-aix ppc-macos ppc-openbsd ppc64 ppc64-linux prefix prefix-guest prefix-stack raiden_debug_spi rayer_spi realtek_mst_i2c_spi riscv s390 satamv satasii serprog sh sparc sparc-fbsd sparc-solaris sparc64-freebsd sparc64-solaris static stlinkv3_spi test tsan ubsan usbblaster_spi userland_BSD userland_GNU wiki x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt' EPREFIX='' STRINGS=llvm-strings EBUILD_PHASE_FUNC=src_test RESUMECOMMAND_CIPD='/mnt/host/source/chromite/bin/fetch_cipd "${URI}" "${DISTDIR}/${FILE}"' CAMERAS='' CURL_SSL='' PORTAGE_IPC_DAEMON=1 PORTAGE_BUNZIP2_COMMAND='lbzip2 -d' PROPERTIES='live live' EBUILD_PHASE=test IUSE_IMPLICIT='prefix prefix-guest prefix-stack' FRITZCAPI_CARDS='' CXXEXCEPTIONS_FLAGS='-fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables' SUDO_COMMAND='/bin/bash -c FEATURES="noclean test" parallel_emerge --board arm-generic chromeos-base/libchrome chromeos-base/system_api chromeos-base/libbrillo chromeos-base/libhwsec-foundation chromeos-base/tpm_manager-client chromeos-base/libtpmcrypto chromeos-base/libhwsec chromeos-base/metrics chromeos-base/attestation-client chromeos-base/tpm_manager chromeos-base/chaps media-libs/cros-camera-libfs chromeos-base/cros-camera-android-deps chromeos-base/chromeos-config-tools chromeos-base/bootstat chromeos-base/shill-client chromeos-base/power_manager-client chromeos-base/cryptohome-client chromeos-base/secure-erase-file chromeos-base/cbor chromeos-base/bootlockbox-client chromeos-base/biod_proxy chromeos-base/attestation chromeos-base/chromeos-common-script chromeos-base/cros-camera-libs chromeos-base/libmems chromeos-base/session_manager-client chromeos-base/shill chromeos-base/shill-net chromeos-base/runtime_probe dev-libs/libutf chromeos-base/libpasswordprovider chromeos-base/libcontainer chromeos-base/libchromeos-ui chromeos-base/cryptohome chromeos-base/chromeos-storage-info chromeos-base/oobe_config chromeos-base/imageloader media-libs/cros-camera-hal-usb chromeos-base/verity chromeos-base/libec chromeos-base/libiioservice_ipc chromeos-base/permission_broker-client chromeos-base/mojo_service_manager chromeos-base/mems_setup chromeos-base/patchpanel-client chromeos-base/patchpanel chromeos-base/debugd-client chromeos-base/missive chromeos-base/runtime_probe-client dev-libs/libtextclassifier chromeos-base/chromeos-login chromeos-base/chromeos-init chromeos-base/shill-dbus-client chromeos-base/ml-client chromeos-base/libipp chromeos-base/update_engine-client chromeos-base/imageloader-client chromeos-base/dlcservice-client chromeos-base/vm_protos chromeos-base/libcrossystem chromeos-base/hardware_verifier_proto chromeos-base/modemfwd-proto chromeos-base/wilco-dtc-grpc-protos chromeos-base/policy-go-proto chromeos-base/chaps-client chromeos-base/p2p chromeos-base/modem-utilities chromeos-base/u2fd-client dev-libs/modp_b64 chromeos-base/secanomalyd chromeos-base/cros-camera chromeos-base/chromeos-installer chromeos-base/dev-install chromeos-base/rgbkbd chromeos-base/cros-disks chromeos-base/iioservice_simpleclient chromeos-base/lorgnette chromeos-base/chromeos-imageburner chromeos-base/iioservice chromeos-base/system-proxy chromeos-base/fusebox chromeos-base/hpsd chromeos-base/lexmark-fax-pnh chromeos-base/libvda-gpu-tests chromeos-base/secure-wipe chromeos-base/croslog chromeos-base/tpm_softclear_utils chromeos-base/cros-camera-tool chromeos-base/spaced chromeos-base/diagnostics chromeos-base/hps-tool chromeos-base/featured chromeos-base/hardware_verifier chromeos-base/ml chromeos-base/debugd chromeos-base/run_oci chromeos-base/permission_broker chromeos-base/kerberos chromeos-base/perfetto_simple_producer chromeos-base/smbprovider chromeos-base/chromeos-trim chromeos-base/dns-proxy chromeos-base/mist chromeos-base/hwsec-test-utils chromeos-base/power_manager chromeos-base/print_tools chromeos-base/dlp chromeos-base/smbfs chromeos-base/dlcservice chromeos-base/crash-reporter chromeos-base/usb_bouncer chromeos-base/policy_utils media-libs/cros-camera-libjea_test media-libs/cros-camera-document-scanning-test media-libs/cros-camera-test media-libs/cros-camera-usb-tests media-libs/cros-camera-libcamera_connector_test' PORTAGE_SIGPIPE_STATUS=141 OFFICE_IMPLEMENTATION='' CBUILD=x86_64-pc-linux-gnu SUDO_USER=chrome-bot DEFAULT_ABI=arm BUILD_CXX=x86_64-pc-linux-gnu-clang++ LIBDIR_arm=lib FPMCU_FIRMWARE='' ALSA_CARDS='' ABI_S390='' KERNEL=linux FFLAGS=-O2 EDITOR=/usr/bin/vi ED=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/image PORTAGE_ARCHLIST='alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips ppc ppc-aix ppc-macos ppc-openbsd ppc64 ppc64-linux s390 sh sparc sparc-fbsd sparc-solaris sparc64-freebsd sparc64-solaris x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt' EBUILD=/mnt/host/source/src/third_party/chromiumos-overlay/sys-apps/flashrom/flashrom-0.9.9-r1469.ebuild INHERITED=' cros-constants cros-credentials eutils toolchain-funcs multilib flag-o-matic git-2 cros-workon multiprocessing ninja-utils python-utils-r1 meson cros-sanitizers' OPENMPI_RM='' EBUILD_MASTER_PID=11605 PORTAGE_REPO_NAME=chromiumos PWD=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9 FETCHCOMMAND_AB='/mnt/host/source/chromite/bin/abutil fetch "${URI}" "${DISTDIR}/${FILE}"' PORTAGE_RESTRICT='' PORTAGE_DOCOMPRESS_SIZE_LIMIT=128 LOGNAME=chrome-bot CXXEXCEPTIONS=0 EXEOPTIONS=-m0755 CTARGET_default=armv7a-cros-linux-gnueabihf DEFINED_PHASES=' compile configure info install setup test unpack' PORTAGE_BINPKG_TAR_OPTS=--checkpoint=1000 SANDBOX_VERBOSE=1 PORTAGE_WORKDIR_MODE=0755 PKGDIR=/build/arm-generic/packages/ FILESDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/files RESUMECOMMAND_GS='bash -c '"'"'BOTO_CONFIG= /mnt/host/source/chromite/bin/gs_fetch_binpkg "${URI}" "${DISTDIR}/${FILE}"'"'"'' DIROPTIONS=-m0755 MAKEOPTS=-j32 PORTAGE_CONFIGROOT=/build/arm-generic/ PM_EBUILD_HOOK_DIR=/build/arm-generic/etc/portage/env CXX=armv7a-cros-linux-gnueabihf-clang++ CXXFLAGS=' -Os -pipe  -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections' PORTAGE_OVERRIDE_EPREFIX='' XAUTHORITY=/home/chronos/.Xauthority BUILD_CC=x86_64-pc-linux-gnu-clang ABI_PPC='' T=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp S=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9 P=flashrom-0.9.9 U_BOOT_FDT_USE='' D=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/image A='' CATEGORY=sys-apps EC_FIRMWARE_EXTRA='' LD_PRELOAD=libsandbox.so PYTHON_TARGETS='' ENLIGHTENMENT_MODULES='' CALLIGRA_FEATURES='' GI_TYPELIB_PATH=/usr/local/lib/girepository-1.0:/usr/lib/girepository-1.0 LDFLAGS='-Wl,-O2 -Wl,--as-needed  -Wl,--gc-sections -Wl,--icf=all' EBEEP_IGNORE=1 HOME=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir LIBREOFFICE_EXTENSIONS='' NETBEANS='apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml' LANG=en_US.UTF-8 PORTAGE_COMPRESS=pigz WORKDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work QEMU_USER_TARGETS='' DRACUT_MODULES='' INSOPTIONS=-m0644 SANDBOX_LIB=libsandbox.so UWSGI_PLUGINS='' CROS_BASE_RUSTFLAGS=-Ctarget-feature=+armv7-a,+neon COLUMNS=80 BROOT='' BOARD_USE='' PORTAGE_TMPDIR=/build/arm-generic/tmp CXX_FOR_BUILD=x86_64-pc-linux-gnu-clang++ LINGUAS='' PORTAGE_COLORMAP='GOOD=$'"'"''"'"'
+Inherited environment: SANDBOX_MESSAGE_P@TH=/proc/11800/fd/2 SLOT=0/0 SHELL=/bin/bash RUBY_TARGETS='' PORTAGE_INST_UID=0 KERNEL_ABI=arm PORTAGE_PYTHONPATH=/usr/lib64/python3.6/site-packages QEMU_SOFTMMU_TARGETS='' PORTAGE_FEATURES='allow-missing-manifests assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg clean-logs config-protect-if-modified distlocks fixlafiles force-mirror ipc-sandbox multilib-strict network-sandbox noclean nodoc noinfo noman parallel-fetch parallel-install protect-owned sandbox sfperms splitdebug test unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr' cros_setup_hooks_run=booya ESYSROOT=/build/arm-generic PYTHON_COMPAT_OVERRIDE=python3_6 LESS='-R -M --shift 5' SUDO_GID=1000 BOTO_CONFIG='' ROOTPATH=/opt/bin:/usr/lib/llvm/bin USE_EXPAND_VALUES_KERNEL='AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt' PORTAGE_PYTHON=/usr/bin/python3.6m PYTHON_SINGLE_TARGET='' BOARD_COMPILER_FLAGS='-march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard' PROFILE_ONLY_VARIABLES='ARCH ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND' SYMLINK_LIB=no TSAN_OPTIONS=' log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan' PKG_CONFIG_PATH=/usr/lib/pkgconfig SANDBOX_ACTIVE=armedandready LLVM_PROFILE_FILE=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/coverage_logs/flashrom-0.9.9_%9m.profraw LINUX_FIRMWARE='' USERLAND=GNU CPU_FLAGS_X86='' PKG_TMPDIR=/build/arm-generic/tmp/portage/._unmerge_ PKGUSE='' USE_EXPAND_VALUES_USERLAND='BSD GNU' CHOST_arm=arm-unknown-linux-gnu TTY_CONSOLE='' SANDBOX_ON=1 IUSE_EFFECTIVE='alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 asan atahpt atapromise atavia buspirate_spi ch341a_spi coverage cros_host cros_workon_tree_0dba356809d0cb42d50019f80cc5ef75686e418f dediprog developerbox_spi digilent_spi drkaiser dummy elibc_AIX elibc_Cygwin elibc_Darwin elibc_DragonFly elibc_FreeBSD elibc_HPUX elibc_Interix elibc_NetBSD elibc_OpenBSD elibc_SunOS elibc_Winnt elibc_bionic elibc_glibc elibc_mingw elibc_mintlib elibc_musl elibc_uclibc ft2232_spi fuzzer gfxnvidia hppa hppa-hpux ia64 ia64-hpux ia64-linux internal it8212 jlink_spi kernel_AIX kernel_Darwin kernel_FreeBSD kernel_HPUX kernel_NetBSD kernel_OpenBSD kernel_SunOS kernel_Winnt kernel_freemint kernel_linux linux_mtd linux_spi m68k m68k-mint mediatek_i2c_spi mips msan mstarddc_spi nic3com nicintel nicintel_eeprom nicintel_spi nicnatsemi nicrealtek nios2 ogp_spi parade_lspcon pickit2_spi pony_spi ppc ppc-aix ppc-macos ppc-openbsd ppc64 ppc64-linux prefix prefix-guest prefix-stack raiden_debug_spi rayer_spi realtek_mst_i2c_spi riscv s390 satamv satasii serprog sh sparc sparc-fbsd sparc-solaris sparc64-freebsd sparc64-solaris static stlinkv3_spi test tsan ubsan usbblaster_spi userland_BSD userland_GNU wiki x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt' EPREFIX='' STRINGS=llvm-strings EBUILD_PHASE_FUNC=src_test RESUMECOMMAND_CIPD='/mnt/host/source/chromite/bin/fetch_cipd "${URI}" "${DISTDIR}/${FILE}"' CAMERAS='' CURL_SSL='' PORTAGE_IPC_DAEMON=1 PORTAGE_BUNZIP2_COMMAND='lbzip2 -d' PROPERTIES='live live' EBUILD_PHASE=test IUSE_IMPLICIT='prefix prefix-guest prefix-stack' FRITZCAPI_CARDS='' CXXEXCEPTIONS_FLAGS='-fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables' SUDO_COMMAND='/bin/bash -c FEATURES="noclean test" parallel_emerge --board arm-generic chromeos-base/libchrome chromeos-base/system_api chromeos-base/libbrillo chromeos-base/libhwsec-foundation chromeos-base/tpm_manager-client chromeos-base/libtpmcrypto chromeos-base/libhwsec chromeos-base/metrics chromeos-base/attestation-client chromeos-base/tpm_manager chromeos-base/chaps media-libs/cros-camera-libfs chromeos-base/cros-camera-android-deps chromeos-base/chromeos-config-tools chromeos-base/bootstat chromeos-base/shill-client chromeos-base/power_manager-client chromeos-base/cryptohome-client chromeos-base/secure-erase-file chromeos-base/cbor chromeos-base/bootlockbox-client chromeos-base/biod_proxy chromeos-base/attestation chromeos-base/chromeos-common-script chromeos-base/cros-camera-libs chromeos-base/libmems chromeos-base/session_manager-client chromeos-base/shill chromeos-base/shill-net chromeos-base/runtime_probe dev-libs/libutf chromeos-base/libpasswordprovider chromeos-base/libcontainer chromeos-base/libchromeos-ui chromeos-base/cryptohome chromeos-base/chromeos-storage-info chromeos-base/oobe_config chromeos-base/imageloader media-libs/cros-camera-hal-usb chromeos-base/verity chromeos-base/libec chromeos-base/libiioservice_ipc chromeos-base/permission_broker-client chromeos-base/mojo_service_manager chromeos-base/mems_setup chromeos-base/patchpanel-client chromeos-base/patchpanel chromeos-base/debugd-client chromeos-base/missive chromeos-base/runtime_probe-client dev-libs/libtextclassifier chromeos-base/chromeos-login chromeos-base/chromeos-init chromeos-base/shill-dbus-client chromeos-base/ml-client chromeos-base/libipp chromeos-base/update_engine-client chromeos-base/imageloader-client chromeos-base/dlcservice-client chromeos-base/vm_protos chromeos-base/libcrossystem chromeos-base/hardware_verifier_proto chromeos-base/modemfwd-proto chromeos-base/wilco-dtc-grpc-protos chromeos-base/policy-go-proto chromeos-base/chaps-client chromeos-base/p2p chromeos-base/modem-utilities chromeos-base/u2fd-client dev-libs/modp_b64 chromeos-base/secanomalyd chromeos-base/cros-camera chromeos-base/chromeos-installer chromeos-base/dev-install chromeos-base/rgbkbd chromeos-base/cros-disks chromeos-base/iioservice_simpleclient chromeos-base/lorgnette chromeos-base/chromeos-imageburner chromeos-base/iioservice chromeos-base/system-proxy chromeos-base/fusebox chromeos-base/hpsd chromeos-base/lexmark-fax-pnh chromeos-base/libvda-gpu-tests chromeos-base/secure-wipe chromeos-base/croslog chromeos-base/tpm_softclear_utils chromeos-base/cros-camera-tool chromeos-base/spaced chromeos-base/diagnostics chromeos-base/hps-tool chromeos-base/featured chromeos-base/hardware_verifier chromeos-base/ml chromeos-base/debugd chromeos-base/run_oci chromeos-base/permission_broker chromeos-base/kerberos chromeos-base/perfetto_simple_producer chromeos-base/smbprovider chromeos-base/chromeos-trim chromeos-base/dns-proxy chromeos-base/mist chromeos-base/hwsec-test-utils chromeos-base/power_manager chromeos-base/print_tools chromeos-base/dlp chromeos-base/smbfs chromeos-base/dlcservice chromeos-base/crash-reporter chromeos-base/usb_bouncer chromeos-base/policy_utils media-libs/cros-camera-libjea_test media-libs/cros-camera-document-scanning-test media-libs/cros-camera-test media-libs/cros-camera-usb-tests media-libs/cros-camera-libcamera_connector_test' PORTAGE_SIGPIPE_STATUS=141 OFFICE_IMPLEMENTATION='' CBUILD=x86_64-pc-linux-gnu SUDO_USER=chrome-bot DEFAULT_ABI=arm BUILD_CXX=x86_64-pc-linux-gnu-clang++ LIBDIR_arm=lib FPMCU_FIRMWARE='' ALSA_CARDS='' ABI_S390='' KERNEL=linux FFLAGS=-O2 EDITOR=/usr/bin/vi ED=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/image PORTAGE_ARCHLIST='alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips ppc ppc-aix ppc-macos ppc-openbsd ppc64 ppc64-linux s390 sh sparc sparc-fbsd sparc-solaris sparc64-freebsd sparc64-solaris x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt' EBUILD=/mnt/host/source/src/third_party/chromiumos-overlay/sys-apps/flashrom/flashrom-0.9.9-r1469.ebuild INHERITED=' cros-constants cros-credentials eutils toolchain-funcs multilib flag-o-matic git-2 cros-workon multiprocessing ninja-utils python-utils-r1 meson cros-sanitizers' OPENMPI_RM='' EBUILD_MASTER_PID=11822 PORTAGE_REPO_NAME=chromiumos PWD=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9 FETCHCOMMAND_AB='/mnt/host/source/chromite/bin/abutil fetch "${URI}" "${DISTDIR}/${FILE}"' PORTAGE_RESTRICT='' PORTAGE_DOCOMPRESS_SIZE_LIMIT=128 LOGNAME=chrome-bot CXXEXCEPTIONS=0 EXEOPTIONS=-m0755 CTARGET_default=armv7a-cros-linux-gnueabihf DEFINED_PHASES=' compile configure info install setup test unpack' PORTAGE_BINPKG_TAR_OPTS=--checkpoint=1000 SANDBOX_VERBOSE=1 PORTAGE_WORKDIR_MODE=0755 PKGDIR=/build/arm-generic/packages/ FILESDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/files RESUMECOMMAND_GS='bash -c '"'"'BOTO_CONFIG= /mnt/host/source/chromite/bin/gs_fetch_binpkg "${URI}" "${DISTDIR}/${FILE}"'"'"'' DIROPTIONS=-m0755 MAKEOPTS=-j32 PORTAGE_CONFIGROOT=/build/arm-generic/ PM_EBUILD_HOOK_DIR=/build/arm-generic/etc/portage/env CXX=armv7a-cros-linux-gnueabihf-clang++ CXXFLAGS=' -Os -pipe  -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections' PORTAGE_OVERRIDE_EPREFIX='' XAUTHORITY=/home/chronos/.Xauthority BUILD_CC=x86_64-pc-linux-gnu-clang ABI_PPC='' T=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp S=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9 P=flashrom-0.9.9 U_BOOT_FDT_USE='' D=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/image A='' CATEGORY=sys-apps EC_FIRMWARE_EXTRA='' LD_PRELOAD=libsandbox.so PYTHON_TARGETS='' ENLIGHTENMENT_MODULES='' CALLIGRA_FEATURES='' GI_TYPELIB_PATH=/usr/local/lib/girepository-1.0:/usr/lib/girepository-1.0 LDFLAGS='-Wl,-O2 -Wl,--as-needed  -Wl,--gc-sections -Wl,--icf=all' EBEEP_IGNORE=1 HOME=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir LIBREOFFICE_EXTENSIONS='' NETBEANS='apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml' LANG=en_US.UTF-8 PORTAGE_COMPRESS=pigz WORKDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work QEMU_USER_TARGETS='' DRACUT_MODULES='' INSOPTIONS=-m0644 SANDBOX_LIB=libsandbox.so UWSGI_PLUGINS='' CROS_BASE_RUSTFLAGS=-Ctarget-feature=+armv7-a,+neon COLUMNS=80 BROOT='' BOARD_USE='' PORTAGE_TMPDIR=/build/arm-generic/tmp CXX_FOR_BUILD=x86_64-pc-linux-gnu-clang++ LINGUAS='' PORTAGE_COLORMAP='GOOD=$'"'"''"'"'
 WARN=$'"'"''"'"'
 BAD=$'"'"''"'"'
 HILITE=$'"'"''"'"'
 BRACKET=$'"'"''"'"'
-NORMAL=$'"'"''"'"'' SANDBOX_READ=/:/build/arm-generic/tmp/portage LCD_DEVICES='' FEATURES='allow-missing-manifests assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg clean-logs config-protect-if-modified distlocks fixlafiles force-mirror ipc-sandbox multilib-strict network-sandbox noclean nodoc noinfo noman parallel-fetch parallel-install protect-owned sandbox sfperms splitdebug test unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr' NETBEANS_MODULES='' TMPDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp INSTALL_MASK='   /usr/lib*/*.la   /etc/init.d /etc/conf.d   /etc/logrotate.d   /etc/sandbox.d   /usr/share/bash-completion   /usr/share/locale ' PORTAGE_BIN_PATH=/usr/lib/portage/python3.6 _E_INSDESTTREE_='' SANDBOX_METHOD=any LD=armv7a-cros-linux-gnueabihf-ld.lld POSTSUBMIT_BINHOST=gs://chromeos-prebuilt/board/arm-generic/postsubmit-R108-15119.0.0-39982-8802937358584190913/packages OPENMPI_OFED_FEATURES='' NM_FOR_BUILD=llvm-nm ABI_ARM='' PORTAGE_INTERNAL_CALLER=1 PORTAGE_COMPRESSION_COMMAND='zstd -3' PVR=0.9.9-r1469 MARCH_TUNE='' PKG_LOGDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/logging READELF=llvm-readelf CPU_FLAGS_ARM='' ASAN_OPTIONS=' log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan detect_stack_use_after_return=0' KEYWORDS='*' PORTAGE_COMPRESS_EXCLUDE_SUFFIXES='css gif htm[l]? jp[e]?g js pdf png' STRIP_FOR_BUILD=llvm-strip FULL_BINHOST=gs://chromeos-prebuilt/board/arm-generic/full-R107-15117.0.0-rc3/packages/ PORTAGE_BUILD_USER=chrome-bot VCSID=0.9.9-r1469-bf82e6be443883de436a54f49ace638782314b5f OPENMPI_FABRICS='' CHROMEOS_KERNEL_SPLITCONFIG=chromiumos-arm NGINX_MODULES_MAIL='' USE_EXPAND_UNPREFIXED=ARCH PORT_LOGDIR=/build/arm-generic/tmp/portage/logs/ MOPREFIX=flashrom EC_FIRMWARE='' _E_EXEDESTTREE_='' MOZ_GMP_PATH=/build/arm-generic/usr/lib/nsbrowser/plugins/gmp-gmpopenh264/system-installed FFTOOLS='' OFED_DRIVERS='' LLVM_TARGETS='' LIRC_DEVICES='' FETCHCOMMAND_SSH='bash -c "x=\${2#ssh://} ; host=\${x%%/*} ; port=\${host##*:} ; host=\${host%:*} ; [[ \${host} = \${port} ]] && port= ; exec rsync --rsh=\"ssh \${port:+-p\${port}} \${3}\" -avP \"\${host}:/\${x#*/}\" \"\$1\"" rsync "${DISTDIR}/${FILE}" "${URI}" "${PORTAGE_SSH_OPTS}"' PORTAGE_PYM_PATH=/usr/lib64/python3.6/site-packages OZONE_PLATFORM_DEFAULT='' FCFLAGS=-O2 CHROMEOS_KERNEL_FAMILY='' EPAUSE_IGNORE=1 LSAN_OPTIONS=' print_suppressions=0' TERM=unknown BOOTSTRAP_USE='cxx unicode python_targets_python3_2 python_targets_python2_7' OBJCOPY_FOR_BUILD=llvm-objcopy LESSOPEN='|lesspipe %s' EROOT=/build/arm-generic CC_FOR_BUILD=x86_64-pc-linux-gnu-clang AT_SYS_M4DIR='${SYSROOT}/usr/share/aclocal' PORTAGE_XATTR_EXCLUDE='btrfs.* security.evm security.ima 	security.selinux system.nfs4_acl user.apache_handler 	user.Beagle.* user.dublincore.* user.mime_encoding user.xdg.*' PORTAGE_LOG_FILE=/build/arm-generic/tmp/portage/logs/sys-apps:flashrom-0.9.9-r1469:20220916-035354.log NOCOLOR=true PORTAGE_DEBUG=0 CROS_WORKON_SRCROOT=/mnt/host/source RESUMECOMMAND_AB='/mnt/host/source/chromite/bin/abutil fetch "${URI}" "${DISTDIR}/${FILE}"' OZONE_PLATFORM='' RESTRICT='' GCE_METADATA_HOST=127.0.0.1:33101 SANDBOX_DEBUG=0 PORTAGE_DEPCACHEDIR=/var/cache/edb/dep AR=llvm-ar ARCH=arm NGINX_MODULES_HTTP='' ROOT=/build/arm-generic VIDEO_CARDS='' ROS_MESSAGES='' ABI_X86='' TEMP=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp USE_EXPAND_VALUES_ARCH='alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt' INPUT_DEVICES='' OBJDUMP_FOR_BUILD=llvm-objdump FOO2ZJS_DEVICES='' PORTAGE_COMPRESS_FLAGS=-3 SHLVL=1 AR_FOR_BUILD=llvm-ar DISTDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/distdir NM=llvm-nm PORTAGE_REPOSITORIES='[DEFAULT]
+NORMAL=$'"'"''"'"'' SANDBOX_READ=/:/build/arm-generic/tmp/portage LCD_DEVICES='' FEATURES='allow-missing-manifests assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg clean-logs config-protect-if-modified distlocks fixlafiles force-mirror ipc-sandbox multilib-strict network-sandbox noclean nodoc noinfo noman parallel-fetch parallel-install protect-owned sandbox sfperms splitdebug test unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr' NETBEANS_MODULES='' TMPDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp INSTALL_MASK='   /usr/lib*/*.la   /etc/init.d /etc/conf.d   /etc/logrotate.d   /etc/sandbox.d   /usr/share/bash-completion   /usr/share/locale ' PORTAGE_BIN_PATH=/usr/lib/portage/python3.6 _E_INSDESTTREE_='' SANDBOX_METHOD=any LD=armv7a-cros-linux-gnueabihf-ld.lld POSTSUBMIT_BINHOST=gs://chromeos-prebuilt/board/arm-generic/postsubmit-R108-15119.0.0-39982-8802937358584190913/packages OPENMPI_OFED_FEATURES='' NM_FOR_BUILD=llvm-nm ABI_ARM='' PORTAGE_INTERNAL_CALLER=1 PORTAGE_COMPRESSION_COMMAND='zstd -3' PVR=0.9.9-r1469 MARCH_TUNE='' PKG_LOGDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/logging READELF=llvm-readelf CPU_FLAGS_ARM='' ASAN_OPTIONS=' log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan detect_stack_use_after_return=0' KEYWORDS='*' PORTAGE_COMPRESS_EXCLUDE_SUFFIXES='css gif htm[l]? jp[e]?g js pdf png' STRIP_FOR_BUILD=llvm-strip FULL_BINHOST=gs://chromeos-prebuilt/board/arm-generic/full-R107-15117.0.0-rc3/packages/ PORTAGE_BUILD_USER=chrome-bot VCSID=0.9.9-r1469-bf82e6be443883de436a54f49ace638782314b5f OPENMPI_FABRICS='' CHROMEOS_KERNEL_SPLITCONFIG=chromiumos-arm NGINX_MODULES_MAIL='' USE_EXPAND_UNPREFIXED=ARCH PORT_LOGDIR=/build/arm-generic/tmp/portage/logs/ MOPREFIX=flashrom EC_FIRMWARE='' _E_EXEDESTTREE_='' MOZ_GMP_PATH=/build/arm-generic/usr/lib/nsbrowser/plugins/gmp-gmpopenh264/system-installed FFTOOLS='' OFED_DRIVERS='' LLVM_TARGETS='' LIRC_DEVICES='' FETCHCOMMAND_SSH='bash -c "x=\${2#ssh://} ; host=\${x%%/*} ; port=\${host##*:} ; host=\${host%:*} ; [[ \${host} = \${port} ]] && port= ; exec rsync --rsh=\"ssh \${port:+-p\${port}} \${3}\" -avP \"\${host}:/\${x#*/}\" \"\$1\"" rsync "${DISTDIR}/${FILE}" "${URI}" "${PORTAGE_SSH_OPTS}"' PORTAGE_PYM_PATH=/usr/lib64/python3.6/site-packages OZONE_PLATFORM_DEFAULT='' FCFLAGS=-O2 CHROMEOS_KERNEL_FAMILY='' EPAUSE_IGNORE=1 LSAN_OPTIONS=' print_suppressions=0' TERM=unknown BOOTSTRAP_USE='cxx unicode python_targets_python3_2 python_targets_python2_7' OBJCOPY_FOR_BUILD=llvm-objcopy LESSOPEN='|lesspipe %s' EROOT=/build/arm-generic CC_FOR_BUILD=x86_64-pc-linux-gnu-clang AT_SYS_M4DIR='${SYSROOT}/usr/share/aclocal' PORTAGE_XATTR_EXCLUDE='btrfs.* security.evm security.ima 	security.selinux system.nfs4_acl user.apache_handler 	user.Beagle.* user.dublincore.* user.mime_encoding user.xdg.*' PORTAGE_LOG_FILE=/build/arm-generic/tmp/portage/logs/sys-apps:flashrom-0.9.9-r1469:20220916-100238.log NOCOLOR=true PORTAGE_DEBUG=0 CROS_WORKON_SRCROOT=/mnt/host/source RESUMECOMMAND_AB='/mnt/host/source/chromite/bin/abutil fetch "${URI}" "${DISTDIR}/${FILE}"' OZONE_PLATFORM='' RESTRICT='' GCE_METADATA_HOST=127.0.0.1:46605 SANDBOX_DEBUG=0 PORTAGE_DEPCACHEDIR=/var/cache/edb/dep AR=llvm-ar ARCH=arm NGINX_MODULES_HTTP='' ROOT=/build/arm-generic VIDEO_CARDS='' ROS_MESSAGES='' ABI_X86='' TEMP=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp USE_EXPAND_VALUES_ARCH='alpha amd64 amd64-fbsd amd64-linux arm arm-linux arm64 hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips nios2 ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd riscv s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-cygwin x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt' INPUT_DEVICES='' OBJDUMP_FOR_BUILD=llvm-objdump FOO2ZJS_DEVICES='' PORTAGE_COMPRESS_FLAGS=-3 SHLVL=1 AR_FOR_BUILD=llvm-ar DISTDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/distdir NM=llvm-nm PORTAGE_REPOSITORIES='[DEFAULT]
 auto-sync = yes
 main-repo = portage-stable
 strict-misc-digests = true
@@ -47,11 +47,11 @@
 strict-misc-digests = true
 sync-allow-hardlinks = true
 sync-rcu = false
-' APACHE2_MPMS='' SANDBOX_WRITE=:/build/arm-generic/tmp/portage:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir/.bash_history:/dev/console:/dev/fd:/dev/full:/dev/null:/dev/ptmx:/dev/pts/:/dev/pty:/dev/shm:/dev/tts:/dev/tty:/dev/vc/:/dev/zero:/proc/self/fd:/tmp/:/usr/lib/cf:/usr/lib/conftest:/usr/lib32/cf:/usr/lib32/conftest:/usr/lib64/cf:/usr/lib64/conftest:/usr/tmp/:/usr/tmp/cf:/usr/tmp/conftest:/var/tmp/ CHOST_default=armv7a-cros-linux-gnueabihf XFCE_PLUGINS='' GPSD_PROTOCOLS='' LC_MESSAGES=C FETCHCOMMAND_CIPD='/mnt/host/source/chromite/bin/fetch_cipd "${URI}" "${DISTDIR}/${FILE}"' XTABLES_ADDONS='' LICENSE=GPL-2 PYTHONDONTWRITEBYTECODE=1 SYSROOT=/build/arm-generic UBSAN_OPTIONS=' log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan:symbolize=1:print_stacktrace=1' VOICEMAIL_STORAGE='' U_BOOT_CONFIG_USE='' PV=0.9.9 RESUMECOMMAND_SSH='bash -c "x=\${2#ssh://} ; host=\${x%%/*} ; port=\${host##*:} ; host=\${host%:*} ; [[ \${host} = \${port} ]] && port= ; exec rsync --rsh=\"ssh \${port:+-p\${port}} \${3}\" -avP \"\${host}:/\${x#*/}\" \"\$1\"" rsync "${DISTDIR}/${FILE}" "${URI}" "${PORTAGE_SSH_OPTS}"' SANDBOX_LOG=/tmp/sandbox-11552.log PR=r1469 STRIP_MASK='*.nexe /firmware/*.elf' COLLECTD_PLUGINS='' PN=flashrom XARGS='xargs -r' SANE_BACKENDS='' USE_EXPAND_IMPLICIT='ARCH ELIBC KERNEL USERLAND' PF=flashrom-0.9.9-r1469 USE_EXPAND_VALUES_ELIBC='AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt' LD_LIBRARY_PATH=/usr/local/lib CROS_ARTIFACTS_TMP_DIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/cros-artifacts PORTAGE_BASHRC=/build/arm-generic/etc/portage/bashrc CXXLD_FOR_BUILD=x86_64-pc-linux-gnu-clang++ ACCEPT_LICENSE=GPL-2 BUILD_PREFIX=/build/arm-generic/tmp/portage MERGE_TYPE=source ABI_MIPS='' _E_DOCDESTTREE_='' _E_DESTTREE_=/usr BOARD_RUSTFLAGS=-Ctarget-feature=+armv7-a,+neon COMMON_COMPILER_FLAGS='' PORTAGE_ACTUAL_DISTDIR=/var/cache/chromeos-cache/distfiles OBJCOPY=llvm-objcopy RANLIB_FOR_BUILD=llvm-ranlib CCACHE_DISABLE=1 LIBDIR_default=lib PKG_INSTALL_MASK='   /usr/lib*/*.la   /etc/init.d /etc/conf.d   /etc/logrotate.d   /etc/sandbox.d   /usr/share/bash-completion   /usr/share/locale ' SANDBOX_PREDICT=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir:/dev/crypto:/proc/self/coredump_filter:/dev/random:/proc/self/coredump_filter:/usr/share/cache/fontconfig:/ FCDSL_CARDS='' LIBOPTIONS=-m0644 GRUB_PLATFORMS='' OBJC_FOR_BUILD=x86_64-pc-linux-gnu-clang SANDBOX_DENY='' EBUILD_DEATH_HOOKS=' cros_log_failed_packages cros-workon_on_die_rebase_check asan_death_hook' STRIP=llvm-strip LC_COLLATE=C OBJC=x86_64-pc-linux-gnu-clang MSAN_OPTIONS=' log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan' CHOST=armv7a-cros-linux-gnueabihf TMP=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp PORTAGE_INST_GID=0 OBJDUMP=llvm-objdump PATH=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/build-toolchain-wrappers:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/build-toolchain-wrappers/gnu_tools:/usr/lib/portage/python3.6/ebuild-helpers/xattr:/usr/lib/portage/python3.6/ebuild-helpers:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/bin:/build/arm-generic/build/bin SANDBOX_DEBUG_LOG=/tmp/sandbox-debug-11552.log PORTAGE_BUILDDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469 PORTAGE_BZIP2_COMMAND='lbzip2 -z' PORTAGE_USERNAME=chrome-bot NGINX_MODULES_STREAM='' USE='arm dummy elibc_glibc ft2232_spi internal it8212 kernel_linux linux_mtd linux_spi mediatek_i2c_spi parade_lspcon raiden_debug_spi realtek_mst_i2c_spi serprog stlinkv3_spi test usbblaster_spi userland_GNU wiki' PHP_TARGETS='' READELF_FOR_BUILD=llvm-readelf CC=armv7a-cros-linux-gnueabihf-clang TESTS='' CCLD_FOR_BUILD=x86_64-pc-linux-gnu-clang BOARD_OVERLAY=/mnt/host/source/src/overlays/overlay-arm-generic CFLAGS=' -Os -pipe  -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections' USE_EXPAND='ABI_ARM ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS BOARD_USE CALLIGRA_FEATURES CAMERAS CHROMEOS_KERNEL_FAMILY COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS CROS_WORKON_TREE CURL_SSL DRACUT_MODULES DVB_CARDS EC_FIRMWARE EC_FIRMWARE_EXTRA ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FOO2ZJS_DEVICES FPMCU_FIRMWARE FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LINUX_FIRMWARE LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM OZONE_PLATFORM OZONE_PLATFORM_DEFAULT PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS TESTS TTY_CONSOLE USERLAND UWSGI_PLUGINS U_BOOT_CONFIG_USE U_BOOT_FDT_USE VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS' SANDBOX_BASHRC=/usr/share/sandbox/sandbox.bashrc CROSSCOMPILE_OPTS='' SUDO_UID=1000 MULTILIB_ABIS=arm STRINGS_FOR_BUILD=llvm-strings LIBDIR_x86=lib PORTAGE_GID=250 FETCHCOMMAND_GS='bash -c '"'"'BOTO_CONFIG= /mnt/host/source/chromite/bin/gs_fetch_binpkg "${URI}" "${DISTDIR}/${FILE}"'"'"'' MAIL=/var/mail/root PORTAGE_BUILD_GROUP=portage BASHRC_FILESDIR=/mnt/host/source/src/third_party/chromiumos-overlay/sys-apps/flashrom/files APACHE2_MODULES='' ELIBC=glibc EAPI=7 RANLIB=llvm-ranlib ABI=arm ECLASS_DEPTH=0 PORTAGE_BASHRC_FILES='/mnt/host/source/src/third_party/chromiumos-overlay/profiles/base/profile.bashrc
+' APACHE2_MPMS='' SANDBOX_WRITE=:/build/arm-generic/tmp/portage:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir/.bash_history:/dev/console:/dev/fd:/dev/full:/dev/null:/dev/ptmx:/dev/pts/:/dev/pty:/dev/shm:/dev/tts:/dev/tty:/dev/vc/:/dev/zero:/proc/self/fd:/tmp/:/usr/lib/cf:/usr/lib/conftest:/usr/lib32/cf:/usr/lib32/conftest:/usr/lib64/cf:/usr/lib64/conftest:/usr/tmp/:/usr/tmp/cf:/usr/tmp/conftest:/var/tmp/ CHOST_default=armv7a-cros-linux-gnueabihf XFCE_PLUGINS='' GPSD_PROTOCOLS='' LC_MESSAGES=C FETCHCOMMAND_CIPD='/mnt/host/source/chromite/bin/fetch_cipd "${URI}" "${DISTDIR}/${FILE}"' XTABLES_ADDONS='' LICENSE=GPL-2 PYTHONDONTWRITEBYTECODE=1 SYSROOT=/build/arm-generic UBSAN_OPTIONS=' log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan:symbolize=1:print_stacktrace=1' VOICEMAIL_STORAGE='' U_BOOT_CONFIG_USE='' PV=0.9.9 RESUMECOMMAND_SSH='bash -c "x=\${2#ssh://} ; host=\${x%%/*} ; port=\${host##*:} ; host=\${host%:*} ; [[ \${host} = \${port} ]] && port= ; exec rsync --rsh=\"ssh \${port:+-p\${port}} \${3}\" -avP \"\${host}:/\${x#*/}\" \"\$1\"" rsync "${DISTDIR}/${FILE}" "${URI}" "${PORTAGE_SSH_OPTS}"' SANDBOX_LOG=/var/log/sandbox/sandbox-11800.log PR=r1469 STRIP_MASK='*.nexe /firmware/*.elf' COLLECTD_PLUGINS='' PN=flashrom XARGS='xargs -r' SANE_BACKENDS='' USE_EXPAND_IMPLICIT='ARCH ELIBC KERNEL USERLAND' PF=flashrom-0.9.9-r1469 USE_EXPAND_VALUES_ELIBC='AIX bionic Cygwin Darwin DragonFly FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc Winnt' LD_LIBRARY_PATH=/usr/local/lib CROS_ARTIFACTS_TMP_DIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/cros-artifacts PORTAGE_BASHRC=/build/arm-generic/etc/portage/bashrc CXXLD_FOR_BUILD=x86_64-pc-linux-gnu-clang++ ACCEPT_LICENSE=GPL-2 BUILD_PREFIX=/build/arm-generic/tmp/portage MERGE_TYPE=source ABI_MIPS='' _E_DOCDESTTREE_='' _E_DESTTREE_=/usr BOARD_RUSTFLAGS=-Ctarget-feature=+armv7-a,+neon COMMON_COMPILER_FLAGS='' PORTAGE_ACTUAL_DISTDIR=/var/cache/chromeos-cache/distfiles OBJCOPY=llvm-objcopy RANLIB_FOR_BUILD=llvm-ranlib CCACHE_DISABLE=1 LIBDIR_default=lib PKG_INSTALL_MASK='   /usr/lib*/*.la   /etc/init.d /etc/conf.d   /etc/logrotate.d   /etc/sandbox.d   /usr/share/bash-completion   /usr/share/locale ' SANDBOX_PREDICT=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir:/dev/crypto:/proc/self/coredump_filter:/dev/random:/proc/self/coredump_filter:/usr/share/cache/fontconfig:/ FCDSL_CARDS='' LIBOPTIONS=-m0644 GRUB_PLATFORMS='' OBJC_FOR_BUILD=x86_64-pc-linux-gnu-clang SANDBOX_DENY='' EBUILD_DEATH_HOOKS=' cros_log_failed_packages cros-workon_on_die_rebase_check asan_death_hook' STRIP=llvm-strip LC_COLLATE=C OBJC=x86_64-pc-linux-gnu-clang MSAN_OPTIONS=' log_path=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/asan_logs/asan' CHOST=armv7a-cros-linux-gnueabihf TMP=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp PORTAGE_INST_GID=0 OBJDUMP=llvm-objdump PATH=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/build-toolchain-wrappers:/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/temp/build-toolchain-wrappers/gnu_tools:/usr/lib/portage/python3.6/ebuild-helpers/xattr:/usr/lib/portage/python3.6/ebuild-helpers:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/lib/llvm/bin:/build/arm-generic/build/bin SANDBOX_DEBUG_LOG=/var/log/sandbox/sandbox-debug-11800.log PORTAGE_BUILDDIR=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469 PORTAGE_BZIP2_COMMAND='lbzip2 -z' PORTAGE_USERNAME=chrome-bot NGINX_MODULES_STREAM='' USE='arm dummy elibc_glibc ft2232_spi internal it8212 kernel_linux linux_mtd linux_spi mediatek_i2c_spi parade_lspcon raiden_debug_spi realtek_mst_i2c_spi serprog stlinkv3_spi test usbblaster_spi userland_GNU wiki' PHP_TARGETS='' READELF_FOR_BUILD=llvm-readelf CC=armv7a-cros-linux-gnueabihf-clang TESTS='' CCLD_FOR_BUILD=x86_64-pc-linux-gnu-clang BOARD_OVERLAY=/mnt/host/source/src/overlays/overlay-arm-generic CFLAGS=' -Os -pipe  -march=armv7-a -mtune=cortex-a15 -mfpu=neon -mfloat-abi=hard -g -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections' USE_EXPAND='ABI_ARM ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS BOARD_USE CALLIGRA_FEATURES CAMERAS CHROMEOS_KERNEL_FAMILY COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS CROS_WORKON_TREE CURL_SSL DRACUT_MODULES DVB_CARDS EC_FIRMWARE EC_FIRMWARE_EXTRA ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FOO2ZJS_DEVICES FPMCU_FIRMWARE FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LINUX_FIRMWARE LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM OZONE_PLATFORM OZONE_PLATFORM_DEFAULT PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS TESTS TTY_CONSOLE USERLAND UWSGI_PLUGINS U_BOOT_CONFIG_USE U_BOOT_FDT_USE VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS' SANDBOX_BASHRC=/usr/share/sandbox/sandbox.bashrc CROSSCOMPILE_OPTS='' SUDO_UID=1000 MULTILIB_ABIS=arm STRINGS_FOR_BUILD=llvm-strings LIBDIR_x86=lib PORTAGE_GID=250 FETCHCOMMAND_GS='bash -c '"'"'BOTO_CONFIG= /mnt/host/source/chromite/bin/gs_fetch_binpkg "${URI}" "${DISTDIR}/${FILE}"'"'"'' MAIL=/var/mail/root PORTAGE_BUILD_GROUP=portage BASHRC_FILESDIR=/mnt/host/source/src/third_party/chromiumos-overlay/sys-apps/flashrom/files APACHE2_MODULES='' ELIBC=glibc EAPI=7 RANLIB=llvm-ranlib ABI=arm ECLASS_DEPTH=0 PORTAGE_BASHRC_FILES='/mnt/host/source/src/third_party/chromiumos-overlay/profiles/base/profile.bashrc
 /mnt/host/source/src/third_party/chromiumos-overlay/profiles/targets/chromeos/profile.bashrc' CROS_WORKON_TREE=0dba356809d0cb42d50019f80cc5ef75686e418f OLDPWD=/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/homedir BUILD_LD=x86_64-pc-linux-gnu-ld.lld MONKEYD_PLUGINS='' EMERGE_FROM=ebuild LADSPA_PATH=/usr/lib/ladspa PKG_CONFIG=/build/arm-generic/build/bin/pkg-config DVB_CARDS='' _=/usr/bin/meson 
 
-1/1 cmocka test flashrom OK             10.83s
-03:54:09 MALLOC_PERTURB_=127 MESON_EXE_WRAPPER=/mnt/host/source/src/platform2/common-mk/meson_test.py /mnt/host/source/src/platform2/common-mk/meson_test.py /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/tests/flashrom_unit_tests
+1/1 cmocka test flashrom OK             11.01s
+10:02:52 MESON_EXE_WRAPPER=/mnt/host/source/src/platform2/common-mk/meson_test.py MALLOC_PERTURB_=63 /mnt/host/source/src/platform2/common-mk/meson_test.py /build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/tests/flashrom_unit_tests
 ----------------------------------- output -----------------------------------
 stdout:
 Running [PosixPath('/mnt/host/source/src/platform2/common-mk/platform2_test.py'), '--sysroot', '/build/arm-generic', '--', '/build/arm-generic/tmp/portage/sys-apps/flashrom-0.9.9-r1469/work/flashrom-0.9.9-build/tests/flashrom_unit_tests']
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/console-1.0-py3.6.egg-info/SOURCES.txt b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/console-1.0-py3.6.egg-info/SOURCES.txt
index 3b69408..59f1280 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/console-1.0-py3.6.egg-info/SOURCES.txt
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/console-1.0-py3.6.egg-info/SOURCES.txt
@@ -6663,9 +6663,13 @@
 zephyr/test/drivers/isl923x/src/charge_ramp_hw.c
 zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c
 zephyr/test/drivers/keyboard_scan/CMakeLists.txt
+zephyr/test/drivers/keyboard_scan/include
 zephyr/test/drivers/keyboard_scan/src
+zephyr/test/drivers/keyboard_scan/include/keyboard_test_utils.h
 zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c
+zephyr/test/drivers/keyboard_scan/src/keyboard_test_utils.c
 zephyr/test/drivers/keyboard_scan/src/mkbp_event.c
+zephyr/test/drivers/keyboard_scan/src/mkbp_info.c
 zephyr/test/drivers/led_driver/CMakeLists.txt
 zephyr/test/drivers/led_driver/led_pins.dts
 zephyr/test/drivers/led_driver/led_policy.dts
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/ec3po-1.0.0rc1-py3.6.egg-info/SOURCES.txt b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/ec3po-1.0.0rc1-py3.6.egg-info/SOURCES.txt
index 5e52391..ec2e746 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/ec3po-1.0.0rc1-py3.6.egg-info/SOURCES.txt
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/ec3po-1.0.0rc1-py3.6.egg-info/SOURCES.txt
@@ -6662,9 +6662,13 @@
 zephyr/test/drivers/isl923x/src/charge_ramp_hw.c
 zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c
 zephyr/test/drivers/keyboard_scan/CMakeLists.txt
+zephyr/test/drivers/keyboard_scan/include
 zephyr/test/drivers/keyboard_scan/src
+zephyr/test/drivers/keyboard_scan/include/keyboard_test_utils.h
 zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c
+zephyr/test/drivers/keyboard_scan/src/keyboard_test_utils.c
 zephyr/test/drivers/keyboard_scan/src/mkbp_event.c
+zephyr/test/drivers/keyboard_scan/src/mkbp_info.c
 zephyr/test/drivers/led_driver/CMakeLists.txt
 zephyr/test/drivers/led_driver/led_pins.dts
 zephyr/test/drivers/led_driver/led_policy.dts
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/ecusb-1.0-py3.6.egg-info/SOURCES.txt b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/ecusb-1.0-py3.6.egg-info/SOURCES.txt
index 42cc726..e9a97be 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/ecusb-1.0-py3.6.egg-info/SOURCES.txt
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/ecusb-1.0-py3.6.egg-info/SOURCES.txt
@@ -6662,9 +6662,13 @@
 zephyr/test/drivers/isl923x/src/charge_ramp_hw.c
 zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c
 zephyr/test/drivers/keyboard_scan/CMakeLists.txt
+zephyr/test/drivers/keyboard_scan/include
 zephyr/test/drivers/keyboard_scan/src
+zephyr/test/drivers/keyboard_scan/include/keyboard_test_utils.h
 zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c
+zephyr/test/drivers/keyboard_scan/src/keyboard_test_utils.c
 zephyr/test/drivers/keyboard_scan/src/mkbp_event.c
+zephyr/test/drivers/keyboard_scan/src/mkbp_info.c
 zephyr/test/drivers/led_driver/CMakeLists.txt
 zephyr/test/drivers/led_driver/led_pins.dts
 zephyr/test/drivers/led_driver/led_policy.dts
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/powerlog-1.0-py3.6.egg-info/SOURCES.txt b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/powerlog-1.0-py3.6.egg-info/SOURCES.txt
index 2b7d05f..3a101a0 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/powerlog-1.0-py3.6.egg-info/SOURCES.txt
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/powerlog-1.0-py3.6.egg-info/SOURCES.txt
@@ -6663,9 +6663,13 @@
 zephyr/test/drivers/isl923x/src/charge_ramp_hw.c
 zephyr/test/drivers/isl923x/src/console_cmd_amon_bmon.c
 zephyr/test/drivers/keyboard_scan/CMakeLists.txt
+zephyr/test/drivers/keyboard_scan/include
 zephyr/test/drivers/keyboard_scan/src
+zephyr/test/drivers/keyboard_scan/include/keyboard_test_utils.h
 zephyr/test/drivers/keyboard_scan/src/keyboard_scan.c
+zephyr/test/drivers/keyboard_scan/src/keyboard_test_utils.c
 zephyr/test/drivers/keyboard_scan/src/mkbp_event.c
+zephyr/test/drivers/keyboard_scan/src/mkbp_info.c
 zephyr/test/drivers/led_driver/CMakeLists.txt
 zephyr/test/drivers/led_driver/led_pins.dts
 zephyr/test/drivers/led_driver/led_policy.dts
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/pycparser/lextab.py b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/pycparser/lextab.py
index 41809c3..2dee43b 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/pycparser/lextab.py
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/pycparser/lextab.py
@@ -1,6 +1,6 @@
 # lextab.py. This file automatically created by PLY (version 3.10). Don't edit!
 _tabversion   = '3.10'
-_lextokens    = set(('PERIOD', 'UNSIGNED', 'SEMI', 'SWITCH', 'LNOT', 'CHAR_CONST', 'TIMESEQUAL', 'INT_CONST_BIN', 'FOR', 'HEX_FLOAT_CONST', 'CHAR', 'CASE', 'RESTRICT', 'COLON', 'DIVIDE', 'WSTRING_LITERAL', 'ELLIPSIS', 'GT', 'CONTINUE', 'LE', 'NOT', 'PLUS', 'XOR', 'OR', 'LPAREN', 'TYPEDEF', 'WHILE', 'ANDEQUAL', 'DIVEQUAL', 'LAND', 'LOR', 'INT_CONST_CHAR', 'MINUSEQUAL', '_COMPLEX', 'RSHIFT', 'PLUSEQUAL', 'LSHIFTEQUAL', 'PPHASH', 'INT_CONST_HEX', 'VOLATILE', 'RETURN', 'WCHAR_CONST', 'LT', 'GE', 'UNION', '_BOOL', 'TYPEID', 'DO', 'CONST', 'DOUBLE', 'RBRACKET', 'PPPRAGMA', 'VOID', 'FLOAT', 'INT', 'STRUCT', 'DEFAULT', 'ID', 'RBRACE', 'MINUS', 'EQUALS', 'INT_CONST_OCT', 'REGISTER', 'IF', 'OFFSETOF', 'AND', 'SHORT', 'FLOAT_CONST', 'SIZEOF', 'COMMA', 'STATIC', 'ARROW', 'RSHIFTEQUAL', 'LBRACE', 'PPPRAGMASTR', 'BREAK', 'MOD', 'XOREQUAL', 'INT_CONST_DEC', 'GOTO', 'STRING_LITERAL', 'EXTERN', 'OREQUAL', 'MINUSMINUS', 'SIGNED', 'LSHIFT', 'RPAREN', 'LBRACKET', 'CONDOP', 'LONG', 'ENUM', 'PLUSPLUS', 'AUTO', '__INT128', 'MODEQUAL', 'TIMES', 'NE', 'ELSE', 'INLINE', 'EQ'))
+_lextokens    = set(('PLUS', 'MINUSEQUAL', 'PPPRAGMA', 'RBRACE', 'TIMES', 'COLON', 'WCHAR_CONST', 'MOD', 'AUTO', 'OREQUAL', 'AND', 'FOR', 'TYPEID', 'LPAREN', 'UNION', 'LSHIFT', 'XOR', 'PLUSEQUAL', 'LSHIFTEQUAL', 'INT_CONST_OCT', 'TYPEDEF', 'EQ', 'SIGNED', 'WHILE', 'INT', 'ENUM', 'LT', 'GOTO', 'INT_CONST_BIN', 'VOLATILE', 'STRUCT', 'ID', 'GT', 'INT_CONST_HEX', 'RBRACKET', 'TIMESEQUAL', 'CHAR_CONST', 'XOREQUAL', 'OR', 'DOUBLE', 'RESTRICT', 'NE', 'DIVIDE', 'MINUS', 'VOID', 'RSHIFTEQUAL', 'CONTINUE', 'IF', 'PERIOD', 'PPHASH', 'SWITCH', 'MODEQUAL', 'LOR', 'SEMI', 'PLUSPLUS', '__INT128', 'EXTERN', 'OFFSETOF', 'COMMA', 'PPPRAGMASTR', '_COMPLEX', 'SIZEOF', 'LONG', 'RPAREN', 'CONDOP', 'ELLIPSIS', 'RETURN', 'CASE', '_BOOL', 'DO', 'LAND', 'HEX_FLOAT_CONST', 'BREAK', 'RSHIFT', 'FLOAT_CONST', 'MINUSMINUS', 'LBRACE', 'CHAR', 'INLINE', 'STATIC', 'FLOAT', 'GE', 'CONST', 'LE', 'DIVEQUAL', 'EQUALS', 'ARROW', 'INT_CONST_CHAR', 'WSTRING_LITERAL', 'SHORT', 'DEFAULT', 'ELSE', 'NOT', 'STRING_LITERAL', 'LNOT', 'REGISTER', 'INT_CONST_DEC', 'LBRACKET', 'ANDEQUAL', 'UNSIGNED'))
 _lexreflags   = 64
 _lexliterals  = ''
 _lexstateinfo = {'INITIAL': 'inclusive', 'ppline': 'exclusive', 'pppragma': 'exclusive'}
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/aleena_r0_inas.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/aleena_r0_inas.xml
index cc20f45..95da0b1 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/aleena_r0_inas.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/aleena_r0_inas.xml
@@ -1,655 +1,655 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:44 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:12 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp3300_a_mv</name>
     <doc>Bus Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_a" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_a_mw</name>
     <doc>Power of 'pp3300_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_a" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_a_ma</name>
     <doc>Current of 'pp3300_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_a" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_a" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_a_ez_config</name>
     <doc>Good default config for 'pp3300_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_a" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_a" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp5000_a_mv</name>
     <doc>Bus Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_a" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_mw</name>
     <doc>Power of 'pp5000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp5000_a" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ma</name>
     <doc>Current of 'pp5000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.002" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp5000_a" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_a" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ez_config</name>
     <doc>Good default config for 'pp5000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp5000_a" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="5.0" base_name="pp5000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp5000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp5000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_a_mv</name>
     <doc>Bus Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="1.8" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_a" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_a_mw</name>
     <doc>Power of 'pp1800_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="1.8" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1800_a" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_a_ma</name>
     <doc>Current of 'pp1800_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.02" nom="1.8" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1800_a" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="1.8" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_a" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_a_ez_config</name>
     <doc>Good default config for 'pp1800_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp1800_a" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="1.8" base_name="pp1800_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mv</name>
     <doc>Bus Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.2" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_vddq" rsense="0.005" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mw</name>
     <doc>Power of 'pp1200_vddq' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.2" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1200_vddq" rsense="0.005" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ma</name>
     <doc>Current of 'pp1200_vddq' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.2" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1200_vddq" rsense="0.005" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shuntmv</name>
     <doc>Shunt Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.2" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_vddq" rsense="0.005" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ez_config</name>
     <doc>Good default config for 'pp1200_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp1200_vddq" tags="adc_ez_config_ctrls" nom="1.2" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.2" base_name="pp1200_vddq" map="on">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_mv</name>
     <doc>Bus Voltage of 'ppvar_vddcr_nb' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="0.875" base_name="ppvar_vddcr_nb">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vddcr_nb" rsense="0.005" nom="0.875">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_mw</name>
     <doc>Power of 'ppvar_vddcr_nb' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="0.875" base_name="ppvar_vddcr_nb">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_vddcr_nb" rsense="0.005" nom="0.875">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_ma</name>
     <doc>Current of 'ppvar_vddcr_nb' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.005" nom="0.875" base_name="ppvar_vddcr_nb">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_vddcr_nb" rsense="0.005" nom="0.875">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vddcr_nb' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="0.875" base_name="ppvar_vddcr_nb">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vddcr_nb" rsense="0.005" nom="0.875">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_ez_config</name>
     <doc>Good default config for 'ppvar_vddcr_nb' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="ppvar_vddcr_nb" tags="adc_ez_config_ctrls" nom="0.875" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="0.875" base_name="ppvar_vddcr_nb" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_mv</name>
     <doc>Bus Voltage of 'ppvar_vddcr' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="0.85" base_name="ppvar_vddcr">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vddcr" rsense="0.005" nom="0.85">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_mw</name>
     <doc>Power of 'ppvar_vddcr' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="0.85" base_name="ppvar_vddcr">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="ppvar_vddcr" rsense="0.005" nom="0.85">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_ma</name>
     <doc>Current of 'ppvar_vddcr' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="0.85" base_name="ppvar_vddcr">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="ppvar_vddcr" rsense="0.005" nom="0.85">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vddcr' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="0.85" base_name="ppvar_vddcr">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vddcr" rsense="0.005" nom="0.85">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_ez_config</name>
     <doc>Good default config for 'ppvar_vddcr' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="ppvar_vddcr" tags="adc_ez_config_ctrls" nom="0.85" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="0.85" base_name="ppvar_vddcr" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_mv</name>
     <doc>Bus Voltage of 'pp3300_tcpc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_tcpc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_tcpc" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_mw</name>
     <doc>Power of 'pp3300_tcpc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="3.3" base_name="pp3300_tcpc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_tcpc" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_ma</name>
     <doc>Current of 'pp3300_tcpc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.5" nom="3.3" base_name="pp3300_tcpc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_tcpc" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_tcpc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_tcpc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_tcpc" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_ez_config</name>
     <doc>Good default config for 'pp3300_tcpc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_tcpc" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.5">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="3.3" base_name="pp3300_tcpc" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_ec_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_a" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_mw</name>
     <doc>Power of 'pp3300_ec_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="3.3" base_name="pp3300_ec_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_ec_a" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_ma</name>
     <doc>Current of 'pp3300_ec_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.5" nom="3.3" base_name="pp3300_ec_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_ec_a" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ec_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_ec_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ec_a" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_ez_config</name>
     <doc>Good default config for 'pp3300_ec_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp3300_ec_a" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.5">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="3.3" base_name="pp3300_ec_a" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp950_a_mv</name>
     <doc>Bus Voltage of 'pp950_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="0.95" base_name="pp950_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp950_a" rsense="0.005" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_a_mw</name>
     <doc>Power of 'pp950_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="0.95" base_name="pp950_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp950_a" rsense="0.005" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_a_ma</name>
     <doc>Current of 'pp950_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="0.95" base_name="pp950_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp950_a" rsense="0.005" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp950_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="0.95" base_name="pp950_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp950_a" rsense="0.005" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_a_ez_config</name>
     <doc>Good default config for 'pp950_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp950_a" tags="adc_ez_config_ctrls" nom="0.95" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="0.95" base_name="pp950_a" map="on">
     </params>
   </control>
   <control>
     <name>pp950_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp950_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp950_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp950_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mw</name>
     <doc>Power of 'pp3300_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ma</name>
     <doc>Current of 'pp3300_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ez_config</name>
     <doc>Good default config for 'pp3300_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_wlan" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_edp_mv</name>
     <doc>Bus Voltage of 'pp3300_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_edp" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_mw</name>
     <doc>Power of 'pp3300_edp' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_edp" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_ma</name>
     <doc>Current of 'pp3300_edp' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_edp" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_edp" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_ez_config</name>
     <doc>Good default config for 'pp3300_edp' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp3300_edp" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_edp" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_edp_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_edp_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_edp_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_edp_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp950_vddp_s0_mv</name>
     <doc>Bus Voltage of 'pp950_vddp_s0' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="0.95" base_name="pp950_vddp_s0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp950_vddp_s0" rsense="0.002" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_vddp_s0_mw</name>
     <doc>Power of 'pp950_vddp_s0' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="0.95" base_name="pp950_vddp_s0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp950_vddp_s0" rsense="0.002" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_vddp_s0_ma</name>
     <doc>Current of 'pp950_vddp_s0' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.002" nom="0.95" base_name="pp950_vddp_s0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp950_vddp_s0" rsense="0.002" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_vddp_s0_shuntmv</name>
     <doc>Shunt Voltage of 'pp950_vddp_s0' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="0.95" base_name="pp950_vddp_s0">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp950_vddp_s0" rsense="0.002" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_vddp_s0_ez_config</name>
     <doc>Good default config for 'pp950_vddp_s0' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp950_vddp_s0" tags="adc_ez_config_ctrls" nom="0.95" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="0.95" base_name="pp950_vddp_s0" map="on">
     </params>
   </control>
   <control>
     <name>pp950_vddp_s0_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp950_vddp_s0_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp950_vddp_s0_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp950_vddp_s0_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev0.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev0.xml
index 7f9c193..739c5ee 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev0.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev0.xml
@@ -1,853 +1,853 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:57 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:26 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>ppvar_vbus_in_mv</name>
     <doc>Bus Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_mw</name>
     <doc>Power of 'ppvar_vbus_in' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ma</name>
     <doc>Current of 'ppvar_vbus_in' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ez_config</name>
     <doc>Good default config for 'ppvar_vbus_in' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls" nom="20.0" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mv</name>
     <doc>Bus Voltage of 'ppvar_batt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_batt" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mw</name>
     <doc>Power of 'ppvar_batt' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_batt" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_ma</name>
     <doc>Current of 'ppvar_batt' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.01" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_batt" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_batt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_batt" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_ez_config</name>
     <doc>Good default config for 'ppvar_batt' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="ppvar_batt" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="8.8" base_name="ppvar_batt" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_batt_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_batt_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_mv</name>
     <doc>Bus Voltage of 'pp4200_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_g" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_mw</name>
     <doc>Power of 'pp4200_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp4200_g" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_ma</name>
     <doc>Current of 'pp4200_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp4200_g" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_g" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_ez_config</name>
     <doc>Good default config for 'pp4200_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp4200_g" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="4.2" base_name="pp4200_g" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mw</name>
     <doc>Power of 'ppvar_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ma</name>
     <doc>Current of 'ppvar_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ez_config</name>
     <doc>Good default config for 'ppvar_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="ppvar_bl" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="8.8" base_name="ppvar_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_mv</name>
     <doc>Bus Voltage of 'pp3300_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_mw</name>
     <doc>Power of 'pp3300_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_ma</name>
     <doc>Current of 'pp3300_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_ez_config</name>
     <doc>Good default config for 'pp3300_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp3300_g" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_g" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_mv</name>
     <doc>Bus Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_mw</name>
     <doc>Power of 'pp5000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ma</name>
     <doc>Current of 'pp5000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ez_config</name>
     <doc>Good default config for 'pp5000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp5000_a" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_mv</name>
     <doc>Bus Voltage of 'pp3300_h1_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_h1_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_mw</name>
     <doc>Power of 'pp3300_h1_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_h1_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_ma</name>
     <doc>Current of 'pp3300_h1_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_h1_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_h1_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_h1_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_ez_config</name>
     <doc>Good default config for 'pp3300_h1_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_h1_g" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_h1_g" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mv</name>
     <doc>Bus Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mw</name>
     <doc>Power of 'ppvar_sys' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ma</name>
     <doc>Current of 'ppvar_sys' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.01" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_sys" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sys" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ez_config</name>
     <doc>Good default config for 'ppvar_sys' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="ppvar_sys" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="8.8" base_name="ppvar_sys" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_mv</name>
     <doc>Bus Voltage of 'pp1800_vio18_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="1.8" base_name="pp1800_vio18_u">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_vio18_u" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_mw</name>
     <doc>Power of 'pp1800_vio18_u' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="1.8" base_name="pp1800_vio18_u">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1800_vio18_u" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_ma</name>
     <doc>Current of 'pp1800_vio18_u' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.02" nom="1.8" base_name="pp1800_vio18_u">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1800_vio18_u" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_vio18_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="1.8" base_name="pp1800_vio18_u">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_vio18_u" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_ez_config</name>
     <doc>Good default config for 'pp1800_vio18_u' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp1800_vio18_u" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="1.8" base_name="pp1800_vio18_u" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_ts_mv</name>
     <doc>Bus Voltage of 'pp3300_ts' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ts" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_mw</name>
     <doc>Power of 'pp3300_ts' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ts" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_ma</name>
     <doc>Current of 'pp3300_ts' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ts" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ts' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ts" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_ez_config</name>
     <doc>Good default config for 'pp3300_ts' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_ts" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_ts" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ts_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ts_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ts_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ts_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_mv</name>
     <doc>Bus Voltage of 'pp1800_h1_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="1.8" base_name="pp1800_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_h1_g" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_mw</name>
     <doc>Power of 'pp1800_h1_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="1.8" base_name="pp1800_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp1800_h1_g" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_ma</name>
     <doc>Current of 'pp1800_h1_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.02" nom="1.8" base_name="pp1800_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp1800_h1_g" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_h1_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="1.8" base_name="pp1800_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_h1_g" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_ez_config</name>
     <doc>Good default config for 'pp1800_h1_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp1800_h1_g" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="1.8" base_name="pp1800_h1_g" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_mv</name>
     <doc>Bus Voltage of 'pp1800_ec_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="1.8" base_name="pp1800_ec_vcc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_ec_vcc" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_mw</name>
     <doc>Power of 'pp1800_ec_vcc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="1.8" base_name="pp1800_ec_vcc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1800_ec_vcc" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_ma</name>
     <doc>Current of 'pp1800_ec_vcc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.02" nom="1.8" base_name="pp1800_ec_vcc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1800_ec_vcc" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_ec_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="1.8" base_name="pp1800_ec_vcc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_ec_vcc" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_ez_config</name>
     <doc>Good default config for 'pp1800_ec_vcc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp1800_ec_vcc" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="1.8" base_name="pp1800_ec_vcc" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mw</name>
     <doc>Power of 'pp3300_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ma</name>
     <doc>Current of 'pp3300_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ez_config</name>
     <doc>Good default config for 'pp3300_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_wlan" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_u_mv</name>
     <doc>Bus Voltage of 'pp3300_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_u">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_u" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_u_mw</name>
     <doc>Power of 'pp3300_u' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_u">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_u" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_u_ma</name>
     <doc>Current of 'pp3300_u' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_u">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_u" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_u_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_u">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_u" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_u_ez_config</name>
     <doc>Good default config for 'pp3300_u' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_u" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_u" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_u_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_u_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_u_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_u_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_u_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_u_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_ec_g">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_mw</name>
     <doc>Power of 'pp3300_ec_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_ec_g">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ec_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_ma</name>
     <doc>Current of 'pp3300_ec_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_ec_g">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ec_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ec_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_ec_g">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ec_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_ez_config</name>
     <doc>Good default config for 'pp3300_ec_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_ec_g" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_ec_g" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev0_mod.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev0_mod.xml
index caa750f..76f312c 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev0_mod.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev0_mod.xml
@@ -1,853 +1,853 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:53 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:24 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>ppvar_vbus_in_mv</name>
     <doc>Bus Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_mw</name>
     <doc>Power of 'ppvar_vbus_in' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ma</name>
     <doc>Current of 'ppvar_vbus_in' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ez_config</name>
     <doc>Good default config for 'ppvar_vbus_in' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls" nom="20.0" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mv</name>
     <doc>Bus Voltage of 'ppvar_batt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_batt" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mw</name>
     <doc>Power of 'ppvar_batt' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_batt" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_ma</name>
     <doc>Current of 'ppvar_batt' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.1" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_batt" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_batt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_batt" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_ez_config</name>
     <doc>Good default config for 'ppvar_batt' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="ppvar_batt" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="8.8" base_name="ppvar_batt" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_batt_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_batt_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_mv</name>
     <doc>Bus Voltage of 'pp4200_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_g" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_mw</name>
     <doc>Power of 'pp4200_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp4200_g" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_ma</name>
     <doc>Current of 'pp4200_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.1" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp4200_g" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_g" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_ez_config</name>
     <doc>Good default config for 'pp4200_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp4200_g" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="4.2" base_name="pp4200_g" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mw</name>
     <doc>Power of 'ppvar_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ma</name>
     <doc>Current of 'ppvar_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ez_config</name>
     <doc>Good default config for 'ppvar_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="ppvar_bl" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="8.8" base_name="ppvar_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_mv</name>
     <doc>Bus Voltage of 'pp3300_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_mw</name>
     <doc>Power of 'pp3300_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_ma</name>
     <doc>Current of 'pp3300_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_ez_config</name>
     <doc>Good default config for 'pp3300_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp3300_g" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_g" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_mv</name>
     <doc>Bus Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_a" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_mw</name>
     <doc>Power of 'pp5000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp5000_a" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ma</name>
     <doc>Current of 'pp5000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.1" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp5000_a" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_a" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ez_config</name>
     <doc>Good default config for 'pp5000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp5000_a" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="5.0" base_name="pp5000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_mv</name>
     <doc>Bus Voltage of 'pp3300_h1_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_h1_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_mw</name>
     <doc>Power of 'pp3300_h1_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_h1_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_ma</name>
     <doc>Current of 'pp3300_h1_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_h1_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_h1_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_h1_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_ez_config</name>
     <doc>Good default config for 'pp3300_h1_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_h1_g" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_h1_g" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mv</name>
     <doc>Bus Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mw</name>
     <doc>Power of 'ppvar_sys' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ma</name>
     <doc>Current of 'ppvar_sys' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.1" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_sys" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sys" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ez_config</name>
     <doc>Good default config for 'ppvar_sys' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="ppvar_sys" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="8.8" base_name="ppvar_sys" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_mv</name>
     <doc>Bus Voltage of 'pp1800_vio18_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_vio18_u">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_vio18_u" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_mw</name>
     <doc>Power of 'pp1800_vio18_u' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_vio18_u">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1800_vio18_u" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_ma</name>
     <doc>Current of 'pp1800_vio18_u' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_vio18_u">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1800_vio18_u" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_vio18_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_vio18_u">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_vio18_u" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_ez_config</name>
     <doc>Good default config for 'pp1800_vio18_u' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp1800_vio18_u" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_vio18_u" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_vio18_u_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_ts_mv</name>
     <doc>Bus Voltage of 'pp3300_ts' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ts" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_mw</name>
     <doc>Power of 'pp3300_ts' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ts" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_ma</name>
     <doc>Current of 'pp3300_ts' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ts" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ts' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ts" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_ez_config</name>
     <doc>Good default config for 'pp3300_ts' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_ts" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_ts" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ts_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ts_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ts_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ts_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_mv</name>
     <doc>Bus Voltage of 'pp1800_h1_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_h1_g" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_mw</name>
     <doc>Power of 'pp1800_h1_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp1800_h1_g" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_ma</name>
     <doc>Current of 'pp1800_h1_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp1800_h1_g" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_h1_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_h1_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_h1_g" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_ez_config</name>
     <doc>Good default config for 'pp1800_h1_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp1800_h1_g" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_h1_g" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_h1_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_mv</name>
     <doc>Bus Voltage of 'pp1800_ec_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_ec_vcc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_ec_vcc" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_mw</name>
     <doc>Power of 'pp1800_ec_vcc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_ec_vcc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1800_ec_vcc" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_ma</name>
     <doc>Current of 'pp1800_ec_vcc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_ec_vcc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1800_ec_vcc" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_ec_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_ec_vcc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_ec_vcc" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_ez_config</name>
     <doc>Good default config for 'pp1800_ec_vcc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp1800_ec_vcc" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_ec_vcc" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_vcc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mw</name>
     <doc>Power of 'pp3300_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ma</name>
     <doc>Current of 'pp3300_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ez_config</name>
     <doc>Good default config for 'pp3300_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_wlan" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_u_mv</name>
     <doc>Bus Voltage of 'pp3300_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_u">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_u" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_u_mw</name>
     <doc>Power of 'pp3300_u' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_u">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_u" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_u_ma</name>
     <doc>Current of 'pp3300_u' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_u">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_u" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_u_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_u">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_u" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_u_ez_config</name>
     <doc>Good default config for 'pp3300_u' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_u" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_u" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_u_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_u_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_u_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_u_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_u_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_u_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_ec_g">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_mw</name>
     <doc>Power of 'pp3300_ec_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_ec_g">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ec_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_ma</name>
     <doc>Current of 'pp3300_ec_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_ec_g">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ec_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ec_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_ec_g">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ec_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_ez_config</name>
     <doc>Good default config for 'pp3300_ec_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_ec_g" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_ec_g" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_ec_g_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev1.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev1.xml
index 68e9635..f8d58dc 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev1.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev1.xml
@@ -1,853 +1,853 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:51 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:21 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>ppvar_vbus_in_mv</name>
     <doc>Bus Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_mw</name>
     <doc>Power of 'ppvar_vbus_in' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ma</name>
     <doc>Current of 'ppvar_vbus_in' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ez_config</name>
     <doc>Good default config for 'ppvar_vbus_in' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls" nom="20.0" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mv</name>
     <doc>Bus Voltage of 'ppvar_batt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_batt" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mw</name>
     <doc>Power of 'ppvar_batt' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_batt" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_ma</name>
     <doc>Current of 'ppvar_batt' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.01" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_batt" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_batt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_batt" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_ez_config</name>
     <doc>Good default config for 'ppvar_batt' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="ppvar_batt" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="8.8" base_name="ppvar_batt" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_batt_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_batt_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_mv</name>
     <doc>Bus Voltage of 'pp4200_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_g" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_mw</name>
     <doc>Power of 'pp4200_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp4200_g" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_ma</name>
     <doc>Current of 'pp4200_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp4200_g" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_g" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_ez_config</name>
     <doc>Good default config for 'pp4200_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp4200_g" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="4.2" base_name="pp4200_g" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mw</name>
     <doc>Power of 'ppvar_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ma</name>
     <doc>Current of 'ppvar_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ez_config</name>
     <doc>Good default config for 'ppvar_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="ppvar_bl" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="8.8" base_name="ppvar_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_mv</name>
     <doc>Bus Voltage of 'pp3300_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_mw</name>
     <doc>Power of 'pp3300_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_ma</name>
     <doc>Current of 'pp3300_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_g" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_ez_config</name>
     <doc>Good default config for 'pp3300_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp3300_g" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_g" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_mv</name>
     <doc>Bus Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_mw</name>
     <doc>Power of 'pp5000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ma</name>
     <doc>Current of 'pp5000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ez_config</name>
     <doc>Good default config for 'pp5000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp5000_a" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_mv</name>
     <doc>Bus Voltage of 'pp4200_gpu' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_gpu">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_gpu" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_mw</name>
     <doc>Power of 'pp4200_gpu' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="4.2" base_name="pp4200_gpu">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp4200_gpu" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_ma</name>
     <doc>Current of 'pp4200_gpu' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="4.2" base_name="pp4200_gpu">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp4200_gpu" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_gpu' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_gpu">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_gpu" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_ez_config</name>
     <doc>Good default config for 'pp4200_gpu' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp4200_gpu" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="4.2" base_name="pp4200_gpu" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mv</name>
     <doc>Bus Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mw</name>
     <doc>Power of 'ppvar_sys' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ma</name>
     <doc>Current of 'ppvar_sys' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.01" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_sys" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sys" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ez_config</name>
     <doc>Good default config for 'ppvar_sys' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="ppvar_sys" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="8.8" base_name="ppvar_sys" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp4200_core_mv</name>
     <doc>Bus Voltage of 'pp4200_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_core">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_core" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_core_mw</name>
     <doc>Power of 'pp4200_core' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="4.2" base_name="pp4200_core">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp4200_core" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_core_ma</name>
     <doc>Current of 'pp4200_core' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="4.2" base_name="pp4200_core">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp4200_core" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_core_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_core">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_core" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_core_ez_config</name>
     <doc>Good default config for 'pp4200_core' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp4200_core" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="4.2" base_name="pp4200_core" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_core_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_core_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp4200_core_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp4200_core_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_ts_mv</name>
     <doc>Bus Voltage of 'pp3300_ts' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ts" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_mw</name>
     <doc>Power of 'pp3300_ts' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ts" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_ma</name>
     <doc>Current of 'pp3300_ts' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ts" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ts' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ts" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_ez_config</name>
     <doc>Good default config for 'pp3300_ts' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_ts" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_ts" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ts_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ts_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ts_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ts_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_bc_mv</name>
     <doc>Bus Voltage of 'pp4200_bc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_bc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_bc" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_bc_mw</name>
     <doc>Power of 'pp4200_bc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="4.2" base_name="pp4200_bc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp4200_bc" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_bc_ma</name>
     <doc>Current of 'pp4200_bc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.01" nom="4.2" base_name="pp4200_bc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp4200_bc" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_bc_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_bc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_bc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_bc" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_bc_ez_config</name>
     <doc>Good default config for 'pp4200_bc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp4200_bc" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="4.2" base_name="pp4200_bc" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_bc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_bc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_bc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_bc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_lc_mv</name>
     <doc>Bus Voltage of 'pp4200_lc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_lc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_lc" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_lc_mw</name>
     <doc>Power of 'pp4200_lc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="4.2" base_name="pp4200_lc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp4200_lc" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_lc_ma</name>
     <doc>Current of 'pp4200_lc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="4.2" base_name="pp4200_lc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp4200_lc" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_lc_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_lc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="4.2" base_name="pp4200_lc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_lc" rsense="0.01" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_lc_ez_config</name>
     <doc>Good default config for 'pp4200_lc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp4200_lc" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="4.2" base_name="pp4200_lc" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_lc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_lc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_lc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_lc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mw</name>
     <doc>Power of 'pp3300_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ma</name>
     <doc>Current of 'pp3300_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ez_config</name>
     <doc>Good default config for 'pp3300_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_wlan" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_hub_mv</name>
     <doc>Bus Voltage of 'pp3300_hub' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_hub">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_hub" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hub_mw</name>
     <doc>Power of 'pp3300_hub' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_hub">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_hub" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hub_ma</name>
     <doc>Current of 'pp3300_hub' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_hub">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_hub" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hub_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_hub' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_hub">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_hub" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hub_ez_config</name>
     <doc>Good default config for 'pp3300_hub' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_hub" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_hub" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_hub_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_hub_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_hub_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_hub_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_hub_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_hub_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_mv</name>
     <doc>Bus Voltage of 'pp3300_lcm' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_lcm">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_lcm" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_mw</name>
     <doc>Power of 'pp3300_lcm' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_lcm">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_lcm" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_ma</name>
     <doc>Current of 'pp3300_lcm' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_lcm">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_lcm" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_lcm' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_lcm">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_lcm" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_ez_config</name>
     <doc>Good default config for 'pp3300_lcm' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_lcm" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_lcm" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev1_mod.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev1_mod.xml
index 22478f2..dc360bc 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev1_mod.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/asurada_rev1_mod.xml
@@ -1,853 +1,853 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:52 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:23 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>ppvar_vbus_in_mv</name>
     <doc>Bus Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_mw</name>
     <doc>Power of 'ppvar_vbus_in' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ma</name>
     <doc>Current of 'ppvar_vbus_in' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ez_config</name>
     <doc>Good default config for 'ppvar_vbus_in' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls" nom="20.0" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="20.0" base_name="ppvar_vbus_in" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mv</name>
     <doc>Bus Voltage of 'ppvar_batt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_batt" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_mw</name>
     <doc>Power of 'ppvar_batt' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_batt" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_ma</name>
     <doc>Current of 'ppvar_batt' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.1" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_batt" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_batt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="8.8" base_name="ppvar_batt">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_batt" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_batt_ez_config</name>
     <doc>Good default config for 'ppvar_batt' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="ppvar_batt" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="8.8" base_name="ppvar_batt" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_batt_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_batt_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_batt_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_mv</name>
     <doc>Bus Voltage of 'pp4200_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_g" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_mw</name>
     <doc>Power of 'pp4200_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp4200_g" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_ma</name>
     <doc>Current of 'pp4200_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.1" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp4200_g" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_g" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_g_ez_config</name>
     <doc>Good default config for 'pp4200_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp4200_g" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="4.2" base_name="pp4200_g" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp4200_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mw</name>
     <doc>Power of 'ppvar_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ma</name>
     <doc>Current of 'ppvar_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="8.8" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl" rsense="0.01" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ez_config</name>
     <doc>Good default config for 'ppvar_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="ppvar_bl" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="8.8" base_name="ppvar_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_mv</name>
     <doc>Bus Voltage of 'pp3300_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_mw</name>
     <doc>Power of 'pp3300_g' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_ma</name>
     <doc>Current of 'pp3300_g' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_g' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_g">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_g" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_g_ez_config</name>
     <doc>Good default config for 'pp3300_g' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp3300_g" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_g" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_g_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_g_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_g_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_mv</name>
     <doc>Bus Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_a" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_mw</name>
     <doc>Power of 'pp5000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp5000_a" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ma</name>
     <doc>Current of 'pp5000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.1" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp5000_a" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_a" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ez_config</name>
     <doc>Good default config for 'pp5000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp5000_a" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="5.0" base_name="pp5000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_mv</name>
     <doc>Bus Voltage of 'pp4200_gpu' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_gpu">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_gpu" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_mw</name>
     <doc>Power of 'pp4200_gpu' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="4.2" base_name="pp4200_gpu">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp4200_gpu" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_ma</name>
     <doc>Current of 'pp4200_gpu' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="4.2" base_name="pp4200_gpu">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp4200_gpu" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_gpu' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_gpu">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_gpu" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_ez_config</name>
     <doc>Good default config for 'pp4200_gpu' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp4200_gpu" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="4.2" base_name="pp4200_gpu" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp4200_gpu_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mv</name>
     <doc>Bus Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mw</name>
     <doc>Power of 'ppvar_sys' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ma</name>
     <doc>Current of 'ppvar_sys' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.1" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_sys" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="8.8" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sys" rsense="0.1" nom="8.8">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ez_config</name>
     <doc>Good default config for 'ppvar_sys' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="ppvar_sys" tags="adc_ez_config_ctrls" nom="8.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="8.8" base_name="ppvar_sys" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sys_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp4200_core_mv</name>
     <doc>Bus Voltage of 'pp4200_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_core">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_core" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_core_mw</name>
     <doc>Power of 'pp4200_core' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="4.2" base_name="pp4200_core">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp4200_core" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_core_ma</name>
     <doc>Current of 'pp4200_core' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.1" nom="4.2" base_name="pp4200_core">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp4200_core" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_core_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_core">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_core" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_core_ez_config</name>
     <doc>Good default config for 'pp4200_core' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp4200_core" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="4.2" base_name="pp4200_core" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_core_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_core_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp4200_core_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp4200_core_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_ts_mv</name>
     <doc>Bus Voltage of 'pp3300_ts' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ts" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_mw</name>
     <doc>Power of 'pp3300_ts' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ts" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_ma</name>
     <doc>Current of 'pp3300_ts' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ts" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ts' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_ts">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ts" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ts_ez_config</name>
     <doc>Good default config for 'pp3300_ts' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_ts" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_ts" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ts_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ts_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ts_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ts_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_bc_mv</name>
     <doc>Bus Voltage of 'pp4200_bc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_bc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_bc" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_bc_mw</name>
     <doc>Power of 'pp4200_bc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="4.2" base_name="pp4200_bc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp4200_bc" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_bc_ma</name>
     <doc>Current of 'pp4200_bc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.1" nom="4.2" base_name="pp4200_bc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp4200_bc" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_bc_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_bc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_bc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_bc" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_bc_ez_config</name>
     <doc>Good default config for 'pp4200_bc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp4200_bc" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="4.2" base_name="pp4200_bc" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_bc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_bc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_bc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_bc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_lc_mv</name>
     <doc>Bus Voltage of 'pp4200_lc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_lc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp4200_lc" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_lc_mw</name>
     <doc>Power of 'pp4200_lc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="4.2" base_name="pp4200_lc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp4200_lc" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_lc_ma</name>
     <doc>Current of 'pp4200_lc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.1" nom="4.2" base_name="pp4200_lc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp4200_lc" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_lc_shuntmv</name>
     <doc>Shunt Voltage of 'pp4200_lc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="4.2" base_name="pp4200_lc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp4200_lc" rsense="0.1" nom="4.2">
     </params>
   </control>
   <control>
     <name>pp4200_lc_ez_config</name>
     <doc>Good default config for 'pp4200_lc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp4200_lc" tags="adc_ez_config_ctrls" nom="4.2" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="4.2" base_name="pp4200_lc" map="on">
     </params>
   </control>
   <control>
     <name>pp4200_lc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp4200_lc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_lc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp4200_lc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mw</name>
     <doc>Power of 'pp3300_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ma</name>
     <doc>Current of 'pp3300_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_wlan" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ez_config</name>
     <doc>Good default config for 'pp3300_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_wlan" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_hub_mv</name>
     <doc>Bus Voltage of 'pp3300_hub' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_hub">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_hub" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hub_mw</name>
     <doc>Power of 'pp3300_hub' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_hub">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_hub" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hub_ma</name>
     <doc>Current of 'pp3300_hub' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_hub">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_hub" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hub_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_hub' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_hub">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_hub" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hub_ez_config</name>
     <doc>Good default config for 'pp3300_hub' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_hub" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_hub" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_hub_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_hub_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_hub_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_hub_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_hub_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_hub_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_mv</name>
     <doc>Bus Voltage of 'pp3300_lcm' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_lcm">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_lcm" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_mw</name>
     <doc>Power of 'pp3300_lcm' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_lcm">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_lcm" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_ma</name>
     <doc>Current of 'pp3300_lcm' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_lcm">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_lcm" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_lcm' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_lcm">
+    <params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_lcm" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_ez_config</name>
     <doc>Good default config for 'pp3300_lcm' rail</doc>
-    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_lcm" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_lcm" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina219_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_lcm_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev0_loc.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev0_loc.xml
index c2e89cc..22e31da 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev0_loc.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev0_loc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:41 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:09 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
@@ -22,1057 +22,1057 @@
 <control>
 <name>ppvar_vcc_mv</name>
 <doc>Bus Voltage of 'ppvar_vcc' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvar_vcc_mw</name>
 <doc>Power of 'ppvar_vcc' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvar_vcc_ma</name>
 <doc>Current of 'ppvar_vcc' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvar_vcc_shuntmv</name>
 <doc>Shunt Voltage of 'ppvar_vcc' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvar_vcc_ez_config</name>
 <doc>Good default config for 'ppvar_vcc' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="ppvar_vcc" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.002">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.0" base_name="ppvar_vcc" map="on">
 </params>
 </control>
 <control>
 <name>ppvar_vcc_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>ppvar_vcc_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
 </params>
 </control>
 <control>
 <name>ppvar_vcc_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
 </params>
 </control>
 <control>
 <name>ppvar_vcc_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
 </params>
 </control>
 <control>
 <name>ppvar_vcc_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
 </params>
 </control>
 <control>
 <name>ppvar_vcc_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
 </params>
 </control>
 <control>
 <name>ppvat_gt_mv</name>
 <doc>Bus Voltage of 'ppvat_gt' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvat_gt">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvat_gt" rsense="0.002" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvat_gt_mw</name>
 <doc>Power of 'ppvat_gt' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.0" base_name="ppvat_gt">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvat_gt" rsense="0.002" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvat_gt_ma</name>
 <doc>Current of 'ppvat_gt' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.0" base_name="ppvat_gt">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvat_gt" rsense="0.002" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvat_gt_shuntmv</name>
 <doc>Shunt Voltage of 'ppvat_gt' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvat_gt">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvat_gt" rsense="0.002" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvat_gt_ez_config</name>
 <doc>Good default config for 'ppvat_gt' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="ppvat_gt" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.002">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.0" base_name="ppvat_gt" map="on">
 </params>
 </control>
 <control>
 <name>ppvat_gt_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>ppvat_gt_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
 </params>
 </control>
 <control>
 <name>ppvat_gt_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
 </params>
 </control>
 <control>
 <name>ppvat_gt_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
 </params>
 </control>
 <control>
 <name>ppvat_gt_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
 </params>
 </control>
 <control>
 <name>ppvat_gt_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
 </params>
 </control>
 <control>
 <name>ppvar_sa_mv</name>
 <doc>Bus Voltage of 'ppvar_sa' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvar_sa_mw</name>
 <doc>Power of 'ppvar_sa' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvar_sa_ma</name>
 <doc>Current of 'ppvar_sa' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvar_sa_shuntmv</name>
 <doc>Shunt Voltage of 'ppvar_sa' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
 </params>
 </control>
 <control>
 <name>ppvar_sa_ez_config</name>
 <doc>Good default config for 'ppvar_sa' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="ppvar_sa" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.005">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.0" base_name="ppvar_sa" map="on">
 </params>
 </control>
 <control>
 <name>ppvar_sa_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>ppvar_sa_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
 </params>
 </control>
 <control>
 <name>ppvar_sa_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
 </params>
 </control>
 <control>
 <name>ppvar_sa_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
 </params>
 </control>
 <control>
 <name>ppvar_sa_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
 </params>
 </control>
 <control>
 <name>ppvar_sa_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
 </params>
 </control>
 <control>
 <name>pp975_io_mv</name>
 <doc>Bus Voltage of 'pp975_io' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp975_io_mw</name>
 <doc>Power of 'pp975_io' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp975_io_ma</name>
 <doc>Current of 'pp975_io' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp975_io_shuntmv</name>
 <doc>Shunt Voltage of 'pp975_io' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp975_io_ez_config</name>
 <doc>Good default config for 'pp975_io' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp975_io" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp975_io" map="on">
 </params>
 </control>
 <control>
 <name>pp975_io_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>pp975_io_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
 </params>
 </control>
 <control>
 <name>pp975_io_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
 </params>
 </control>
 <control>
 <name>pp975_io_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
 </params>
 </control>
 <control>
 <name>pp975_io_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
 </params>
 </control>
 <control>
 <name>pp975_io_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
 </params>
 </control>
 <control>
 <name>pp5000_a_mv</name>
 <doc>Bus Voltage of 'pp5000_a' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
 </params>
 </control>
 <control>
 <name>pp5000_a_mw</name>
 <doc>Power of 'pp5000_a' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
 </params>
 </control>
 <control>
 <name>pp5000_a_ma</name>
 <doc>Current of 'pp5000_a' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
 </params>
 </control>
 <control>
 <name>pp5000_a_shuntmv</name>
 <doc>Shunt Voltage of 'pp5000_a' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
 </params>
 </control>
 <control>
 <name>pp5000_a_ez_config</name>
 <doc>Good default config for 'pp5000_a' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp5000_a" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_a" map="on">
 </params>
 </control>
 <control>
 <name>pp5000_a_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>pp5000_a_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
 </params>
 </control>
 <control>
 <name>pp5000_a_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
 </params>
 </control>
 <control>
 <name>pp5000_a_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
 </params>
 </control>
 <control>
 <name>pp5000_a_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
 </params>
 </control>
 <control>
 <name>pp5000_a_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
 </params>
 </control>
 <control>
 <name>pp3300_dsw_mv</name>
 <doc>Bus Voltage of 'pp3300_dsw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dsw_mw</name>
 <doc>Power of 'pp3300_dsw' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dsw_ma</name>
 <doc>Current of 'pp3300_dsw' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dsw_shuntmv</name>
 <doc>Shunt Voltage of 'pp3300_dsw' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dsw_ez_config</name>
 <doc>Good default config for 'pp3300_dsw' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_dsw" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dsw" map="on">
 </params>
 </control>
 <control>
 <name>pp3300_dsw_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>pp3300_dsw_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
 </params>
 </control>
 <control>
 <name>pp3300_dsw_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
 </params>
 </control>
 <control>
 <name>pp3300_dsw_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
 </params>
 </control>
 <control>
 <name>pp3300_dsw_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
 </params>
 </control>
 <control>
 <name>pp3300_dsw_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
 </params>
 </control>
 <control>
 <name>pp3300_a_mv</name>
 <doc>Bus Voltage of 'pp3300_a' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp3300_a_mw</name>
 <doc>Power of 'pp3300_a' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp3300_a_ma</name>
 <doc>Current of 'pp3300_a' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp3300_a_shuntmv</name>
 <doc>Shunt Voltage of 'pp3300_a' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp3300_a_ez_config</name>
 <doc>Good default config for 'pp3300_a' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="pp3300_a" map="on">
 </params>
 </control>
 <control>
 <name>pp3300_a_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>pp3300_a_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
 </params>
 </control>
 <control>
 <name>pp3300_a_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
 </params>
 </control>
 <control>
 <name>pp3300_a_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
 </params>
 </control>
 <control>
 <name>pp3300_a_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
 </params>
 </control>
 <control>
 <name>pp3300_a_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
 </params>
 </control>
 <control>
 <name>pp1800_u_dram_mv</name>
 <doc>Bus Voltage of 'pp1800_u_dram' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u_dram">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_u_dram" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1800_u_dram_mw</name>
 <doc>Power of 'pp1800_u_dram' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1800_u_dram">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_u_dram" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1800_u_dram_ma</name>
 <doc>Current of 'pp1800_u_dram' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1800_u_dram">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_u_dram" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1800_u_dram_shuntmv</name>
 <doc>Shunt Voltage of 'pp1800_u_dram' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u_dram">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_u_dram" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1800_u_dram_ez_config</name>
 <doc>Good default config for 'pp1800_u_dram' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp1800_u_dram" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1800_u_dram" map="on">
 </params>
 </control>
 <control>
 <name>pp1800_u_dram_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="71" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>pp1800_u_dram_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="71">
 </params>
 </control>
 <control>
 <name>pp1800_u_dram_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="71">
 </params>
 </control>
 <control>
 <name>pp1800_u_dram_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="71">
 </params>
 </control>
 <control>
 <name>pp1800_u_dram_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="71">
 </params>
 </control>
 <control>
 <name>pp1800_u_dram_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="71">
 </params>
 </control>
 <control>
 <name>pp1200_vddq_mv</name>
 <doc>Bus Voltage of 'pp1200_vddq' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1200_vddq_mw</name>
 <doc>Power of 'pp1200_vddq' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1200_vddq_ma</name>
 <doc>Current of 'pp1200_vddq' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1200_vddq_shuntmv</name>
 <doc>Shunt Voltage of 'pp1200_vddq' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1200_vddq_ez_config</name>
 <doc>Good default config for 'pp1200_vddq' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp1200_vddq" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1200_vddq" map="on">
 </params>
 </control>
 <control>
 <name>pp1200_vddq_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="72" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>pp1200_vddq_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="72">
 </params>
 </control>
 <control>
 <name>pp1200_vddq_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="72">
 </params>
 </control>
 <control>
 <name>pp1200_vddq_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="72">
 </params>
 </control>
 <control>
 <name>pp1200_vddq_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="72">
 </params>
 </control>
 <control>
 <name>pp1200_vddq_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="72">
 </params>
 </control>
 <control>
 <name>pp1000_a_mv</name>
 <doc>Bus Voltage of 'pp1000_a' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1000_a_mw</name>
 <doc>Power of 'pp1000_a' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1000_a_ma</name>
 <doc>Current of 'pp1000_a' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1000_a_shuntmv</name>
 <doc>Shunt Voltage of 'pp1000_a' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp1000_a_ez_config</name>
 <doc>Good default config for 'pp1000_a' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp1000_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1000_a" map="on">
 </params>
 </control>
 <control>
 <name>pp1000_a_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="73" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>pp1000_a_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="73">
 </params>
 </control>
 <control>
 <name>pp1000_a_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="73">
 </params>
 </control>
 <control>
 <name>pp1000_a_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="73">
 </params>
 </control>
 <control>
 <name>pp1000_a_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="73">
 </params>
 </control>
 <control>
 <name>pp1000_a_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="73">
 </params>
 </control>
 <control>
 <name>pp850_prim_core_mv</name>
 <doc>Bus Voltage of 'pp850_prim_core' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp850_prim_core_mw</name>
 <doc>Power of 'pp850_prim_core' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp850_prim_core_ma</name>
 <doc>Current of 'pp850_prim_core' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp850_prim_core_shuntmv</name>
 <doc>Shunt Voltage of 'pp850_prim_core' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
 </params>
 </control>
 <control>
 <name>pp850_prim_core_ez_config</name>
 <doc>Good default config for 'pp850_prim_core' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp850_prim_core" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp850_prim_core" map="on">
 </params>
 </control>
 <control>
 <name>pp850_prim_core_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="74" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>pp850_prim_core_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="74">
 </params>
 </control>
 <control>
 <name>pp850_prim_core_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="74">
 </params>
 </control>
 <control>
 <name>pp850_prim_core_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="74">
 </params>
 </control>
 <control>
 <name>pp850_prim_core_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="74">
 </params>
 </control>
 <control>
 <name>pp850_prim_core_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="74">
 </params>
 </control>
 <control>
 <name>pp3300_dx_wlan_mv</name>
 <doc>Bus Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dx_wlan_mw</name>
 <doc>Power of 'pp3300_dx_wlan' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dx_wlan_ma</name>
 <doc>Current of 'pp3300_dx_wlan' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dx_wlan_shuntmv</name>
 <doc>Shunt Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dx_wlan_ez_config</name>
 <doc>Good default config for 'pp3300_dx_wlan' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan" map="on">
 </params>
 </control>
 <control>
 <name>pp3300_dx_wlan_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="75" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>pp3300_dx_wlan_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="75">
 </params>
 </control>
 <control>
 <name>pp3300_dx_wlan_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="75">
 </params>
 </control>
 <control>
 <name>pp3300_dx_wlan_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="75">
 </params>
 </control>
 <control>
 <name>pp3300_dx_wlan_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="75">
 </params>
 </control>
 <control>
 <name>pp3300_dx_wlan_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="75">
 </params>
 </control>
 <control>
 <name>ppvar_bl_pwr_mv</name>
 <doc>Bus Voltage of 'ppvar_bl_pwr' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl_pwr">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl_pwr" rsense="0.05" nom="7.7">
 </params>
 </control>
 <control>
 <name>ppvar_bl_pwr_mw</name>
 <doc>Power of 'ppvar_bl_pwr' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl_pwr">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl_pwr" rsense="0.05" nom="7.7">
 </params>
 </control>
 <control>
 <name>ppvar_bl_pwr_ma</name>
 <doc>Current of 'ppvar_bl_pwr' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl_pwr">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl_pwr" rsense="0.05" nom="7.7">
 </params>
 </control>
 <control>
 <name>ppvar_bl_pwr_shuntmv</name>
 <doc>Shunt Voltage of 'ppvar_bl_pwr' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl_pwr">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl_pwr" rsense="0.05" nom="7.7">
 </params>
 </control>
 <control>
 <name>ppvar_bl_pwr_ez_config</name>
 <doc>Good default config for 'ppvar_bl_pwr' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="ppvar_bl_pwr" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.05">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.05" nom="7.7" base_name="ppvar_bl_pwr" map="on">
 </params>
 </control>
 <control>
 <name>ppvar_bl_pwr_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="76" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="76" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>ppvar_bl_pwr_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="76" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="76">
 </params>
 </control>
 <control>
 <name>ppvar_bl_pwr_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="76" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="76">
 </params>
 </control>
 <control>
 <name>ppvar_bl_pwr_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="76" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="76">
 </params>
 </control>
 <control>
 <name>ppvar_bl_pwr_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="76" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="76">
 </params>
 </control>
 <control>
 <name>ppvar_bl_pwr_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="76" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="76">
 </params>
 </control>
 <control>
 <name>pp3300_dx_edp_mv</name>
 <doc>Bus Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dx_edp_mw</name>
 <doc>Power of 'pp3300_dx_edp' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dx_edp_ma</name>
 <doc>Current of 'pp3300_dx_edp' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dx_edp_shuntmv</name>
 <doc>Shunt Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_dx_edp_ez_config</name>
 <doc>Good default config for 'pp3300_dx_edp' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp" map="on">
 </params>
 </control>
 <control>
 <name>pp3300_dx_edp_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="77" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="77" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>pp3300_dx_edp_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="77" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="77">
 </params>
 </control>
 <control>
 <name>pp3300_dx_edp_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="77" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="77">
 </params>
 </control>
 <control>
 <name>pp3300_dx_edp_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="77" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="77">
 </params>
 </control>
 <control>
 <name>pp3300_dx_edp_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="77" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="77">
 </params>
 </control>
 <control>
 <name>pp3300_dx_edp_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="77" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="77">
 </params>
 </control>
 <control>
 <name>pp3300_h1_mv</name>
 <doc>Bus Voltage of 'pp3300_h1' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_h1_mw</name>
 <doc>Power of 'pp3300_h1' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_h1_ma</name>
 <doc>Current of 'pp3300_h1' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_h1_shuntmv</name>
 <doc>Shunt Voltage of 'pp3300_h1' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
 </params>
 </control>
 <control>
 <name>pp3300_h1_ez_config</name>
 <doc>Good default config for 'pp3300_h1' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="pp3300_h1" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_h1" map="on">
 </params>
 </control>
 <control>
 <name>pp3300_h1_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="78" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="78" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>pp3300_h1_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="78" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="78">
 </params>
 </control>
 <control>
 <name>pp3300_h1_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="78" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="78">
 </params>
 </control>
 <control>
 <name>pp3300_h1_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="78" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="78">
 </params>
 </control>
 <control>
 <name>pp3300_h1_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="78" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="78">
 </params>
 </control>
 <control>
 <name>pp3300_h1_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="78" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="78">
 </params>
 </control>
 <control>
 <name>vbat_mv</name>
 <doc>Bus Voltage of 'vbat' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="7.7" base_name="vbat">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="vbat" rsense="0.02" nom="7.7">
 </params>
 </control>
 <control>
 <name>vbat_mw</name>
 <doc>Power of 'vbat' rail in milliwatts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="7.7" base_name="vbat">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliwatts" tags="power_rail" base_name="vbat" rsense="0.02" nom="7.7">
 </params>
 </control>
 <control>
 <name>vbat_ma</name>
 <doc>Current of 'vbat' rail in milliamps</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="7.7" base_name="vbat">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="milliamps" tags="current_rail" base_name="vbat" rsense="0.02" nom="7.7">
 </params>
 </control>
 <control>
 <name>vbat_shuntmv</name>
 <doc>Shunt Voltage of 'vbat' rail in millivolts</doc>
-<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="7.7" base_name="vbat">
+<params cmd="get" interface="servo" drv="ina219" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="vbat" rsense="0.02" nom="7.7">
 </params>
 </control>
 <control>
 <name>vbat_ez_config</name>
 <doc>Good default config for 'vbat' rail</doc>
-<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" map="on" base_name="vbat" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.02">
+<params cmd="set" interface="servo" drv="ina219" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="7.7" base_name="vbat" map="on">
 </params>
 </control>
 <control>
 <name>vbat_cfg_reg</name>
 <doc>Raw register value of cfg on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" map="ina219_cfg" c2d2_interface="4" fmt="hex" addr="79" reg_len="2" offset="0">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="79" map="ina219_cfg">
 </params>
 </control>
 <control>
 <name>vbat_shv_reg</name>
 <doc>Raw register value of shv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="79" reg_len="2" offset="1">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="79">
 </params>
 </control>
 <control>
 <name>vbat_busv_reg</name>
 <doc>Raw register value of busv on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="79" reg_len="2" offset="2">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="79">
 </params>
 </control>
 <control>
 <name>vbat_pwr_reg</name>
 <doc>Raw register value of pwr on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="79" reg_len="2" offset="3">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="79">
 </params>
 </control>
 <control>
 <name>vbat_cur_reg</name>
 <doc>Raw register value of cur on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="79" reg_len="2" offset="4">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="79">
 </params>
 </control>
 <control>
 <name>vbat_cal_reg</name>
 <doc>Raw register value of cal on i2c_mux:loc0</doc>
-<params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="79" reg_len="2" offset="5">
+<params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="79">
 </params>
 </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev2.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev2.xml
index 91c3668..76e266f 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev2.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev2.xml
@@ -1,1879 +1,1879 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:44 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:13 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp975_io_mv</name>
     <doc>Bus Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_mw</name>
     <doc>Power of 'pp975_io' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_ma</name>
     <doc>Current of 'pp975_io' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_shuntmv</name>
     <doc>Shunt Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_ez_config</name>
     <doc>Good default config for 'pp975_io' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp975_io" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp975_io" map="on">
     </params>
   </control>
   <control>
     <name>pp975_io_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp975_io_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_mv</name>
     <doc>Bus Voltage of 'pp850_prim_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_mw</name>
     <doc>Power of 'pp850_prim_core' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_ma</name>
     <doc>Current of 'pp850_prim_core' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_shuntmv</name>
     <doc>Shunt Voltage of 'pp850_prim_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_ez_config</name>
     <doc>Good default config for 'pp850_prim_core' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp850_prim_core" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp850_prim_core" map="on">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_mv</name>
     <doc>Bus Voltage of 'pp3300_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_mw</name>
     <doc>Power of 'pp3300_dsw' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ma</name>
     <doc>Current of 'pp3300_dsw' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ez_config</name>
     <doc>Good default config for 'pp3300_dsw' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dsw" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dsw" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_mv</name>
     <doc>Bus Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_mw</name>
     <doc>Power of 'pp3300_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_ma</name>
     <doc>Current of 'pp3300_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_ez_config</name>
     <doc>Good default config for 'pp3300_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="pp3300_a" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_a_mv</name>
     <doc>Bus Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_mw</name>
     <doc>Power of 'pp1800_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_ma</name>
     <doc>Current of 'pp1800_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_ez_config</name>
     <doc>Good default config for 'pp1800_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1800_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_mv</name>
     <doc>Bus Voltage of 'pp1800_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_mw</name>
     <doc>Power of 'pp1800_u' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_ma</name>
     <doc>Current of 'pp1800_u' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_ez_config</name>
     <doc>Good default config for 'pp1800_u' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_u" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1800_u" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_u_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_u_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mv</name>
     <doc>Bus Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mw</name>
     <doc>Power of 'pp1200_vddq' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ma</name>
     <doc>Current of 'pp1200_vddq' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shuntmv</name>
     <doc>Shunt Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ez_config</name>
     <doc>Good default config for 'pp1200_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1200_vddq" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1200_vddq" map="on">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_mv</name>
     <doc>Bus Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_mw</name>
     <doc>Power of 'pp1000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_ma</name>
     <doc>Current of 'pp1000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_ez_config</name>
     <doc>Good default config for 'pp1000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1000_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_h1_mv</name>
     <doc>Bus Voltage of 'pp3300_h1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_mw</name>
     <doc>Power of 'pp3300_h1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_ma</name>
     <doc>Current of 'pp3300_h1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_h1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_ez_config</name>
     <doc>Good default config for 'pp3300_h1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_h1" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_h1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_h1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_h1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mw</name>
     <doc>Power of 'ppvar_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ma</name>
     <doc>Current of 'ppvar_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ez_config</name>
     <doc>Good default config for 'ppvar_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_bl" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.05">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.05" nom="7.7" base_name="ppvar_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_mw</name>
     <doc>Power of 'pp3300_dx_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_ma</name>
     <doc>Current of 'pp3300_dx_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_ez_config</name>
     <doc>Good default config for 'pp3300_dx_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_mw</name>
     <doc>Power of 'pp3300_dx_edp' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_ma</name>
     <doc>Current of 'pp3300_dx_edp' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_ez_config</name>
     <doc>Good default config for 'pp3300_dx_edp' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_touch' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_mw</name>
     <doc>Power of 'pp3300_dx_touch' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_ma</name>
     <doc>Current of 'pp3300_dx_touch' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_touch' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_ez_config</name>
     <doc>Good default config for 'pp3300_dx_touch' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_touch" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_mw</name>
     <doc>Power of 'pp3300_dx_trackpad' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_ma</name>
     <doc>Current of 'pp3300_dx_trackpad' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_ez_config</name>
     <doc>Good default config for 'pp3300_dx_trackpad' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_trackpad" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_mv</name>
     <doc>Bus Voltage of 'pp3300_dsw_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_mw</name>
     <doc>Power of 'pp3300_dsw_ec' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_ma</name>
     <doc>Current of 'pp3300_dsw_ec' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dsw_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_ez_config</name>
     <doc>Good default config for 'pp3300_dsw_ec' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dsw_ec" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_mv</name>
     <doc>Bus Voltage of 'vbat' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_mw</name>
     <doc>Power of 'vbat' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_ma</name>
     <doc>Current of 'vbat' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_shuntmv</name>
     <doc>Shunt Voltage of 'vbat' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_ez_config</name>
     <doc>Good default config for 'vbat' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="vbat" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="vbat" map="on">
     </params>
   </control>
   <control>
     <name>vbat_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>vbat_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_mv</name>
     <doc>Bus Voltage of 'ppvar_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_mw</name>
     <doc>Power of 'ppvar_vcc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_ma</name>
     <doc>Current of 'ppvar_vcc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_ez_config</name>
     <doc>Good default config for 'ppvar_vcc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_vcc" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.0" base_name="ppvar_vcc" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_sa_mv</name>
     <doc>Bus Voltage of 'ppvar_sa' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_mw</name>
     <doc>Power of 'ppvar_sa' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_ma</name>
     <doc>Current of 'ppvar_sa' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sa' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_ez_config</name>
     <doc>Good default config for 'ppvar_sa' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_sa" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.0" base_name="ppvar_sa" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sa_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_sa_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_sa_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_sa_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_sa_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_gt_mv</name>
     <doc>Bus Voltage of 'ppvar_gt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_mw</name>
     <doc>Power of 'ppvar_gt' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_ma</name>
     <doc>Current of 'ppvar_gt' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_gt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_ez_config</name>
     <doc>Good default config for 'ppvar_gt' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_gt" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.0" base_name="ppvar_gt" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_gt_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_gt_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_gt_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_gt_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_gt_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_mv</name>
     <doc>Bus Voltage of 'pp1800_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_mw</name>
     <doc>Power of 'pp1800_dx_trackpad' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_ma</name>
     <doc>Current of 'pp1800_dx_trackpad' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_ez_config</name>
     <doc>Good default config for 'pp1800_dx_trackpad' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_dx_trackpad" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_kb_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mw</name>
     <doc>Power of 'ppvar_kb_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ma</name>
     <doc>Current of 'ppvar_kb_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_kb_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ez_config</name>
     <doc>Good default config for 'ppvar_kb_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_cam' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_mw</name>
     <doc>Power of 'pp3300_dx_cam' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_ma</name>
     <doc>Current of 'pp3300_dx_cam' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_cam' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_ez_config</name>
     <doc>Good default config for 'pp3300_dx_cam' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_cam" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_st_mv</name>
     <doc>Bus Voltage of 'pp1000_st' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_mw</name>
     <doc>Power of 'pp1000_st' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_ma</name>
     <doc>Current of 'pp1000_st' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_st' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_ez_config</name>
     <doc>Good default config for 'pp1000_st' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1000_st" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.0" base_name="pp1000_st" map="on">
     </params>
   </control>
   <control>
     <name>pp1000_st_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1000_st_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_st_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_st_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_st_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_st_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_st_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_st_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_stg_mv</name>
     <doc>Bus Voltage of 'pp1000_stg' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_mw</name>
     <doc>Power of 'pp1000_stg' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_ma</name>
     <doc>Current of 'pp1000_stg' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_stg' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_ez_config</name>
     <doc>Good default config for 'pp1000_stg' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1000_stg" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.5">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="1.0" base_name="pp1000_stg" map="on">
     </params>
   </control>
   <control>
     <name>pp1000_stg_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1000_stg_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_stg_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_stg_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_stg_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_stg_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_stg_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp1000_stg_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="69">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev3.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev3.xml
index 6a2d745..88f082c 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev3.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev3.xml
@@ -1,2269 +1,2269 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:50 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:20 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp975_io_mv</name>
     <doc>Bus Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_mw</name>
     <doc>Power of 'pp975_io' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_ma</name>
     <doc>Current of 'pp975_io' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_shuntmv</name>
     <doc>Shunt Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_ez_config</name>
     <doc>Good default config for 'pp975_io' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp975_io" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp975_io" map="on">
     </params>
   </control>
   <control>
     <name>pp975_io_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp975_io_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_mv</name>
     <doc>Bus Voltage of 'pp850_prim_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_mw</name>
     <doc>Power of 'pp850_prim_core' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_ma</name>
     <doc>Current of 'pp850_prim_core' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_shuntmv</name>
     <doc>Shunt Voltage of 'pp850_prim_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_ez_config</name>
     <doc>Good default config for 'pp850_prim_core' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp850_prim_core" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp850_prim_core" map="on">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_mv</name>
     <doc>Bus Voltage of 'pp3300_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_mw</name>
     <doc>Power of 'pp3300_dsw' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ma</name>
     <doc>Current of 'pp3300_dsw' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ez_config</name>
     <doc>Good default config for 'pp3300_dsw' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dsw" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dsw" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_mv</name>
     <doc>Bus Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_mw</name>
     <doc>Power of 'pp3300_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_ma</name>
     <doc>Current of 'pp3300_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_ez_config</name>
     <doc>Good default config for 'pp3300_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="pp3300_a" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_a_mv</name>
     <doc>Bus Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_mw</name>
     <doc>Power of 'pp1800_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_ma</name>
     <doc>Current of 'pp1800_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_ez_config</name>
     <doc>Good default config for 'pp1800_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1800_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_mv</name>
     <doc>Bus Voltage of 'pp1800_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_mw</name>
     <doc>Power of 'pp1800_u' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_ma</name>
     <doc>Current of 'pp1800_u' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_ez_config</name>
     <doc>Good default config for 'pp1800_u' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_u" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1800_u" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_u_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_u_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mv</name>
     <doc>Bus Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mw</name>
     <doc>Power of 'pp1200_vddq' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ma</name>
     <doc>Current of 'pp1200_vddq' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shuntmv</name>
     <doc>Shunt Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ez_config</name>
     <doc>Good default config for 'pp1200_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1200_vddq" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1200_vddq" map="on">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_mv</name>
     <doc>Bus Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_mw</name>
     <doc>Power of 'pp1000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_ma</name>
     <doc>Current of 'pp1000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_ez_config</name>
     <doc>Good default config for 'pp1000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1000_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_h1_mv</name>
     <doc>Bus Voltage of 'pp3300_h1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_mw</name>
     <doc>Power of 'pp3300_h1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_ma</name>
     <doc>Current of 'pp3300_h1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_h1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_ez_config</name>
     <doc>Good default config for 'pp3300_h1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_h1" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_h1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_h1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_h1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mw</name>
     <doc>Power of 'ppvar_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ma</name>
     <doc>Current of 'ppvar_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ez_config</name>
     <doc>Good default config for 'ppvar_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_bl" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.05">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.05" nom="7.7" base_name="ppvar_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_mw</name>
     <doc>Power of 'pp3300_dx_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_ma</name>
     <doc>Current of 'pp3300_dx_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_ez_config</name>
     <doc>Good default config for 'pp3300_dx_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_mw</name>
     <doc>Power of 'pp3300_dx_edp' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_ma</name>
     <doc>Current of 'pp3300_dx_edp' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_ez_config</name>
     <doc>Good default config for 'pp3300_dx_edp' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_touch' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_mw</name>
     <doc>Power of 'pp3300_dx_touch' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_ma</name>
     <doc>Current of 'pp3300_dx_touch' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_touch' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_ez_config</name>
     <doc>Good default config for 'pp3300_dx_touch' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_touch" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_mw</name>
     <doc>Power of 'pp3300_dx_trackpad' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_ma</name>
     <doc>Current of 'pp3300_dx_trackpad' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_ez_config</name>
     <doc>Good default config for 'pp3300_dx_trackpad' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_trackpad" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_mv</name>
     <doc>Bus Voltage of 'pp3300_dsw_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_mw</name>
     <doc>Power of 'pp3300_dsw_ec' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_ma</name>
     <doc>Current of 'pp3300_dsw_ec' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dsw_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_ez_config</name>
     <doc>Good default config for 'pp3300_dsw_ec' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dsw_ec" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_mv</name>
     <doc>Bus Voltage of 'vbat' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_mw</name>
     <doc>Power of 'vbat' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_ma</name>
     <doc>Current of 'vbat' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_shuntmv</name>
     <doc>Shunt Voltage of 'vbat' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_ez_config</name>
     <doc>Good default config for 'vbat' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="vbat" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="vbat" map="on">
     </params>
   </control>
   <control>
     <name>vbat_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>vbat_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_mv</name>
     <doc>Bus Voltage of 'ppvar_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_mw</name>
     <doc>Power of 'ppvar_vcc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_ma</name>
     <doc>Current of 'ppvar_vcc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_ez_config</name>
     <doc>Good default config for 'ppvar_vcc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_vcc" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.0" base_name="ppvar_vcc" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="72" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_mv</name>
     <doc>Bus Voltage of 'ppvar_sa' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_mw</name>
     <doc>Power of 'ppvar_sa' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_ma</name>
     <doc>Current of 'ppvar_sa' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sa' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_ez_config</name>
     <doc>Good default config for 'ppvar_sa' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_sa" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.0" base_name="ppvar_sa" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="72" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sa_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_mv</name>
     <doc>Bus Voltage of 'ppvar_gt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_mw</name>
     <doc>Power of 'ppvar_gt' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_ma</name>
     <doc>Current of 'ppvar_gt' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_gt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_ez_config</name>
     <doc>Good default config for 'ppvar_gt' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_gt" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.0" base_name="ppvar_gt" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="72" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_gt_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_mv</name>
     <doc>Bus Voltage of 'pp1800_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_mw</name>
     <doc>Power of 'pp1800_dx_trackpad' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_ma</name>
     <doc>Current of 'pp1800_dx_trackpad' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_ez_config</name>
     <doc>Good default config for 'pp1800_dx_trackpad' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_dx_trackpad" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="72" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_kb_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mw</name>
     <doc>Power of 'ppvar_kb_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ma</name>
     <doc>Current of 'ppvar_kb_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_kb_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ez_config</name>
     <doc>Good default config for 'ppvar_kb_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="73" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_cam' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_mw</name>
     <doc>Power of 'pp3300_dx_cam' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_ma</name>
     <doc>Current of 'pp3300_dx_cam' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_cam' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_ez_config</name>
     <doc>Good default config for 'pp3300_dx_cam' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_cam" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="73" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_mv</name>
     <doc>Bus Voltage of 'pp1000_st' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_mw</name>
     <doc>Power of 'pp1000_st' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_ma</name>
     <doc>Current of 'pp1000_st' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_st' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_ez_config</name>
     <doc>Good default config for 'pp1000_st' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1000_st" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.0" base_name="pp1000_st" map="on">
     </params>
   </control>
   <control>
     <name>pp1000_st_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="73" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1000_st_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_mv</name>
     <doc>Bus Voltage of 'pp1000_stg' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_mw</name>
     <doc>Power of 'pp1000_stg' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_ma</name>
     <doc>Current of 'pp1000_stg' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_stg' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_ez_config</name>
     <doc>Good default config for 'pp1000_stg' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1000_stg" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.5">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="1.0" base_name="pp1000_stg" map="on">
     </params>
   </control>
   <control>
     <name>pp1000_stg_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="73" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1000_stg_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp5000_a_mv</name>
     <doc>Bus Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_mw</name>
     <doc>Power of 'pp5000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ma</name>
     <doc>Current of 'pp5000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ez_config</name>
     <doc>Good default config for 'pp5000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp5000_a" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="74" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_mv</name>
     <doc>Bus Voltage of 'ppvar_nvme' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.2" base_name="ppvar_nvme">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_nvme" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_mw</name>
     <doc>Power of 'ppvar_nvme' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.2" base_name="ppvar_nvme">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_nvme" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_ma</name>
     <doc>Current of 'ppvar_nvme' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.2" base_name="ppvar_nvme">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_nvme" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_nvme' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.2" base_name="ppvar_nvme">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_nvme" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_ez_config</name>
     <doc>Good default config for 'ppvar_nvme' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_nvme" tags="adc_ez_config_ctrls" nom="1.2" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.2" base_name="ppvar_nvme" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="74" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_mv</name>
     <doc>Bus Voltage of 'pp1800_dsw_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_dsw_ec" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_mw</name>
     <doc>Power of 'pp1800_dsw_ec' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_dsw_ec" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_ma</name>
     <doc>Current of 'pp1800_dsw_ec' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_dsw_ec" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_dsw_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_dsw_ec" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_ez_config</name>
     <doc>Good default config for 'pp1800_dsw_ec' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_dsw_ec" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_dsw_ec" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="74" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_mv</name>
     <doc>Bus Voltage of 'pp1200_pll_oc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.2" base_name="pp1200_pll_oc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_pll_oc" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_mw</name>
     <doc>Power of 'pp1200_pll_oc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.2" base_name="pp1200_pll_oc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1200_pll_oc" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_ma</name>
     <doc>Current of 'pp1200_pll_oc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.2" base_name="pp1200_pll_oc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1200_pll_oc" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_shuntmv</name>
     <doc>Shunt Voltage of 'pp1200_pll_oc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.2" base_name="pp1200_pll_oc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_pll_oc" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_ez_config</name>
     <doc>Good default config for 'pp1200_pll_oc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1200_pll_oc" tags="adc_ez_config_ctrls" nom="1.2" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.2" base_name="pp1200_pll_oc" map="on">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="74" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_mv</name>
     <doc>Bus Voltage of 'pp1800_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_dsw" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_mw</name>
     <doc>Power of 'pp1800_dsw' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_dsw" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ma</name>
     <doc>Current of 'pp1800_dsw' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_dsw" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_dsw" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ez_config</name>
     <doc>Good default config for 'pp1800_dsw' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_dsw" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_dsw" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="75" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="75">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev4.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev4.xml
index 6a2d745..88f082c 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev4.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev4.xml
@@ -1,2269 +1,2269 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:50 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:20 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp975_io_mv</name>
     <doc>Bus Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_mw</name>
     <doc>Power of 'pp975_io' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_ma</name>
     <doc>Current of 'pp975_io' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_shuntmv</name>
     <doc>Shunt Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_ez_config</name>
     <doc>Good default config for 'pp975_io' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp975_io" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp975_io" map="on">
     </params>
   </control>
   <control>
     <name>pp975_io_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp975_io_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_mv</name>
     <doc>Bus Voltage of 'pp850_prim_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_mw</name>
     <doc>Power of 'pp850_prim_core' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_ma</name>
     <doc>Current of 'pp850_prim_core' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_shuntmv</name>
     <doc>Shunt Voltage of 'pp850_prim_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_ez_config</name>
     <doc>Good default config for 'pp850_prim_core' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp850_prim_core" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp850_prim_core" map="on">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_mv</name>
     <doc>Bus Voltage of 'pp3300_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_mw</name>
     <doc>Power of 'pp3300_dsw' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ma</name>
     <doc>Current of 'pp3300_dsw' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ez_config</name>
     <doc>Good default config for 'pp3300_dsw' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dsw" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dsw" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_mv</name>
     <doc>Bus Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_mw</name>
     <doc>Power of 'pp3300_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_ma</name>
     <doc>Current of 'pp3300_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_ez_config</name>
     <doc>Good default config for 'pp3300_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="pp3300_a" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_a_mv</name>
     <doc>Bus Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_mw</name>
     <doc>Power of 'pp1800_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_ma</name>
     <doc>Current of 'pp1800_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_ez_config</name>
     <doc>Good default config for 'pp1800_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1800_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_mv</name>
     <doc>Bus Voltage of 'pp1800_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_mw</name>
     <doc>Power of 'pp1800_u' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_ma</name>
     <doc>Current of 'pp1800_u' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_ez_config</name>
     <doc>Good default config for 'pp1800_u' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_u" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1800_u" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_u_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_u_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mv</name>
     <doc>Bus Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mw</name>
     <doc>Power of 'pp1200_vddq' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ma</name>
     <doc>Current of 'pp1200_vddq' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shuntmv</name>
     <doc>Shunt Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ez_config</name>
     <doc>Good default config for 'pp1200_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1200_vddq" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1200_vddq" map="on">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_mv</name>
     <doc>Bus Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_mw</name>
     <doc>Power of 'pp1000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_ma</name>
     <doc>Current of 'pp1000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_ez_config</name>
     <doc>Good default config for 'pp1000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1000_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_h1_mv</name>
     <doc>Bus Voltage of 'pp3300_h1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_mw</name>
     <doc>Power of 'pp3300_h1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_ma</name>
     <doc>Current of 'pp3300_h1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_h1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_h1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_h1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_h1_ez_config</name>
     <doc>Good default config for 'pp3300_h1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_h1" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_h1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_h1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_h1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_h1_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mw</name>
     <doc>Power of 'ppvar_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ma</name>
     <doc>Current of 'ppvar_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ez_config</name>
     <doc>Good default config for 'ppvar_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_bl" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.05">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.05" nom="7.7" base_name="ppvar_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_bl_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_mw</name>
     <doc>Power of 'pp3300_dx_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_ma</name>
     <doc>Current of 'pp3300_dx_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_ez_config</name>
     <doc>Good default config for 'pp3300_dx_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_mw</name>
     <doc>Power of 'pp3300_dx_edp' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_ma</name>
     <doc>Current of 'pp3300_dx_edp' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_ez_config</name>
     <doc>Good default config for 'pp3300_dx_edp' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_touch' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_mw</name>
     <doc>Power of 'pp3300_dx_touch' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_ma</name>
     <doc>Current of 'pp3300_dx_touch' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_touch' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_touch" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_ez_config</name>
     <doc>Good default config for 'pp3300_dx_touch' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_touch" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dx_touch" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_touch_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_mw</name>
     <doc>Power of 'pp3300_dx_trackpad' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_ma</name>
     <doc>Current of 'pp3300_dx_trackpad' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_trackpad" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_ez_config</name>
     <doc>Good default config for 'pp3300_dx_trackpad' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_trackpad" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dx_trackpad" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dx_trackpad_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_mv</name>
     <doc>Bus Voltage of 'pp3300_dsw_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_mw</name>
     <doc>Power of 'pp3300_dsw_ec' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_ma</name>
     <doc>Current of 'pp3300_dsw_ec' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dsw_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dsw_ec" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_ez_config</name>
     <doc>Good default config for 'pp3300_dsw_ec' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dsw_ec" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dsw_ec" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ec_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_mv</name>
     <doc>Bus Voltage of 'vbat' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_mw</name>
     <doc>Power of 'vbat' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_ma</name>
     <doc>Current of 'vbat' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_shuntmv</name>
     <doc>Shunt Voltage of 'vbat' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_ez_config</name>
     <doc>Good default config for 'vbat' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="vbat" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="vbat" map="on">
     </params>
   </control>
   <control>
     <name>vbat_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>vbat_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>vbat_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_mv</name>
     <doc>Bus Voltage of 'ppvar_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_mw</name>
     <doc>Power of 'ppvar_vcc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_ma</name>
     <doc>Current of 'ppvar_vcc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_ez_config</name>
     <doc>Good default config for 'ppvar_vcc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_vcc" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.0" base_name="ppvar_vcc" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="72" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_mv</name>
     <doc>Bus Voltage of 'ppvar_sa' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_mw</name>
     <doc>Power of 'ppvar_sa' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_ma</name>
     <doc>Current of 'ppvar_sa' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sa' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_ez_config</name>
     <doc>Good default config for 'ppvar_sa' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_sa" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.0" base_name="ppvar_sa" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="72" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sa_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_sa_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_mv</name>
     <doc>Bus Voltage of 'ppvar_gt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_mw</name>
     <doc>Power of 'ppvar_gt' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_ma</name>
     <doc>Current of 'ppvar_gt' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_gt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_ez_config</name>
     <doc>Good default config for 'ppvar_gt' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_gt" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.0" base_name="ppvar_gt" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="72" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_gt_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_gt_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_mv</name>
     <doc>Bus Voltage of 'pp1800_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_mw</name>
     <doc>Power of 'pp1800_dx_trackpad' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_ma</name>
     <doc>Current of 'pp1800_dx_trackpad' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_dx_trackpad' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_dx_trackpad" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_ez_config</name>
     <doc>Good default config for 'pp1800_dx_trackpad' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_dx_trackpad" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_dx_trackpad" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="72" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>pp1800_dx_trackpad_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="72" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="72">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_kb_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mw</name>
     <doc>Power of 'ppvar_kb_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ma</name>
     <doc>Current of 'ppvar_kb_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_kb_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ez_config</name>
     <doc>Good default config for 'ppvar_kb_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="ppvar_kb_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="73" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_cam' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_mw</name>
     <doc>Power of 'pp3300_dx_cam' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_ma</name>
     <doc>Current of 'pp3300_dx_cam' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_cam' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_cam" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_ez_config</name>
     <doc>Good default config for 'pp3300_dx_cam' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_cam" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_dx_cam" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="73" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp3300_dx_cam_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_mv</name>
     <doc>Bus Voltage of 'pp1000_st' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_mw</name>
     <doc>Power of 'pp1000_st' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_ma</name>
     <doc>Current of 'pp1000_st' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_st' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.0" base_name="pp1000_st">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_st" rsense="0.1" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_st_ez_config</name>
     <doc>Good default config for 'pp1000_st' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1000_st" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.0" base_name="pp1000_st" map="on">
     </params>
   </control>
   <control>
     <name>pp1000_st_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="73" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1000_st_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_st_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_mv</name>
     <doc>Bus Voltage of 'pp1000_stg' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_mw</name>
     <doc>Power of 'pp1000_stg' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_ma</name>
     <doc>Current of 'pp1000_stg' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_stg' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.5" nom="1.0" base_name="pp1000_stg">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_stg" rsense="0.5" nom="1.0">
     </params>
   </control>
   <control>
     <name>pp1000_stg_ez_config</name>
     <doc>Good default config for 'pp1000_stg' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1000_stg" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.5">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="1.0" base_name="pp1000_stg" map="on">
     </params>
   </control>
   <control>
     <name>pp1000_stg_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="73" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1000_stg_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp1000_stg_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="73" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="73">
     </params>
   </control>
   <control>
     <name>pp5000_a_mv</name>
     <doc>Bus Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_mw</name>
     <doc>Power of 'pp5000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ma</name>
     <doc>Current of 'pp5000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_a" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ez_config</name>
     <doc>Good default config for 'pp5000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp5000_a" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="74" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp5000_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_mv</name>
     <doc>Bus Voltage of 'ppvar_nvme' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.2" base_name="ppvar_nvme">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_nvme" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_mw</name>
     <doc>Power of 'ppvar_nvme' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.2" base_name="ppvar_nvme">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_nvme" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_ma</name>
     <doc>Current of 'ppvar_nvme' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.2" base_name="ppvar_nvme">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_nvme" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_nvme' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.2" base_name="ppvar_nvme">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_nvme" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_ez_config</name>
     <doc>Good default config for 'ppvar_nvme' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_nvme" tags="adc_ez_config_ctrls" nom="1.2" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.2" base_name="ppvar_nvme" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="74" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>ppvar_nvme_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_mv</name>
     <doc>Bus Voltage of 'pp1800_dsw_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_dsw_ec" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_mw</name>
     <doc>Power of 'pp1800_dsw_ec' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_dsw_ec" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_ma</name>
     <doc>Current of 'pp1800_dsw_ec' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_dsw_ec" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_dsw_ec' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw_ec">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_dsw_ec" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_ez_config</name>
     <doc>Good default config for 'pp1800_dsw_ec' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_dsw_ec" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_dsw_ec" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="74" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ec_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_mv</name>
     <doc>Bus Voltage of 'pp1200_pll_oc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.2" base_name="pp1200_pll_oc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_pll_oc" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_mw</name>
     <doc>Power of 'pp1200_pll_oc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.2" base_name="pp1200_pll_oc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1200_pll_oc" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_ma</name>
     <doc>Current of 'pp1200_pll_oc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.2" base_name="pp1200_pll_oc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1200_pll_oc" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_shuntmv</name>
     <doc>Shunt Voltage of 'pp1200_pll_oc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.2" base_name="pp1200_pll_oc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_pll_oc" rsense="0.1" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_ez_config</name>
     <doc>Good default config for 'pp1200_pll_oc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1200_pll_oc" tags="adc_ez_config_ctrls" nom="1.2" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.2" base_name="pp1200_pll_oc" map="on">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="74" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1200_pll_oc_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="74" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="74">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_mv</name>
     <doc>Bus Voltage of 'pp1800_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_dsw" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_mw</name>
     <doc>Power of 'pp1800_dsw' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_dsw" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ma</name>
     <doc>Current of 'pp1800_dsw' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_dsw" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_dsw" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_ez_config</name>
     <doc>Good default config for 'pp1800_dsw' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_dsw" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_dsw" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="75" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="75">
     </params>
   </control>
   <control>
     <name>pp1800_dsw_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="75" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="75">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev5.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev5.xml
index c7828f2..c28d625 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev5.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev5.xml
@@ -1,1177 +1,1177 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:56 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:26 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp975_io_mv</name>
     <doc>Bus Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_mw</name>
     <doc>Power of 'pp975_io' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_ma</name>
     <doc>Current of 'pp975_io' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_shuntmv</name>
     <doc>Shunt Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_ez_config</name>
     <doc>Good default config for 'pp975_io' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp975_io" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp975_io" map="on">
     </params>
   </control>
   <control>
     <name>pp975_io_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp975_io_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_mv</name>
     <doc>Bus Voltage of 'pp850_prim_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_mw</name>
     <doc>Power of 'pp850_prim_core' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_ma</name>
     <doc>Current of 'pp850_prim_core' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_shuntmv</name>
     <doc>Shunt Voltage of 'pp850_prim_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_ez_config</name>
     <doc>Good default config for 'pp850_prim_core' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp850_prim_core" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp850_prim_core" map="on">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_mv</name>
     <doc>Bus Voltage of 'pp3300_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_mw</name>
     <doc>Power of 'pp3300_dsw' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ma</name>
     <doc>Current of 'pp3300_dsw' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ez_config</name>
     <doc>Good default config for 'pp3300_dsw' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dsw" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dsw" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_mv</name>
     <doc>Bus Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_mw</name>
     <doc>Power of 'pp3300_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_ma</name>
     <doc>Current of 'pp3300_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_ez_config</name>
     <doc>Good default config for 'pp3300_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="pp3300_a" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_a_mv</name>
     <doc>Bus Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_mw</name>
     <doc>Power of 'pp1800_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_ma</name>
     <doc>Current of 'pp1800_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_ez_config</name>
     <doc>Good default config for 'pp1800_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1800_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_mv</name>
     <doc>Bus Voltage of 'pp1800_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_mw</name>
     <doc>Power of 'pp1800_u' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_ma</name>
     <doc>Current of 'pp1800_u' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_ez_config</name>
     <doc>Good default config for 'pp1800_u' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_u" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1800_u" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_u_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_u_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mv</name>
     <doc>Bus Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mw</name>
     <doc>Power of 'pp1200_vddq' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ma</name>
     <doc>Current of 'pp1200_vddq' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shuntmv</name>
     <doc>Shunt Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ez_config</name>
     <doc>Good default config for 'pp1200_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1200_vddq" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1200_vddq" map="on">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_mv</name>
     <doc>Bus Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_mw</name>
     <doc>Power of 'pp1000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_ma</name>
     <doc>Current of 'pp1000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_ez_config</name>
     <doc>Good default config for 'pp1000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1000_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_mw</name>
     <doc>Power of 'pp3300_dx_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_ma</name>
     <doc>Current of 'pp3300_dx_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_ez_config</name>
     <doc>Good default config for 'pp3300_dx_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_mw</name>
     <doc>Power of 'pp3300_dx_edp' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_ma</name>
     <doc>Current of 'pp3300_dx_edp' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_ez_config</name>
     <doc>Good default config for 'pp3300_dx_edp' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_mv</name>
     <doc>Bus Voltage of 'vbat' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_mw</name>
     <doc>Power of 'vbat' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_ma</name>
     <doc>Current of 'vbat' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_shuntmv</name>
     <doc>Shunt Voltage of 'vbat' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_ez_config</name>
     <doc>Good default config for 'vbat' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="vbat" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="vbat" map="on">
     </params>
   </control>
   <control>
     <name>vbat_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>vbat_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_mv</name>
     <doc>Bus Voltage of 'ppvar_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_mw</name>
     <doc>Power of 'ppvar_vcc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_ma</name>
     <doc>Current of 'ppvar_vcc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vcc" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_ez_config</name>
     <doc>Good default config for 'ppvar_vcc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_vcc" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.0" base_name="ppvar_vcc" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sa_mv</name>
     <doc>Bus Voltage of 'ppvar_sa' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_mw</name>
     <doc>Power of 'ppvar_sa' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_ma</name>
     <doc>Current of 'ppvar_sa' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sa' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_ez_config</name>
     <doc>Good default config for 'ppvar_sa' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_sa" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.0" base_name="ppvar_sa" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sa_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_mv</name>
     <doc>Bus Voltage of 'ppvar_gt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_mw</name>
     <doc>Power of 'ppvar_gt' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_ma</name>
     <doc>Current of 'ppvar_gt' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_gt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_gt" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_ez_config</name>
     <doc>Good default config for 'ppvar_gt' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_gt" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.0" base_name="ppvar_gt" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_gt_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j4</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mw</name>
     <doc>Power of 'ppvar_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ma</name>
     <doc>Current of 'ppvar_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ez_config</name>
     <doc>Good default config for 'ppvar_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_bl" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.05">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.05" nom="7.7" base_name="ppvar_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev6.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev6.xml
index a0fa02b..191e0ed 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev6.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/atlas_rev6.xml
@@ -1,1255 +1,1255 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:46 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:14 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp975_io_mv</name>
     <doc>Bus Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_mw</name>
     <doc>Power of 'pp975_io' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_ma</name>
     <doc>Current of 'pp975_io' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_shuntmv</name>
     <doc>Shunt Voltage of 'pp975_io' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp975_io">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp975_io" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp975_io_ez_config</name>
     <doc>Good default config for 'pp975_io' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp975_io" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp975_io" map="on">
     </params>
   </control>
   <control>
     <name>pp975_io_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp975_io_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp975_io_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_mv</name>
     <doc>Bus Voltage of 'pp850_prim_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_mw</name>
     <doc>Power of 'pp850_prim_core' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_ma</name>
     <doc>Current of 'pp850_prim_core' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_shuntmv</name>
     <doc>Shunt Voltage of 'pp850_prim_core' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp850_prim_core">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp850_prim_core" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_ez_config</name>
     <doc>Good default config for 'pp850_prim_core' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp850_prim_core" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp850_prim_core" map="on">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp850_prim_core_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_mv</name>
     <doc>Bus Voltage of 'pp3300_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_mw</name>
     <doc>Power of 'pp3300_dsw' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ma</name>
     <doc>Current of 'pp3300_dsw' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dsw' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dsw">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dsw" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_ez_config</name>
     <doc>Good default config for 'pp3300_dsw' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dsw" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dsw" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_dsw_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_mv</name>
     <doc>Bus Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_mw</name>
     <doc>Power of 'pp3300_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_ma</name>
     <doc>Current of 'pp3300_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_a" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp3300_a_ez_config</name>
     <doc>Good default config for 'pp3300_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="pp3300_a" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_a_mv</name>
     <doc>Bus Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_mw</name>
     <doc>Power of 'pp1800_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_ma</name>
     <doc>Current of 'pp1800_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_a_ez_config</name>
     <doc>Good default config for 'pp1800_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1800_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_mv</name>
     <doc>Bus Voltage of 'pp1800_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_mw</name>
     <doc>Power of 'pp1800_u' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_ma</name>
     <doc>Current of 'pp1800_u' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_u' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1800_u">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_u" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1800_u_ez_config</name>
     <doc>Good default config for 'pp1800_u' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_u" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1800_u" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_u_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_u_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_u_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mv</name>
     <doc>Bus Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mw</name>
     <doc>Power of 'pp1200_vddq' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ma</name>
     <doc>Current of 'pp1200_vddq' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shuntmv</name>
     <doc>Shunt Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_vddq" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ez_config</name>
     <doc>Good default config for 'pp1200_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1200_vddq" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1200_vddq" map="on">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_mv</name>
     <doc>Bus Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_mw</name>
     <doc>Power of 'pp1000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_ma</name>
     <doc>Current of 'pp1000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="pp1000_a">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1000_a" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>pp1000_a_ez_config</name>
     <doc>Good default config for 'pp1000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1000_a" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="pp1000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1000_a_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_mw</name>
     <doc>Power of 'pp3300_dx_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_ma</name>
     <doc>Current of 'pp3300_dx_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_wlan" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_ez_config</name>
     <doc>Good default config for 'pp3300_dx_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_wlan" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_wlan_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_mv</name>
     <doc>Bus Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_mw</name>
     <doc>Power of 'pp3300_dx_edp' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_ma</name>
     <doc>Current of 'pp3300_dx_edp' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_dx_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_dx_edp" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_ez_config</name>
     <doc>Good default config for 'pp3300_dx_edp' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_dx_edp" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_dx_edp" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_dx_edp_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_mv</name>
     <doc>Bus Voltage of 'vbat' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_mw</name>
     <doc>Power of 'vbat' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_ma</name>
     <doc>Current of 'vbat' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_shuntmv</name>
     <doc>Shunt Voltage of 'vbat' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="vbat" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_ez_config</name>
     <doc>Good default config for 'vbat' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="vbat" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="vbat" map="on">
     </params>
   </control>
   <control>
     <name>vbat_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>vbat_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>vbat_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_mv</name>
     <doc>Bus Voltage of 'ppvar_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.003" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vcc" rsense="0.003" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_mw</name>
     <doc>Power of 'ppvar_vcc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.003" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vcc" rsense="0.003" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_ma</name>
     <doc>Current of 'ppvar_vcc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.003" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vcc" rsense="0.003" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vcc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.003" nom="1.0" base_name="ppvar_vcc">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vcc" rsense="0.003" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_ez_config</name>
     <doc>Good default config for 'ppvar_vcc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_vcc" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.003">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.003" nom="1.0" base_name="ppvar_vcc" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vcc_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_sa_mv</name>
     <doc>Bus Voltage of 'ppvar_sa' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_mw</name>
     <doc>Power of 'ppvar_sa' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_ma</name>
     <doc>Current of 'ppvar_sa' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sa' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.0" base_name="ppvar_sa">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sa" rsense="0.005" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_sa_ez_config</name>
     <doc>Good default config for 'ppvar_sa' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_sa" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.0" base_name="ppvar_sa" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sa_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_sa_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_mv</name>
     <doc>Bus Voltage of 'ppvar_gt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.003" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_gt" rsense="0.003" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_mw</name>
     <doc>Power of 'ppvar_gt' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.003" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_gt" rsense="0.003" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_ma</name>
     <doc>Current of 'ppvar_gt' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.003" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_gt" rsense="0.003" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_gt' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.003" nom="1.0" base_name="ppvar_gt">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_gt" rsense="0.003" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_gt_ez_config</name>
     <doc>Good default config for 'ppvar_gt' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_gt" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.003">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.003" nom="1.0" base_name="ppvar_gt" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_gt_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_gt_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_mw</name>
     <doc>Power of 'ppvar_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ma</name>
     <doc>Current of 'ppvar_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.05" nom="7.7" base_name="ppvar_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_bl" rsense="0.05" nom="7.7">
     </params>
   </control>
   <control>
     <name>ppvar_bl_ez_config</name>
     <doc>Good default config for 'ppvar_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_bl" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.05">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.05" nom="7.7" base_name="ppvar_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_bl_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_mv</name>
     <doc>Bus Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="15.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="15.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_mw</name>
     <doc>Power of 'ppvar_vbus_in' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="15.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="15.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ma</name>
     <doc>Current of 'ppvar_vbus_in' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="15.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="15.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="15.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vbus_in" rsense="0.02" nom="15.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ez_config</name>
     <doc>Good default config for 'ppvar_vbus_in' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls" nom="15.0" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="15.0" base_name="ppvar_vbus_in" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/batt_loc.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/batt_loc.xml
index 3ad2f78..18f748e 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/batt_loc.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/batt_loc.xml
@@ -1,163 +1,163 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:48 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:16 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>vbat_100mohm_mv</name>
     <doc>Bus Voltage of 'vbat_100mohm' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="7.7" base_name="vbat_100mohm">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="vbat_100mohm" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_mw</name>
     <doc>Power of 'vbat_100mohm' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="7.7" base_name="vbat_100mohm">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="vbat_100mohm" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_ma</name>
     <doc>Current of 'vbat_100mohm' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="7.7" base_name="vbat_100mohm">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="vbat_100mohm" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_shuntmv</name>
     <doc>Shunt Voltage of 'vbat_100mohm' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="7.7" base_name="vbat_100mohm">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="vbat_100mohm" rsense="0.1" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_ez_config</name>
     <doc>Good default config for 'vbat_100mohm' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="vbat_100mohm" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="7.7" base_name="vbat_100mohm" map="on">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_100mohm_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_mv</name>
     <doc>Bus Voltage of 'vbat_010mohm' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat_010mohm">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="vbat_010mohm" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_mw</name>
     <doc>Power of 'vbat_010mohm' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="7.7" base_name="vbat_010mohm">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="vbat_010mohm" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_ma</name>
     <doc>Current of 'vbat_010mohm' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="7.7" base_name="vbat_010mohm">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="vbat_010mohm" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_shuntmv</name>
     <doc>Shunt Voltage of 'vbat_010mohm' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="7.7" base_name="vbat_010mohm">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="vbat_010mohm" rsense="0.01" nom="7.7">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_ez_config</name>
     <doc>Good default config for 'vbat_010mohm' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="vbat_010mohm" tags="adc_ez_config_ctrls" nom="7.7" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="7.7" base_name="vbat_010mohm" map="on">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>vbat_010mohm_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brask_rev0.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brask_rev0.xml
index 29cc4c3..7a618c3 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brask_rev0.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brask_rev0.xml
@@ -1,601 +1,601 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:48 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:16 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp1800_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_mw</name>
     <doc>Power of 'pp1800_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ma</name>
     <doc>Current of 'pp1800_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ez_config</name>
     <doc>Good default config for 'pp1800_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp1800_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1200_dram_mv</name>
     <doc>Bus Voltage of 'pp1200_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.2" base_name="pp1200_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_dram" rsense="0.002" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_dram_mw</name>
     <doc>Power of 'pp1200_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.2" base_name="pp1200_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp1200_dram" rsense="0.002" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_dram_ma</name>
     <doc>Current of 'pp1200_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.2" base_name="pp1200_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp1200_dram" rsense="0.002" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_dram_shuntmv</name>
     <doc>Shunt Voltage of 'pp1200_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.2" base_name="pp1200_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_dram" rsense="0.002" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_dram_ez_config</name>
     <doc>Good default config for 'pp1200_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp1200_dram" tags="adc_ez_config_ctrls" nom="1.2" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.2" base_name="pp1200_dram" map="on">
     </params>
   </control>
   <control>
     <name>pp1200_dram_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1200_dram_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1200_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1200_dram_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp2500_dram_mv</name>
     <doc>Bus Voltage of 'pp2500_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="2.5" base_name="pp2500_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp2500_dram" rsense="0.01" nom="2.5">
     </params>
   </control>
   <control>
     <name>pp2500_dram_mw</name>
     <doc>Power of 'pp2500_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="2.5" base_name="pp2500_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp2500_dram" rsense="0.01" nom="2.5">
     </params>
   </control>
   <control>
     <name>pp2500_dram_ma</name>
     <doc>Current of 'pp2500_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="2.5" base_name="pp2500_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp2500_dram" rsense="0.01" nom="2.5">
     </params>
   </control>
   <control>
     <name>pp2500_dram_shuntmv</name>
     <doc>Shunt Voltage of 'pp2500_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="2.5" base_name="pp2500_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp2500_dram" rsense="0.01" nom="2.5">
     </params>
   </control>
   <control>
     <name>pp2500_dram_ez_config</name>
     <doc>Good default config for 'pp2500_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp2500_dram" tags="adc_ez_config_ctrls" nom="2.5" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="2.5" base_name="pp2500_dram" map="on">
     </params>
   </control>
   <control>
     <name>pp2500_dram_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp2500_dram_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp2500_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp2500_dram_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_sys_qi_mv</name>
     <doc>Bus Voltage of 'ppvar_sys_qi' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="20.0" base_name="ppvar_sys_qi">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys_qi" rsense="0.01" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_qi_mw</name>
     <doc>Power of 'ppvar_sys_qi' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="20.0" base_name="ppvar_sys_qi">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys_qi" rsense="0.01" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_qi_ma</name>
     <doc>Current of 'ppvar_sys_qi' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="20.0" base_name="ppvar_sys_qi">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sys_qi" rsense="0.01" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_qi_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sys_qi' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="20.0" base_name="ppvar_sys_qi">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sys_qi" rsense="0.01" nom="20.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_qi_ez_config</name>
     <doc>Good default config for 'ppvar_sys_qi' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="ppvar_sys_qi" tags="adc_ez_config_ctrls" nom="20.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="20.0" base_name="ppvar_sys_qi" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sys_qi_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sys_qi_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_sys_qi_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_sys_qi_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_mv</name>
     <doc>Bus Voltage of 'pp3300_ssd_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_mw</name>
     <doc>Power of 'pp3300_ssd_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ma</name>
     <doc>Current of 'pp3300_ssd_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ssd_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ez_config</name>
     <doc>Good default config for 'pp3300_ssd_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp3300_ssd_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_s5_mv</name>
     <doc>Bus Voltage of 'pp5000_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="5.0" base_name="pp5000_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_s5" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_s5_mw</name>
     <doc>Power of 'pp5000_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="5.0" base_name="pp5000_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_s5" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_s5_ma</name>
     <doc>Current of 'pp5000_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="5.0" base_name="pp5000_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_s5" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="5.0" base_name="pp5000_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_s5" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_s5_ez_config</name>
     <doc>Good default config for 'pp5000_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp5000_s5" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="5.0" base_name="pp5000_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mv</name>
     <doc>Bus Voltage of 'pp5000_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mw</name>
     <doc>Power of 'pp5000_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ma</name>
     <doc>Current of 'pp5000_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ez_config</name>
     <doc>Good default config for 'pp5000_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp5000_z1" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="5.0" base_name="pp5000_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_z1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_z1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_z1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mw</name>
     <doc>Power of 'pp3300_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ma</name>
     <doc>Current of 'pp3300_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ez_config</name>
     <doc>Good default config for 'pp3300_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp3300_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_mv</name>
     <doc>Bus Voltage of 'ppvar_vccin_aux' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0001" nom="1.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" rsense="0.0001" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_mw</name>
     <doc>Power of 'ppvar_vccin_aux' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.0001" nom="1.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vccin_aux" rsense="0.0001" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ma</name>
     <doc>Current of 'ppvar_vccin_aux' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.0001" nom="1.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vccin_aux" rsense="0.0001" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vccin_aux' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.0001" nom="1.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vccin_aux" rsense="0.0001" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ez_config</name>
     <doc>Good default config for 'ppvar_vccin_aux' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.0001">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0001" nom="1.0" base_name="ppvar_vccin_aux" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_z1_mv</name>
     <doc>Bus Voltage of 'pp3300_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_z1" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_mw</name>
     <doc>Power of 'pp3300_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_z1" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_ma</name>
     <doc>Current of 'pp3300_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_z1" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_z1" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_ez_config</name>
     <doc>Good default config for 'pp3300_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp3300_z1" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_z1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_z1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_z1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mw</name>
     <doc>Power of 'pp3300_wlan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ma</name>
     <doc>Current of 'pp3300_wlan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_wlan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ez_config</name>
     <doc>Good default config for 'pp3300_wlan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev0.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev0.xml
index 9706378..b85cf8a 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev0.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev0.xml
@@ -1,547 +1,547 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:46 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:15 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp3300_edp_dx_mv</name>
     <doc>Bus Voltage of 'pp3300_edp_dx' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_dx">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_edp_dx" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_dx_mw</name>
     <doc>Power of 'pp3300_edp_dx' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_dx">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_edp_dx" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_dx_ma</name>
     <doc>Current of 'pp3300_edp_dx' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_dx">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_edp_dx" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_dx_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_edp_dx' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_dx">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_edp_dx" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_dx_ez_config</name>
     <doc>Good default config for 'pp3300_edp_dx' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_edp_dx" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_edp_dx" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_edp_dx_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_edp_dx_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_edp_dx_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_edp_dx_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1100_dram_mv</name>
     <doc>Bus Voltage of 'pp1100_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_mw</name>
     <doc>Power of 'pp1100_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ma</name>
     <doc>Current of 'pp1100_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_shuntmv</name>
     <doc>Shunt Voltage of 'pp1100_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ez_config</name>
     <doc>Good default config for 'pp1100_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp1100_dram" tags="adc_ez_config_ctrls" nom="1.1" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.1" base_name="pp1100_dram" map="on">
     </params>
   </control>
   <control>
     <name>pp1100_dram_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1100_dram_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1100_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1100_dram_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_mw</name>
     <doc>Power of 'pp1800_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ma</name>
     <doc>Current of 'pp1800_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ez_config</name>
     <doc>Good default config for 'pp1800_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp1800_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_mv</name>
     <doc>Bus Voltage of 'pp3300_fp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_mw</name>
     <doc>Power of 'pp3300_fp_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ma</name>
     <doc>Current of 'pp3300_fp_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_fp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ez_config</name>
     <doc>Good default config for 'pp3300_fp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_fp_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.5">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="3.3" base_name="pp3300_fp_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_mv</name>
     <doc>Bus Voltage of 'pp1800_fp_sens' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_mw</name>
     <doc>Power of 'pp1800_fp_sens' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_ma</name>
     <doc>Current of 'pp1800_fp_sens' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_fp_sens' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_ez_config</name>
     <doc>Good default config for 'pp1800_fp_sens' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp1800_fp_sens" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.5">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mv</name>
     <doc>Bus Voltage of 'pp5000_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mw</name>
     <doc>Power of 'pp5000_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ma</name>
     <doc>Current of 'pp5000_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ez_config</name>
     <doc>Good default config for 'pp5000_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp5000_z1" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="5.0" base_name="pp5000_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_z1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_z1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_z1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mw</name>
     <doc>Power of 'pp3300_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ma</name>
     <doc>Current of 'pp3300_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ez_config</name>
     <doc>Good default config for 'pp3300_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp3300_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_mv</name>
     <doc>Bus Voltage of 'ppvar_vccin_aux' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_mw</name>
     <doc>Power of 'ppvar_vccin_aux' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ma</name>
     <doc>Current of 'ppvar_vccin_aux' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vccin_aux' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ez_config</name>
     <doc>Good default config for 'ppvar_vccin_aux' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls" nom="1.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.0" base_name="ppvar_vccin_aux" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_z1_mv</name>
     <doc>Bus Voltage of 'pp3300_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_z1" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_mw</name>
     <doc>Power of 'pp3300_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="3.3" base_name="pp3300_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_z1" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_ma</name>
     <doc>Current of 'pp3300_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.5" nom="3.3" base_name="pp3300_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_z1" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_z1">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_z1" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_ez_config</name>
     <doc>Good default config for 'pp3300_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp3300_z1" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.5">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="3.3" base_name="pp3300_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_z1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_z1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_z1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mw</name>
     <doc>Power of 'pp3300_wlan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ma</name>
     <doc>Current of 'pp3300_wlan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_wlan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ez_config</name>
     <doc>Good default config for 'pp3300_wlan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="67">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev2.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev2.xml
index 4ec3aa7..20d2755 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev2.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev2.xml
@@ -1,4921 +1,4921 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:51 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:21 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp3300_ssd_x_mv</name>
     <doc>Bus Voltage of 'pp3300_ssd_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_mw</name>
     <doc>Power of 'pp3300_ssd_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ma</name>
     <doc>Current of 'pp3300_ssd_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_res</name>
     <doc>Resolution of 'pp3300_ssd_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.005" nom="3.3" map="resolution" base_name="pp3300_ssd_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_ssd_x" rsense="0.005" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_ssd_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_ssd_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_ssd_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_samples</name>
     <doc>Samples per second of 'pp3300_ssd_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.005" nom="3.3" map="pac_samples" base_name="pp3300_ssd_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_ssd_x" rsense="0.005" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ez_config</name>
     <doc>Good default config for 'pp3300_ssd_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp3300_ssd_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_avg_mw</name>
     <doc>Avg power of 'pp3300_ssd_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_ssd_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp3300_ssd_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_signed</name>
     <doc>Readings are signed for 'pp3300_ssd_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_ssd_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_ssd_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_gsc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_mw</name>
     <doc>Power of 'pp3300_gsc_z2' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_ma</name>
     <doc>Current of 'pp3300_gsc_z2' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_res</name>
     <doc>Resolution of 'pp3300_gsc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.1" nom="3.3" map="resolution" base_name="pp3300_gsc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_gsc_z2" rsense="0.1" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_gsc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.1" nom="3.3" map="yesno" base_name="pp3300_gsc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_gsc_z2" rsense="0.1" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_samples</name>
     <doc>Samples per second of 'pp3300_gsc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.1" nom="3.3" map="pac_samples" base_name="pp3300_gsc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_gsc_z2" rsense="0.1" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_ez_config</name>
     <doc>Good default config for 'pp3300_gsc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_gsc_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_avg_mw</name>
     <doc>Avg power of 'pp3300_gsc_z2' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_gsc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_gsc_z2" tags="accum_clear_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_signed</name>
     <doc>Readings are signed for 'pp3300_gsc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.1" nom="3.3" map="yesno" base_name="pp3300_gsc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_gsc_z2" rsense="0.1" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mw</name>
     <doc>Power of 'pp3300_wlan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ma</name>
     <doc>Current of 'pp3300_wlan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_res</name>
     <doc>Resolution of 'pp3300_wlan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.005" nom="3.3" map="resolution" base_name="pp3300_wlan_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_wlan_x" rsense="0.005" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_wlan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_wlan_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_wlan_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_samples</name>
     <doc>Samples per second of 'pp3300_wlan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.005" nom="3.3" map="pac_samples" base_name="pp3300_wlan_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_wlan_x" rsense="0.005" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ez_config</name>
     <doc>Good default config for 'pp3300_wlan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_avg_mw</name>
     <doc>Avg power of 'pp3300_wlan_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_wlan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_wlan_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_signed</name>
     <doc>Readings are signed for 'pp3300_wlan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_wlan_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_wlan_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_mw</name>
     <doc>Power of 'pp3300_soc_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ma</name>
     <doc>Current of 'pp3300_soc_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_res</name>
     <doc>Resolution of 'pp3300_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.005" nom="3.3" map="resolution" base_name="pp3300_soc_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_soc_s5" rsense="0.005" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_soc_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_soc_s5" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_samples</name>
     <doc>Samples per second of 'pp3300_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.005" nom="3.3" map="pac_samples" base_name="pp3300_soc_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_soc_s5" rsense="0.005" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ez_config</name>
     <doc>Good default config for 'pp3300_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_soc_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_avg_mw</name>
     <doc>Avg power of 'pp3300_soc_s5' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_soc_s5" tags="accum_clear_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_signed</name>
     <doc>Readings are signed for 'pp3300_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_soc_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_soc_s5" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_mw</name>
     <doc>Power of 'pp1800_soc_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ma</name>
     <doc>Current of 'pp1800_soc_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_res</name>
     <doc>Resolution of 'pp1800_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.005" nom="1.8" map="resolution" base_name="pp1800_soc_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_soc_s5" rsense="0.005" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.005" nom="1.8" map="yesno" base_name="pp1800_soc_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_soc_s5" rsense="0.005" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_samples</name>
     <doc>Samples per second of 'pp1800_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.005" nom="1.8" map="pac_samples" base_name="pp1800_soc_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_soc_s5" rsense="0.005" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ez_config</name>
     <doc>Good default config for 'pp1800_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp1800_soc_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_avg_mw</name>
     <doc>Avg power of 'pp1800_soc_s5' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp1800_soc_s5" tags="accum_clear_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_signed</name>
     <doc>Readings are signed for 'pp1800_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.005" nom="1.8" map="yesno" base_name="pp1800_soc_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_soc_s5" rsense="0.005" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="1.8" base_name="pp1800_sensor_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_sensor_s5" rsense="0.0" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_res</name>
     <doc>Resolution of 'pp1800_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.0" nom="1.8" map="resolution" base_name="pp1800_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp1800_sensor_s5" rsense="0.0" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.0" nom="1.8" map="yesno" base_name="pp1800_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp1800_sensor_s5" rsense="0.0" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_samples</name>
     <doc>Samples per second of 'pp1800_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.0" nom="1.8" map="pac_samples" base_name="pp1800_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp1800_sensor_s5" rsense="0.0" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_ez_config</name>
     <doc>Good default config for 'pp1800_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp1800_sensor_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="1.8" base_name="pp1800_sensor_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp1800_sensor_s5" tags="accum_clear_ctrls" nom="1.8" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="1.8" base_name="pp1800_sensor_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_signed</name>
     <doc>Readings are signed for 'pp1800_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.0" nom="1.8" map="yesno" base_name="pp1800_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp1800_sensor_s5" rsense="0.0" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_mv</name>
     <doc>Bus Voltage of 'pp3300_seq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="3.3" base_name="pp3300_seq">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_seq" rsense="0.0" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_seq_res</name>
     <doc>Resolution of 'pp3300_seq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.0" nom="3.3" map="resolution" base_name="pp3300_seq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_seq" rsense="0.0" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_seq_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_seq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_seq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_seq" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_seq_samples</name>
     <doc>Samples per second of 'pp3300_seq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.0" nom="3.3" map="pac_samples" base_name="pp3300_seq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_seq" rsense="0.0" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_seq_ez_config</name>
     <doc>Good default config for 'pp3300_seq' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_seq" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_seq" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_seq_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_seq' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_seq" tags="accum_clear_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_seq" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_seq_signed</name>
     <doc>Readings are signed for 'pp3300_seq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_seq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_seq" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_seq_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_seq_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_seq_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_seq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_seq_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_seq_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_mv</name>
     <doc>Bus Voltage of 'pp3300_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_mw</name>
     <doc>Power of 'pp3300_tchpad_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ma</name>
     <doc>Current of 'pp3300_tchpad_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_res</name>
     <doc>Resolution of 'pp3300_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.02" nom="3.3" map="resolution" base_name="pp3300_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_tchpad_x" rsense="0.02" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_tchpad_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_samples</name>
     <doc>Samples per second of 'pp3300_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.02" nom="3.3" map="pac_samples" base_name="pp3300_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_tchpad_x" rsense="0.02" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ez_config</name>
     <doc>Good default config for 'pp3300_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_tchpad_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_avg_mw</name>
     <doc>Avg power of 'pp3300_tchpad_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_tchpad_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_signed</name>
     <doc>Readings are signed for 'pp3300_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_tchpad_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="3.3" base_name="pp3300_ec_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_z2" rsense="0.0" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_res</name>
     <doc>Resolution of 'pp3300_ec_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.0" nom="3.3" map="resolution" base_name="pp3300_ec_z2">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_ec_z2" rsense="0.0" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_ec_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_ec_z2">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_ec_z2" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_samples</name>
     <doc>Samples per second of 'pp3300_ec_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.0" nom="3.3" map="pac_samples" base_name="pp3300_ec_z2">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_ec_z2" rsense="0.0" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_ez_config</name>
     <doc>Good default config for 'pp3300_ec_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp3300_ec_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_ec_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_ec_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp3300_ec_z2" tags="accum_clear_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_ec_z2" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_signed</name>
     <doc>Readings are signed for 'pp3300_ec_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_ec_z2">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_ec_z2" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_mv</name>
     <doc>Bus Voltage of 'pp3300_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="3.3" base_name="pp3300_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_z1" rsense="0.0" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_res</name>
     <doc>Resolution of 'pp3300_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.0" nom="3.3" map="resolution" base_name="pp3300_z1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_z1" rsense="0.0" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_z1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_z1" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_samples</name>
     <doc>Samples per second of 'pp3300_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.0" nom="3.3" map="pac_samples" base_name="pp3300_z1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_z1" rsense="0.0" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_ez_config</name>
     <doc>Good default config for 'pp3300_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_z1" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_z1_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_z1" tags="accum_clear_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_z1" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_z1_signed</name>
     <doc>Readings are signed for 'pp3300_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_z1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_z1" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_z1_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_z1_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_z1_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_z1_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_mv</name>
     <doc>Bus Voltage of 'pp3300_usb_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_mw</name>
     <doc>Power of 'pp3300_usb_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_ma</name>
     <doc>Current of 'pp3300_usb_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_res</name>
     <doc>Resolution of 'pp3300_usb_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.1" nom="3.3" map="resolution" base_name="pp3300_usb_z1">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_usb_z1" rsense="0.1" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_usb_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.1" nom="3.3" map="yesno" base_name="pp3300_usb_z1">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_usb_z1" rsense="0.1" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_samples</name>
     <doc>Samples per second of 'pp3300_usb_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.1" nom="3.3" map="pac_samples" base_name="pp3300_usb_z1">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_usb_z1" rsense="0.1" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_ez_config</name>
     <doc>Good default config for 'pp3300_usb_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_usb_z1" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_avg_mw</name>
     <doc>Avg power of 'pp3300_usb_z1' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_usb_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_usb_z1" tags="accum_clear_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_signed</name>
     <doc>Readings are signed for 'pp3300_usb_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.1" nom="3.3" map="yesno" base_name="pp3300_usb_z1">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_usb_z1" rsense="0.1" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_mw</name>
     <doc>Power of 'pp3300_ec_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ma</name>
     <doc>Current of 'pp3300_ec_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_res</name>
     <doc>Resolution of 'pp3300_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="2.2" nom="3.3" map="resolution" base_name="pp3300_ec_z1">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_ec_z1" rsense="2.2" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="2.2" nom="3.3" map="yesno" base_name="pp3300_ec_z1">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_ec_z1" rsense="2.2" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_samples</name>
     <doc>Samples per second of 'pp3300_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="2.2" nom="3.3" map="pac_samples" base_name="pp3300_ec_z1">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_ec_z1" rsense="2.2" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ez_config</name>
     <doc>Good default config for 'pp3300_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_ec_z1" tags="adc_ez_config_ctrls" nom="3.3" rsense="2.2">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_avg_mw</name>
     <doc>Avg power of 'pp3300_ec_z1' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_ec_z1" tags="accum_clear_ctrls" nom="3.3" rsense="2.2">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_signed</name>
     <doc>Readings are signed for 'pp3300_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="2.2" nom="3.3" map="yesno" base_name="pp3300_ec_z1">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_ec_z1" rsense="2.2" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_mv</name>
     <doc>Bus Voltage of 'pp1800_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_mw</name>
     <doc>Power of 'pp1800_ec_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ma</name>
     <doc>Current of 'pp1800_ec_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_res</name>
     <doc>Resolution of 'pp1800_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="2.2" nom="1.8" map="resolution" base_name="pp1800_ec_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_ec_z1" rsense="2.2" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="2.2" nom="1.8" map="yesno" base_name="pp1800_ec_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_ec_z1" rsense="2.2" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_samples</name>
     <doc>Samples per second of 'pp1800_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="2.2" nom="1.8" map="pac_samples" base_name="pp1800_ec_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_ec_z1" rsense="2.2" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ez_config</name>
     <doc>Good default config for 'pp1800_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp1800_ec_z1" tags="adc_ez_config_ctrls" nom="1.8" rsense="2.2">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_avg_mw</name>
     <doc>Avg power of 'pp1800_ec_z1' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp1800_ec_z1" tags="accum_clear_ctrls" nom="1.8" rsense="2.2">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_signed</name>
     <doc>Readings are signed for 'pp1800_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="2.2" nom="1.8" map="yesno" base_name="pp1800_ec_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_ec_z1" rsense="2.2" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_mv</name>
     <doc>Bus Voltage of 'pp3300_wwan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_mw</name>
     <doc>Power of 'pp3300_wwan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_ma</name>
     <doc>Current of 'pp3300_wwan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_res</name>
     <doc>Resolution of 'pp3300_wwan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.005" nom="3.3" map="resolution" base_name="pp3300_wwan_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_wwan_x" rsense="0.005" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_wwan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_wwan_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_wwan_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_samples</name>
     <doc>Samples per second of 'pp3300_wwan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.005" nom="3.3" map="pac_samples" base_name="pp3300_wwan_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_wwan_x" rsense="0.005" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_ez_config</name>
     <doc>Good default config for 'pp3300_wwan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_wwan_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_avg_mw</name>
     <doc>Avg power of 'pp3300_wwan_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_wwan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_wwan_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_signed</name>
     <doc>Readings are signed for 'pp3300_wwan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_wwan_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_wwan_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_mv</name>
     <doc>Bus Voltage of 'pp3300_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_mw</name>
     <doc>Power of 'pp3300_hdmi_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ma</name>
     <doc>Current of 'pp3300_hdmi_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_res</name>
     <doc>Resolution of 'pp3300_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.02" nom="3.3" map="resolution" base_name="pp3300_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_hdmi_x" rsense="0.02" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_hdmi_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_samples</name>
     <doc>Samples per second of 'pp3300_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.02" nom="3.3" map="pac_samples" base_name="pp3300_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_hdmi_x" rsense="0.02" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ez_config</name>
     <doc>Good default config for 'pp3300_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_hdmi_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_avg_mw</name>
     <doc>Avg power of 'pp3300_hdmi_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_hdmi_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_signed</name>
     <doc>Readings are signed for 'pp3300_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_hdmi_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_mv</name>
     <doc>Bus Voltage of 'pp5000_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_mw</name>
     <doc>Power of 'pp5000_hdmi_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ma</name>
     <doc>Current of 'pp5000_hdmi_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_res</name>
     <doc>Resolution of 'pp5000_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.01" nom="5.0" map="resolution" base_name="pp5000_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp5000_hdmi_x" rsense="0.01" map="resolution" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp5000_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.01" nom="5.0" map="yesno" base_name="pp5000_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp5000_hdmi_x" rsense="0.01" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_samples</name>
     <doc>Samples per second of 'pp5000_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.01" nom="5.0" map="pac_samples" base_name="pp5000_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp5000_hdmi_x" rsense="0.01" map="pac_samples" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ez_config</name>
     <doc>Good default config for 'pp5000_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp5000_hdmi_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_avg_mw</name>
     <doc>Avg power of 'pp5000_hdmi_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp5000_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp5000_hdmi_x" tags="accum_clear_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_signed</name>
     <doc>Readings are signed for 'pp5000_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.01" nom="5.0" map="yesno" base_name="pp5000_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp5000_hdmi_x" rsense="0.01" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_mv</name>
     <doc>Bus Voltage of 'ppvar_sys_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_mw</name>
     <doc>Power of 'ppvar_sys_edp' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_ma</name>
     <doc>Current of 'ppvar_sys_edp' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_res</name>
     <doc>Resolution of 'ppvar_sys_edp' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.005" nom="9.0" map="resolution" base_name="ppvar_sys_edp">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="ppvar_sys_edp" rsense="0.005" map="resolution" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'ppvar_sys_edp' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.005" nom="9.0" map="yesno" base_name="ppvar_sys_edp">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="ppvar_sys_edp" rsense="0.005" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_samples</name>
     <doc>Samples per second of 'ppvar_sys_edp' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.005" nom="9.0" map="pac_samples" base_name="ppvar_sys_edp">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="ppvar_sys_edp" rsense="0.005" map="pac_samples" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_ez_config</name>
     <doc>Good default config for 'ppvar_sys_edp' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="ppvar_sys_edp" tags="adc_ez_config_ctrls" nom="9.0" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_avg_mw</name>
     <doc>Avg power of 'ppvar_sys_edp' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_acc_clear</name>
     <doc>Clear the accumulator for 'ppvar_sys_edp' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="ppvar_sys_edp" tags="accum_clear_ctrls" nom="9.0" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp" map="yes">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_signed</name>
     <doc>Readings are signed for 'ppvar_sys_edp' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.005" nom="9.0" map="yesno" base_name="ppvar_sys_edp">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="ppvar_sys_edp" rsense="0.005" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_mv</name>
     <doc>Bus Voltage of 'pp3300_edp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_mw</name>
     <doc>Power of 'pp3300_edp_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ma</name>
     <doc>Current of 'pp3300_edp_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_res</name>
     <doc>Resolution of 'pp3300_edp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.02" nom="3.3" map="resolution" base_name="pp3300_edp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_edp_x" rsense="0.02" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_edp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_edp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_edp_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_samples</name>
     <doc>Samples per second of 'pp3300_edp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.02" nom="3.3" map="pac_samples" base_name="pp3300_edp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_edp_x" rsense="0.02" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ez_config</name>
     <doc>Good default config for 'pp3300_edp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_edp_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_edp_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_avg_mw</name>
     <doc>Avg power of 'pp3300_edp_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_edp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_edp_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_edp_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_signed</name>
     <doc>Readings are signed for 'pp3300_edp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_edp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_edp_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_mv</name>
     <doc>Bus Voltage of 'pp3300_fcam_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_mw</name>
     <doc>Power of 'pp3300_fcam_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_ma</name>
     <doc>Current of 'pp3300_fcam_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_res</name>
     <doc>Resolution of 'pp3300_fcam_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.01" nom="3.3" map="resolution" base_name="pp3300_fcam_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_fcam_x" rsense="0.01" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_fcam_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_fcam_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_fcam_x" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_samples</name>
     <doc>Samples per second of 'pp3300_fcam_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.01" nom="3.3" map="pac_samples" base_name="pp3300_fcam_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_fcam_x" rsense="0.01" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_ez_config</name>
     <doc>Good default config for 'pp3300_fcam_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_fcam_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_avg_mw</name>
     <doc>Avg power of 'pp3300_fcam_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_fcam_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_fcam_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_signed</name>
     <doc>Readings are signed for 'pp3300_fcam_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_fcam_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_fcam_x" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_mv</name>
     <doc>Bus Voltage of 'pp3300_hps_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_hps_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_hps_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_mw</name>
     <doc>Power of 'pp3300_hps_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_hps_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_hps_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_ma</name>
     <doc>Current of 'pp3300_hps_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_hps_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_hps_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_res</name>
     <doc>Resolution of 'pp3300_hps_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.01" nom="3.3" map="resolution" base_name="pp3300_hps_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_hps_x" rsense="0.01" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_hps_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_hps_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_hps_x" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_samples</name>
     <doc>Samples per second of 'pp3300_hps_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.01" nom="3.3" map="pac_samples" base_name="pp3300_hps_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_hps_x" rsense="0.01" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_ez_config</name>
     <doc>Good default config for 'pp3300_hps_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_hps_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_hps_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_avg_mw</name>
     <doc>Avg power of 'pp3300_hps_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="3.3" base_name="pp3300_hps_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_hps_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_hps_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_hps_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_hps_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_signed</name>
     <doc>Readings are signed for 'pp3300_hps_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_hps_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_hps_x" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="3.3" base_name="pp3300_sensor_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_sensor_s5" rsense="0.0" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_res</name>
     <doc>Resolution of 'pp3300_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.0" nom="3.3" map="resolution" base_name="pp3300_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_sensor_s5" rsense="0.0" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_sensor_s5" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_samples</name>
     <doc>Samples per second of 'pp3300_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.0" nom="3.3" map="pac_samples" base_name="pp3300_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_sensor_s5" rsense="0.0" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_ez_config</name>
     <doc>Good default config for 'pp3300_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp3300_sensor_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_sensor_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp3300_sensor_s5" tags="accum_clear_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_sensor_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_signed</name>
     <doc>Readings are signed for 'pp3300_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_sensor_s5" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_mv</name>
     <doc>Bus Voltage of 'pp3300_tchscr_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_mw</name>
     <doc>Power of 'pp3300_tchscr_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ma</name>
     <doc>Current of 'pp3300_tchscr_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_res</name>
     <doc>Resolution of 'pp3300_tchscr_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.02" nom="3.3" map="resolution" base_name="pp3300_tchscr_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_tchscr_x" rsense="0.02" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_tchscr_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_tchscr_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_tchscr_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_samples</name>
     <doc>Samples per second of 'pp3300_tchscr_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.02" nom="3.3" map="pac_samples" base_name="pp3300_tchscr_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_tchscr_x" rsense="0.02" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ez_config</name>
     <doc>Good default config for 'pp3300_tchscr_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_tchscr_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_avg_mw</name>
     <doc>Avg power of 'pp3300_tchscr_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_tchscr_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_tchscr_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_signed</name>
     <doc>Readings are signed for 'pp3300_tchscr_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_tchscr_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_tchscr_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_mw</name>
     <doc>Power of 'pp1800_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ma</name>
     <doc>Current of 'pp1800_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_res</name>
     <doc>Resolution of 'pp1800_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.005" nom="1.8" map="resolution" base_name="pp1800_s5">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp1800_s5" rsense="0.005" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.005" nom="1.8" map="yesno" base_name="pp1800_s5">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp1800_s5" rsense="0.005" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_samples</name>
     <doc>Samples per second of 'pp1800_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.005" nom="1.8" map="pac_samples" base_name="pp1800_s5">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp1800_s5" rsense="0.005" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ez_config</name>
     <doc>Good default config for 'pp1800_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp1800_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_s5_avg_mw</name>
     <doc>Avg power of 'pp1800_s5' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp1800_s5" tags="accum_clear_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_s5_signed</name>
     <doc>Readings are signed for 'pp1800_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.005" nom="1.8" map="yesno" base_name="pp1800_s5">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp1800_s5" rsense="0.005" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp1800_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp1800_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp1800_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp1800_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp1800_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_mv</name>
     <doc>Bus Voltage of 'pp5000_fan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="5.0" base_name="pp5000_fan">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_fan" rsense="0.0" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_res</name>
     <doc>Resolution of 'pp5000_fan' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.0" nom="5.0" map="resolution" base_name="pp5000_fan">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp5000_fan" rsense="0.0" map="resolution" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp5000_fan' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.0" nom="5.0" map="yesno" base_name="pp5000_fan">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp5000_fan" rsense="0.0" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_samples</name>
     <doc>Samples per second of 'pp5000_fan' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.0" nom="5.0" map="pac_samples" base_name="pp5000_fan">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp5000_fan" rsense="0.0" map="pac_samples" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_ez_config</name>
     <doc>Good default config for 'pp5000_fan' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp5000_fan" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="5.0" base_name="pp5000_fan" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_fan_acc_clear</name>
     <doc>Clear the accumulator for 'pp5000_fan' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp5000_fan" tags="accum_clear_ctrls" nom="5.0" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="5.0" base_name="pp5000_fan" map="yes">
     </params>
   </control>
   <control>
     <name>pp5000_fan_signed</name>
     <doc>Readings are signed for 'pp5000_fan' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.0" nom="5.0" map="yesno" base_name="pp5000_fan">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp5000_fan" rsense="0.0" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp5000_fan_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp5000_fan_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp5000_fan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp5000_fan_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp5000_fan_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_mv</name>
     <doc>Bus Voltage of 'pp1800_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_mw</name>
     <doc>Power of 'pp1800_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ma</name>
     <doc>Current of 'pp1800_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_res</name>
     <doc>Resolution of 'pp1800_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.01" nom="1.8" map="resolution" base_name="pp1800_dram">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_dram" rsense="0.01" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.01" nom="1.8" map="yesno" base_name="pp1800_dram">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_dram" rsense="0.01" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_samples</name>
     <doc>Samples per second of 'pp1800_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.01" nom="1.8" map="pac_samples" base_name="pp1800_dram">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_dram" rsense="0.01" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ez_config</name>
     <doc>Good default config for 'pp1800_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp1800_dram" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="1.8" base_name="pp1800_dram" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_dram_avg_mw</name>
     <doc>Avg power of 'pp1800_dram' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp1800_dram" tags="accum_clear_ctrls" nom="1.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="1.8" base_name="pp1800_dram" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_dram_signed</name>
     <doc>Readings are signed for 'pp1800_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.01" nom="1.8" map="yesno" base_name="pp1800_dram">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_dram" rsense="0.01" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1800_dram_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1800_dram_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1800_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1800_dram_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1800_dram_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_mv</name>
     <doc>Bus Voltage of 'pp1100_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_mw</name>
     <doc>Power of 'pp1100_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ma</name>
     <doc>Current of 'pp1100_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_res</name>
     <doc>Resolution of 'pp1100_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.002" nom="1.1" map="resolution" base_name="pp1100_dram">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp1100_dram" rsense="0.002" map="resolution" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1100_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.002" nom="1.1" map="yesno" base_name="pp1100_dram">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp1100_dram" rsense="0.002" map="yesno" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_samples</name>
     <doc>Samples per second of 'pp1100_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.002" nom="1.1" map="pac_samples" base_name="pp1100_dram">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp1100_dram" rsense="0.002" map="pac_samples" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ez_config</name>
     <doc>Good default config for 'pp1100_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp1100_dram" tags="adc_ez_config_ctrls" nom="1.1" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.1" base_name="pp1100_dram" map="on">
     </params>
   </control>
   <control>
     <name>pp1100_dram_avg_mw</name>
     <doc>Avg power of 'pp1100_dram' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_acc_clear</name>
     <doc>Clear the accumulator for 'pp1100_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp1100_dram" tags="accum_clear_ctrls" nom="1.1" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.002" nom="1.1" base_name="pp1100_dram" map="yes">
     </params>
   </control>
   <control>
     <name>pp1100_dram_signed</name>
     <doc>Readings are signed for 'pp1100_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.002" nom="1.1" map="yesno" base_name="pp1100_dram">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp1100_dram" rsense="0.002" map="yesno" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1100_dram_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1100_dram_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1100_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1100_dram_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1100_dram_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_mv</name>
     <doc>Bus Voltage of 'pp0600_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_mw</name>
     <doc>Power of 'pp0600_vddq' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ma</name>
     <doc>Current of 'pp0600_vddq' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_res</name>
     <doc>Resolution of 'pp0600_vddq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.005" nom="0.6" map="resolution" base_name="pp0600_vddq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp0600_vddq" rsense="0.005" map="resolution" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp0600_vddq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.005" nom="0.6" map="yesno" base_name="pp0600_vddq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp0600_vddq" rsense="0.005" map="yesno" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_samples</name>
     <doc>Samples per second of 'pp0600_vddq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.005" nom="0.6" map="pac_samples" base_name="pp0600_vddq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp0600_vddq" rsense="0.005" map="pac_samples" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ez_config</name>
     <doc>Good default config for 'pp0600_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp0600_vddq" tags="adc_ez_config_ctrls" nom="0.6" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="0.6" base_name="pp0600_vddq" map="on">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_avg_mw</name>
     <doc>Avg power of 'pp0600_vddq' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_acc_clear</name>
     <doc>Clear the accumulator for 'pp0600_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp0600_vddq" tags="accum_clear_ctrls" nom="0.6" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="0.6" base_name="pp0600_vddq" map="yes">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_signed</name>
     <doc>Readings are signed for 'pp0600_vddq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.005" nom="0.6" map="yesno" base_name="pp0600_vddq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp0600_vddq" rsense="0.005" map="yesno" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_mv</name>
     <doc>Bus Voltage of 'ppvar_vccin_aux' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_mw</name>
     <doc>Power of 'ppvar_vccin_aux' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ma</name>
     <doc>Current of 'ppvar_vccin_aux' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_res</name>
     <doc>Resolution of 'ppvar_vccin_aux' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.002" nom="9.0" map="resolution" base_name="ppvar_vccin_aux">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="ppvar_vccin_aux" rsense="0.002" map="resolution" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'ppvar_vccin_aux' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.002" nom="9.0" map="yesno" base_name="ppvar_vccin_aux">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="ppvar_vccin_aux" rsense="0.002" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_samples</name>
     <doc>Samples per second of 'ppvar_vccin_aux' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.002" nom="9.0" map="pac_samples" base_name="ppvar_vccin_aux">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="ppvar_vccin_aux" rsense="0.002" map="pac_samples" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ez_config</name>
     <doc>Good default config for 'ppvar_vccin_aux' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls" nom="9.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_avg_mw</name>
     <doc>Avg power of 'ppvar_vccin_aux' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_acc_clear</name>
     <doc>Clear the accumulator for 'ppvar_vccin_aux' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="ppvar_vccin_aux" tags="accum_clear_ctrls" nom="9.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux" map="yes">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_signed</name>
     <doc>Readings are signed for 'ppvar_vccin_aux' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.002" nom="9.0" map="yesno" base_name="ppvar_vccin_aux">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="ppvar_vccin_aux" rsense="0.002" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_mv</name>
     <doc>Bus Voltage of 'pp5000_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_mw</name>
     <doc>Power of 'pp5000_tchpad_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ma</name>
     <doc>Current of 'pp5000_tchpad_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_res</name>
     <doc>Resolution of 'pp5000_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.01" nom="5.0" map="resolution" base_name="pp5000_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp5000_tchpad_x" rsense="0.01" map="resolution" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp5000_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.01" nom="5.0" map="yesno" base_name="pp5000_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp5000_tchpad_x" rsense="0.01" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_samples</name>
     <doc>Samples per second of 'pp5000_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.01" nom="5.0" map="pac_samples" base_name="pp5000_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp5000_tchpad_x" rsense="0.01" map="pac_samples" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ez_config</name>
     <doc>Good default config for 'pp5000_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp5000_tchpad_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_avg_mw</name>
     <doc>Avg power of 'pp5000_tchpad_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp5000_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp5000_tchpad_x" tags="accum_clear_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_signed</name>
     <doc>Readings are signed for 'pp5000_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.01" nom="5.0" map="yesno" base_name="pp5000_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp5000_tchpad_x" rsense="0.01" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_rtc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="3.3" base_name="pp3300_rtc_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_rtc_z2" rsense="0.0" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_res</name>
     <doc>Resolution of 'pp3300_rtc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.0" nom="3.3" map="resolution" base_name="pp3300_rtc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_rtc_z2" rsense="0.0" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_rtc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_rtc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_rtc_z2" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_samples</name>
     <doc>Samples per second of 'pp3300_rtc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.0" nom="3.3" map="pac_samples" base_name="pp3300_rtc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_rtc_z2" rsense="0.0" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_ez_config</name>
     <doc>Good default config for 'pp3300_rtc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_rtc_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_rtc_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_rtc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_rtc_z2" tags="accum_clear_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_rtc_z2" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_signed</name>
     <doc>Readings are signed for 'pp3300_rtc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_rtc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_rtc_z2" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_mw</name>
     <doc>Power of 'pp3300_z2' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_ma</name>
     <doc>Current of 'pp3300_z2' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_res</name>
     <doc>Resolution of 'pp3300_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.01" nom="3.3" map="resolution" base_name="pp3300_z2">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_z2" rsense="0.01" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_z2">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_z2" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_samples</name>
     <doc>Samples per second of 'pp3300_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.01" nom="3.3" map="pac_samples" base_name="pp3300_z2">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_z2" rsense="0.01" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_ez_config</name>
     <doc>Good default config for 'pp3300_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_z2_avg_mw</name>
     <doc>Avg power of 'pp3300_z2' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="3.3" base_name="pp3300_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_z2" tags="accum_clear_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_z2" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_z2_signed</name>
     <doc>Readings are signed for 'pp3300_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_z2">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_z2" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_z2_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_z2_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_z2_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_z2_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mw</name>
     <doc>Power of 'pp3300_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ma</name>
     <doc>Current of 'pp3300_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_res</name>
     <doc>Resolution of 'pp3300_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.005" nom="3.3" map="resolution" base_name="pp3300_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_s5" rsense="0.005" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_s5" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_samples</name>
     <doc>Samples per second of 'pp3300_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.005" nom="3.3" map="pac_samples" base_name="pp3300_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_s5" rsense="0.005" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ez_config</name>
     <doc>Good default config for 'pp3300_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_s5_avg_mw</name>
     <doc>Avg power of 'pp3300_s5' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_s5" tags="accum_clear_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_s5_signed</name>
     <doc>Readings are signed for 'pp3300_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_s5" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mv</name>
     <doc>Bus Voltage of 'pp5000_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mw</name>
     <doc>Power of 'pp5000_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ma</name>
     <doc>Current of 'pp5000_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_res</name>
     <doc>Resolution of 'pp5000_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.002" nom="5.0" map="resolution" base_name="pp5000_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp5000_z1" rsense="0.002" map="resolution" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp5000_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.002" nom="5.0" map="yesno" base_name="pp5000_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp5000_z1" rsense="0.002" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_samples</name>
     <doc>Samples per second of 'pp5000_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.002" nom="5.0" map="pac_samples" base_name="pp5000_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp5000_z1" rsense="0.002" map="pac_samples" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ez_config</name>
     <doc>Good default config for 'pp5000_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp5000_z1" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="5.0" base_name="pp5000_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_z1_avg_mw</name>
     <doc>Avg power of 'pp5000_z1' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_acc_clear</name>
     <doc>Clear the accumulator for 'pp5000_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp5000_z1" tags="accum_clear_ctrls" nom="5.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.002" nom="5.0" base_name="pp5000_z1" map="yes">
     </params>
   </control>
   <control>
     <name>pp5000_z1_signed</name>
     <doc>Readings are signed for 'pp5000_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.002" nom="5.0" map="yesno" base_name="pp5000_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp5000_z1" rsense="0.002" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp5000_z1_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp5000_z1_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp5000_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp5000_z1_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp5000_z1_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_mv</name>
     <doc>Bus Voltage of 'ppvar_sys_sd' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_mw</name>
     <doc>Power of 'ppvar_sys_sd' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_ma</name>
     <doc>Current of 'ppvar_sys_sd' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_res</name>
     <doc>Resolution of 'ppvar_sys_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.01" nom="9.0" map="resolution" base_name="ppvar_sys_sd">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="ppvar_sys_sd" rsense="0.01" map="resolution" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'ppvar_sys_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.01" nom="9.0" map="yesno" base_name="ppvar_sys_sd">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="ppvar_sys_sd" rsense="0.01" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_samples</name>
     <doc>Samples per second of 'ppvar_sys_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.01" nom="9.0" map="pac_samples" base_name="ppvar_sys_sd">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="ppvar_sys_sd" rsense="0.01" map="pac_samples" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_ez_config</name>
     <doc>Good default config for 'ppvar_sys_sd' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="ppvar_sys_sd" tags="adc_ez_config_ctrls" nom="9.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_avg_mw</name>
     <doc>Avg power of 'ppvar_sys_sd' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_acc_clear</name>
     <doc>Clear the accumulator for 'ppvar_sys_sd' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="ppvar_sys_sd" tags="accum_clear_ctrls" nom="9.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd" map="yes">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_signed</name>
     <doc>Readings are signed for 'ppvar_sys_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.01" nom="9.0" map="yesno" base_name="ppvar_sys_sd">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="ppvar_sys_sd" rsense="0.01" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_mv</name>
     <doc>Bus Voltage of 'pp3300_s5_sd' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_mw</name>
     <doc>Power of 'pp3300_s5_sd' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_ma</name>
     <doc>Current of 'pp3300_s5_sd' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_res</name>
     <doc>Resolution of 'pp3300_s5_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.01" nom="3.3" map="resolution" base_name="pp3300_s5_sd">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_s5_sd" rsense="0.01" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_s5_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_s5_sd">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_s5_sd" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_samples</name>
     <doc>Samples per second of 'pp3300_s5_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.01" nom="3.3" map="pac_samples" base_name="pp3300_s5_sd">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_s5_sd" rsense="0.01" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_ez_config</name>
     <doc>Good default config for 'pp3300_s5_sd' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_s5_sd" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_avg_mw</name>
     <doc>Avg power of 'pp3300_s5_sd' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_s5_sd' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_s5_sd" tags="accum_clear_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_signed</name>
     <doc>Readings are signed for 'pp3300_s5_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_s5_sd">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_s5_sd" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_kb_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mw</name>
     <doc>Power of 'ppvar_kb_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ma</name>
     <doc>Current of 'ppvar_kb_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_res</name>
     <doc>Resolution of 'ppvar_kb_bl' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.02" nom="9.0" map="resolution" base_name="ppvar_kb_bl">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="ppvar_kb_bl" rsense="0.02" map="resolution" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'ppvar_kb_bl' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.02" nom="9.0" map="yesno" base_name="ppvar_kb_bl">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="ppvar_kb_bl" rsense="0.02" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_samples</name>
     <doc>Samples per second of 'ppvar_kb_bl' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.02" nom="9.0" map="pac_samples" base_name="ppvar_kb_bl">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="ppvar_kb_bl" rsense="0.02" map="pac_samples" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ez_config</name>
     <doc>Good default config for 'ppvar_kb_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls" nom="9.0" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_avg_mw</name>
     <doc>Avg power of 'ppvar_kb_bl' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_acc_clear</name>
     <doc>Clear the accumulator for 'ppvar_kb_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="ppvar_kb_bl" tags="accum_clear_ctrls" nom="9.0" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl" map="yes">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_signed</name>
     <doc>Readings are signed for 'ppvar_kb_bl' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.02" nom="9.0" map="yesno" base_name="ppvar_kb_bl">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="ppvar_kb_bl" rsense="0.02" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_mv</name>
     <doc>Bus Voltage of 'pp1800_fp_sens' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_mw</name>
     <doc>Power of 'pp1800_fp_sens' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_ma</name>
     <doc>Current of 'pp1800_fp_sens' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_res</name>
     <doc>Resolution of 'pp1800_fp_sens' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.5" nom="1.8" map="resolution" base_name="pp1800_fp_sens">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_fp_sens" rsense="0.5" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_fp_sens' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.5" nom="1.8" map="yesno" base_name="pp1800_fp_sens">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_fp_sens" rsense="0.5" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_samples</name>
     <doc>Samples per second of 'pp1800_fp_sens' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.5" nom="1.8" map="pac_samples" base_name="pp1800_fp_sens">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_fp_sens" rsense="0.5" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_ez_config</name>
     <doc>Good default config for 'pp1800_fp_sens' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp1800_fp_sens" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.5">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_avg_mw</name>
     <doc>Avg power of 'pp1800_fp_sens' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_fp_sens' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp1800_fp_sens" tags="accum_clear_ctrls" nom="1.8" rsense="0.5">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_signed</name>
     <doc>Readings are signed for 'pp1800_fp_sens' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.5" nom="1.8" map="yesno" base_name="pp1800_fp_sens">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_fp_sens" rsense="0.5" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_mv</name>
     <doc>Bus Voltage of 'pp3300_fp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_mw</name>
     <doc>Power of 'pp3300_fp_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ma</name>
     <doc>Current of 'pp3300_fp_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_res</name>
     <doc>Resolution of 'pp3300_fp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.5" nom="3.3" map="resolution" base_name="pp3300_fp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_fp_x" rsense="0.5" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_fp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.5" nom="3.3" map="yesno" base_name="pp3300_fp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_fp_x" rsense="0.5" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_samples</name>
     <doc>Samples per second of 'pp3300_fp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.5" nom="3.3" map="pac_samples" base_name="pp3300_fp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_fp_x" rsense="0.5" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ez_config</name>
     <doc>Good default config for 'pp3300_fp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_fp_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.5">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="3.3" base_name="pp3300_fp_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_avg_mw</name>
     <doc>Avg power of 'pp3300_fp_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_fp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_fp_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.5">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.5" nom="3.3" base_name="pp3300_fp_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_signed</name>
     <doc>Readings are signed for 'pp3300_fp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.5" nom="3.3" map="yesno" base_name="pp3300_fp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_fp_x" rsense="0.5" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_mv</name>
     <doc>Bus Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_mw</name>
     <doc>Power of 'ppvar_vbus_in' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ma</name>
     <doc>Current of 'ppvar_vbus_in' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_res</name>
     <doc>Resolution of 'ppvar_vbus_in' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.001" nom="9.0" map="resolution" base_name="ppvar_vbus_in">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="ppvar_vbus_in" rsense="0.001" map="resolution" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'ppvar_vbus_in' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.001" nom="9.0" map="yesno" base_name="ppvar_vbus_in">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="ppvar_vbus_in" rsense="0.001" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_samples</name>
     <doc>Samples per second of 'ppvar_vbus_in' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.001" nom="9.0" map="pac_samples" base_name="ppvar_vbus_in">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="ppvar_vbus_in" rsense="0.001" map="pac_samples" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ez_config</name>
     <doc>Good default config for 'ppvar_vbus_in' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls" nom="9.0" rsense="0.001">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_avg_mw</name>
     <doc>Avg power of 'ppvar_vbus_in' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_acc_clear</name>
     <doc>Clear the accumulator for 'ppvar_vbus_in' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="ppvar_vbus_in" tags="accum_clear_ctrls" nom="9.0" rsense="0.001">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in" map="yes">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_signed</name>
     <doc>Readings are signed for 'ppvar_vbus_in' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.001" nom="9.0" map="yesno" base_name="ppvar_vbus_in">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="ppvar_vbus_in" rsense="0.001" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_mv</name>
     <doc>Bus Voltage of 'pp3300_adc_dbg' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_mw</name>
     <doc>Power of 'pp3300_adc_dbg' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_ma</name>
     <doc>Current of 'pp3300_adc_dbg' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_res</name>
     <doc>Resolution of 'pp3300_adc_dbg' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.01" nom="3.3" map="resolution" base_name="pp3300_adc_dbg">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_adc_dbg" rsense="0.01" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_adc_dbg' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_adc_dbg">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_adc_dbg" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_samples</name>
     <doc>Samples per second of 'pp3300_adc_dbg' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.01" nom="3.3" map="pac_samples" base_name="pp3300_adc_dbg">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_adc_dbg" rsense="0.01" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_ez_config</name>
     <doc>Good default config for 'pp3300_adc_dbg' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_adc_dbg" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_avg_mw</name>
     <doc>Avg power of 'pp3300_adc_dbg' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_adc_dbg' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_adc_dbg" tags="accum_clear_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_signed</name>
     <doc>Readings are signed for 'pp3300_adc_dbg' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_adc_dbg">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_adc_dbg" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev4.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev4.xml
index 4ec3aa7..20d2755 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev4.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rev4.xml
@@ -1,4921 +1,4921 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:51 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:21 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp3300_ssd_x_mv</name>
     <doc>Bus Voltage of 'pp3300_ssd_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_mw</name>
     <doc>Power of 'pp3300_ssd_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ma</name>
     <doc>Current of 'pp3300_ssd_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_res</name>
     <doc>Resolution of 'pp3300_ssd_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.005" nom="3.3" map="resolution" base_name="pp3300_ssd_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_ssd_x" rsense="0.005" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_ssd_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_ssd_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_ssd_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_samples</name>
     <doc>Samples per second of 'pp3300_ssd_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.005" nom="3.3" map="pac_samples" base_name="pp3300_ssd_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_ssd_x" rsense="0.005" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ez_config</name>
     <doc>Good default config for 'pp3300_ssd_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp3300_ssd_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_avg_mw</name>
     <doc>Avg power of 'pp3300_ssd_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_ssd_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_ssd_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp3300_ssd_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_ssd_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_signed</name>
     <doc>Readings are signed for 'pp3300_ssd_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_ssd_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_ssd_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_gsc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_mw</name>
     <doc>Power of 'pp3300_gsc_z2' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_ma</name>
     <doc>Current of 'pp3300_gsc_z2' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_res</name>
     <doc>Resolution of 'pp3300_gsc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.1" nom="3.3" map="resolution" base_name="pp3300_gsc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_gsc_z2" rsense="0.1" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_gsc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.1" nom="3.3" map="yesno" base_name="pp3300_gsc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_gsc_z2" rsense="0.1" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_samples</name>
     <doc>Samples per second of 'pp3300_gsc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.1" nom="3.3" map="pac_samples" base_name="pp3300_gsc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_gsc_z2" rsense="0.1" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_ez_config</name>
     <doc>Good default config for 'pp3300_gsc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_gsc_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_avg_mw</name>
     <doc>Avg power of 'pp3300_gsc_z2' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_gsc_z2" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_gsc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_gsc_z2" tags="accum_clear_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_gsc_z2" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_signed</name>
     <doc>Readings are signed for 'pp3300_gsc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.1" nom="3.3" map="yesno" base_name="pp3300_gsc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_gsc_z2" rsense="0.1" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mw</name>
     <doc>Power of 'pp3300_wlan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ma</name>
     <doc>Current of 'pp3300_wlan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_res</name>
     <doc>Resolution of 'pp3300_wlan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.005" nom="3.3" map="resolution" base_name="pp3300_wlan_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_wlan_x" rsense="0.005" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_wlan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_wlan_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_wlan_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_samples</name>
     <doc>Samples per second of 'pp3300_wlan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.005" nom="3.3" map="pac_samples" base_name="pp3300_wlan_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_wlan_x" rsense="0.005" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ez_config</name>
     <doc>Good default config for 'pp3300_wlan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_avg_mw</name>
     <doc>Avg power of 'pp3300_wlan_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_wlan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_wlan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_wlan_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_wlan_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_signed</name>
     <doc>Readings are signed for 'pp3300_wlan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_wlan_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_wlan_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_mw</name>
     <doc>Power of 'pp3300_soc_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ma</name>
     <doc>Current of 'pp3300_soc_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_res</name>
     <doc>Resolution of 'pp3300_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.005" nom="3.3" map="resolution" base_name="pp3300_soc_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_soc_s5" rsense="0.005" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_soc_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_soc_s5" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_samples</name>
     <doc>Samples per second of 'pp3300_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.005" nom="3.3" map="pac_samples" base_name="pp3300_soc_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_soc_s5" rsense="0.005" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ez_config</name>
     <doc>Good default config for 'pp3300_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_soc_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_avg_mw</name>
     <doc>Avg power of 'pp3300_soc_s5' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_soc_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_soc_s5" tags="accum_clear_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_soc_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_signed</name>
     <doc>Readings are signed for 'pp3300_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_soc_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_soc_s5" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="16" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="16" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="16" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="16">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="16" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="16" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_mw</name>
     <doc>Power of 'pp1800_soc_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ma</name>
     <doc>Current of 'pp1800_soc_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_res</name>
     <doc>Resolution of 'pp1800_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.005" nom="1.8" map="resolution" base_name="pp1800_soc_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_soc_s5" rsense="0.005" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.005" nom="1.8" map="yesno" base_name="pp1800_soc_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_soc_s5" rsense="0.005" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_samples</name>
     <doc>Samples per second of 'pp1800_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.005" nom="1.8" map="pac_samples" base_name="pp1800_soc_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_soc_s5" rsense="0.005" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ez_config</name>
     <doc>Good default config for 'pp1800_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp1800_soc_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_avg_mw</name>
     <doc>Avg power of 'pp1800_soc_s5' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1800_soc_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp1800_soc_s5" tags="accum_clear_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_soc_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_signed</name>
     <doc>Readings are signed for 'pp1800_soc_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.005" nom="1.8" map="yesno" base_name="pp1800_soc_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_soc_s5" rsense="0.005" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="1.8" base_name="pp1800_sensor_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_sensor_s5" rsense="0.0" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_res</name>
     <doc>Resolution of 'pp1800_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.0" nom="1.8" map="resolution" base_name="pp1800_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp1800_sensor_s5" rsense="0.0" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.0" nom="1.8" map="yesno" base_name="pp1800_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp1800_sensor_s5" rsense="0.0" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_samples</name>
     <doc>Samples per second of 'pp1800_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.0" nom="1.8" map="pac_samples" base_name="pp1800_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp1800_sensor_s5" rsense="0.0" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_ez_config</name>
     <doc>Good default config for 'pp1800_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp1800_sensor_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="1.8" base_name="pp1800_sensor_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp1800_sensor_s5" tags="accum_clear_ctrls" nom="1.8" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="1.8" base_name="pp1800_sensor_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_signed</name>
     <doc>Readings are signed for 'pp1800_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.0" nom="1.8" map="yesno" base_name="pp1800_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp1800_sensor_s5" rsense="0.0" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_mv</name>
     <doc>Bus Voltage of 'pp3300_seq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="3.3" base_name="pp3300_seq">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_seq" rsense="0.0" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_seq_res</name>
     <doc>Resolution of 'pp3300_seq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.0" nom="3.3" map="resolution" base_name="pp3300_seq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_seq" rsense="0.0" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_seq_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_seq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_seq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_seq" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_seq_samples</name>
     <doc>Samples per second of 'pp3300_seq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.0" nom="3.3" map="pac_samples" base_name="pp3300_seq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_seq" rsense="0.0" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_seq_ez_config</name>
     <doc>Good default config for 'pp3300_seq' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_seq" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_seq" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_seq_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_seq' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_seq" tags="accum_clear_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_seq" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_seq_signed</name>
     <doc>Readings are signed for 'pp3300_seq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_seq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_seq" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_seq_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_seq_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_seq_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_seq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_seq_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_seq_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_seq_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_mv</name>
     <doc>Bus Voltage of 'pp3300_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_mw</name>
     <doc>Power of 'pp3300_tchpad_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ma</name>
     <doc>Current of 'pp3300_tchpad_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_res</name>
     <doc>Resolution of 'pp3300_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.02" nom="3.3" map="resolution" base_name="pp3300_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_tchpad_x" rsense="0.02" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_tchpad_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_samples</name>
     <doc>Samples per second of 'pp3300_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.02" nom="3.3" map="pac_samples" base_name="pp3300_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_tchpad_x" rsense="0.02" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ez_config</name>
     <doc>Good default config for 'pp3300_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_tchpad_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_avg_mw</name>
     <doc>Avg power of 'pp3300_tchpad_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_tchpad_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_signed</name>
     <doc>Readings are signed for 'pp3300_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_tchpad_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="17" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="17" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="17" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="17">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="17" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="17" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="3.3" base_name="pp3300_ec_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_z2" rsense="0.0" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_res</name>
     <doc>Resolution of 'pp3300_ec_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.0" nom="3.3" map="resolution" base_name="pp3300_ec_z2">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_ec_z2" rsense="0.0" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_ec_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_ec_z2">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_ec_z2" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_samples</name>
     <doc>Samples per second of 'pp3300_ec_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.0" nom="3.3" map="pac_samples" base_name="pp3300_ec_z2">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_ec_z2" rsense="0.0" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_ez_config</name>
     <doc>Good default config for 'pp3300_ec_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp3300_ec_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_ec_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_ec_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp3300_ec_z2" tags="accum_clear_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_ec_z2" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_signed</name>
     <doc>Readings are signed for 'pp3300_ec_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_ec_z2">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_ec_z2" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_mv</name>
     <doc>Bus Voltage of 'pp3300_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="3.3" base_name="pp3300_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_z1" rsense="0.0" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_res</name>
     <doc>Resolution of 'pp3300_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.0" nom="3.3" map="resolution" base_name="pp3300_z1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_z1" rsense="0.0" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_z1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_z1" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_samples</name>
     <doc>Samples per second of 'pp3300_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.0" nom="3.3" map="pac_samples" base_name="pp3300_z1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_z1" rsense="0.0" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_ez_config</name>
     <doc>Good default config for 'pp3300_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_z1" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_z1_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_z1" tags="accum_clear_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_z1" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_z1_signed</name>
     <doc>Readings are signed for 'pp3300_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_z1">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_z1" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z1_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_z1_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_z1_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_z1_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z1_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_z1_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_mv</name>
     <doc>Bus Voltage of 'pp3300_usb_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_mw</name>
     <doc>Power of 'pp3300_usb_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_ma</name>
     <doc>Current of 'pp3300_usb_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_res</name>
     <doc>Resolution of 'pp3300_usb_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.1" nom="3.3" map="resolution" base_name="pp3300_usb_z1">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_usb_z1" rsense="0.1" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_usb_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.1" nom="3.3" map="yesno" base_name="pp3300_usb_z1">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_usb_z1" rsense="0.1" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_samples</name>
     <doc>Samples per second of 'pp3300_usb_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.1" nom="3.3" map="pac_samples" base_name="pp3300_usb_z1">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_usb_z1" rsense="0.1" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_ez_config</name>
     <doc>Good default config for 'pp3300_usb_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_usb_z1" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_avg_mw</name>
     <doc>Avg power of 'pp3300_usb_z1' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_usb_z1" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_usb_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_usb_z1" tags="accum_clear_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_usb_z1" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_signed</name>
     <doc>Readings are signed for 'pp3300_usb_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.1" nom="3.3" map="yesno" base_name="pp3300_usb_z1">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_usb_z1" rsense="0.1" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_usb_z1_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_mw</name>
     <doc>Power of 'pp3300_ec_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ma</name>
     <doc>Current of 'pp3300_ec_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_res</name>
     <doc>Resolution of 'pp3300_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="2.2" nom="3.3" map="resolution" base_name="pp3300_ec_z1">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_ec_z1" rsense="2.2" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="2.2" nom="3.3" map="yesno" base_name="pp3300_ec_z1">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_ec_z1" rsense="2.2" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_samples</name>
     <doc>Samples per second of 'pp3300_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="2.2" nom="3.3" map="pac_samples" base_name="pp3300_ec_z1">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_ec_z1" rsense="2.2" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ez_config</name>
     <doc>Good default config for 'pp3300_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_ec_z1" tags="adc_ez_config_ctrls" nom="3.3" rsense="2.2">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_avg_mw</name>
     <doc>Avg power of 'pp3300_ec_z1' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_ec_z1" tags="accum_clear_ctrls" nom="3.3" rsense="2.2">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_signed</name>
     <doc>Readings are signed for 'pp3300_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="2.2" nom="3.3" map="yesno" base_name="pp3300_ec_z1">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_ec_z1" rsense="2.2" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="18" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="18" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="18" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="18">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="18" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="18" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_mv</name>
     <doc>Bus Voltage of 'pp1800_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_mw</name>
     <doc>Power of 'pp1800_ec_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ma</name>
     <doc>Current of 'pp1800_ec_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_res</name>
     <doc>Resolution of 'pp1800_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="2.2" nom="1.8" map="resolution" base_name="pp1800_ec_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_ec_z1" rsense="2.2" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="2.2" nom="1.8" map="yesno" base_name="pp1800_ec_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_ec_z1" rsense="2.2" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_samples</name>
     <doc>Samples per second of 'pp1800_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="2.2" nom="1.8" map="pac_samples" base_name="pp1800_ec_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_ec_z1" rsense="2.2" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ez_config</name>
     <doc>Good default config for 'pp1800_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp1800_ec_z1" tags="adc_ez_config_ctrls" nom="1.8" rsense="2.2">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_avg_mw</name>
     <doc>Avg power of 'pp1800_ec_z1' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp1800_ec_z1" tags="accum_clear_ctrls" nom="1.8" rsense="2.2">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_signed</name>
     <doc>Readings are signed for 'pp1800_ec_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="2.2" nom="1.8" map="yesno" base_name="pp1800_ec_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_ec_z1" rsense="2.2" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_mv</name>
     <doc>Bus Voltage of 'pp3300_wwan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_mw</name>
     <doc>Power of 'pp3300_wwan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_ma</name>
     <doc>Current of 'pp3300_wwan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_res</name>
     <doc>Resolution of 'pp3300_wwan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.005" nom="3.3" map="resolution" base_name="pp3300_wwan_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_wwan_x" rsense="0.005" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_wwan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_wwan_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_wwan_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_samples</name>
     <doc>Samples per second of 'pp3300_wwan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.005" nom="3.3" map="pac_samples" base_name="pp3300_wwan_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_wwan_x" rsense="0.005" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_ez_config</name>
     <doc>Good default config for 'pp3300_wwan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_wwan_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_avg_mw</name>
     <doc>Avg power of 'pp3300_wwan_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_wwan_x" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_wwan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_wwan_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_wwan_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_signed</name>
     <doc>Readings are signed for 'pp3300_wwan_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_wwan_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_wwan_x" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_wwan_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_mv</name>
     <doc>Bus Voltage of 'pp3300_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_mw</name>
     <doc>Power of 'pp3300_hdmi_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ma</name>
     <doc>Current of 'pp3300_hdmi_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_res</name>
     <doc>Resolution of 'pp3300_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.02" nom="3.3" map="resolution" base_name="pp3300_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_hdmi_x" rsense="0.02" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_hdmi_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_samples</name>
     <doc>Samples per second of 'pp3300_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.02" nom="3.3" map="pac_samples" base_name="pp3300_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_hdmi_x" rsense="0.02" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ez_config</name>
     <doc>Good default config for 'pp3300_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_hdmi_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_avg_mw</name>
     <doc>Avg power of 'pp3300_hdmi_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_hdmi_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_signed</name>
     <doc>Readings are signed for 'pp3300_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_hdmi_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_mv</name>
     <doc>Bus Voltage of 'pp5000_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_mw</name>
     <doc>Power of 'pp5000_hdmi_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ma</name>
     <doc>Current of 'pp5000_hdmi_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_res</name>
     <doc>Resolution of 'pp5000_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.01" nom="5.0" map="resolution" base_name="pp5000_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp5000_hdmi_x" rsense="0.01" map="resolution" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp5000_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.01" nom="5.0" map="yesno" base_name="pp5000_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp5000_hdmi_x" rsense="0.01" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_samples</name>
     <doc>Samples per second of 'pp5000_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.01" nom="5.0" map="pac_samples" base_name="pp5000_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp5000_hdmi_x" rsense="0.01" map="pac_samples" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ez_config</name>
     <doc>Good default config for 'pp5000_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp5000_hdmi_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_avg_mw</name>
     <doc>Avg power of 'pp5000_hdmi_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp5000_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp5000_hdmi_x" tags="accum_clear_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_signed</name>
     <doc>Readings are signed for 'pp5000_hdmi_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.01" nom="5.0" map="yesno" base_name="pp5000_hdmi_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp5000_hdmi_x" rsense="0.01" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="19" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="19" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="19" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="19">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="19" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="19" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_mv</name>
     <doc>Bus Voltage of 'ppvar_sys_edp' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_mw</name>
     <doc>Power of 'ppvar_sys_edp' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_ma</name>
     <doc>Current of 'ppvar_sys_edp' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_res</name>
     <doc>Resolution of 'ppvar_sys_edp' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.005" nom="9.0" map="resolution" base_name="ppvar_sys_edp">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="ppvar_sys_edp" rsense="0.005" map="resolution" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'ppvar_sys_edp' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.005" nom="9.0" map="yesno" base_name="ppvar_sys_edp">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="ppvar_sys_edp" rsense="0.005" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_samples</name>
     <doc>Samples per second of 'ppvar_sys_edp' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.005" nom="9.0" map="pac_samples" base_name="ppvar_sys_edp">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="ppvar_sys_edp" rsense="0.005" map="pac_samples" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_ez_config</name>
     <doc>Good default config for 'ppvar_sys_edp' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="ppvar_sys_edp" tags="adc_ez_config_ctrls" nom="9.0" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_avg_mw</name>
     <doc>Avg power of 'ppvar_sys_edp' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="ppvar_sys_edp" rsense="0.005" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_acc_clear</name>
     <doc>Clear the accumulator for 'ppvar_sys_edp' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="ppvar_sys_edp" tags="accum_clear_ctrls" nom="9.0" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="9.0" base_name="ppvar_sys_edp" map="yes">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_signed</name>
     <doc>Readings are signed for 'ppvar_sys_edp' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.005" nom="9.0" map="yesno" base_name="ppvar_sys_edp">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="ppvar_sys_edp" rsense="0.005" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>ppvar_sys_edp_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_mv</name>
     <doc>Bus Voltage of 'pp3300_edp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_mw</name>
     <doc>Power of 'pp3300_edp_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ma</name>
     <doc>Current of 'pp3300_edp_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_res</name>
     <doc>Resolution of 'pp3300_edp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.02" nom="3.3" map="resolution" base_name="pp3300_edp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_edp_x" rsense="0.02" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_edp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_edp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_edp_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_samples</name>
     <doc>Samples per second of 'pp3300_edp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.02" nom="3.3" map="pac_samples" base_name="pp3300_edp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_edp_x" rsense="0.02" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ez_config</name>
     <doc>Good default config for 'pp3300_edp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_edp_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_edp_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_avg_mw</name>
     <doc>Avg power of 'pp3300_edp_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_edp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_edp_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_edp_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_signed</name>
     <doc>Readings are signed for 'pp3300_edp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_edp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_edp_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_mv</name>
     <doc>Bus Voltage of 'pp3300_fcam_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_mw</name>
     <doc>Power of 'pp3300_fcam_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_ma</name>
     <doc>Current of 'pp3300_fcam_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_res</name>
     <doc>Resolution of 'pp3300_fcam_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.01" nom="3.3" map="resolution" base_name="pp3300_fcam_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_fcam_x" rsense="0.01" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_fcam_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_fcam_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_fcam_x" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_samples</name>
     <doc>Samples per second of 'pp3300_fcam_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.01" nom="3.3" map="pac_samples" base_name="pp3300_fcam_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_fcam_x" rsense="0.01" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_ez_config</name>
     <doc>Good default config for 'pp3300_fcam_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_fcam_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_avg_mw</name>
     <doc>Avg power of 'pp3300_fcam_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_fcam_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_fcam_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_fcam_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_fcam_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_signed</name>
     <doc>Readings are signed for 'pp3300_fcam_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_fcam_x">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_fcam_x" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_fcam_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_mv</name>
     <doc>Bus Voltage of 'pp3300_hps_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_hps_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_hps_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_mw</name>
     <doc>Power of 'pp3300_hps_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_hps_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_hps_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_ma</name>
     <doc>Current of 'pp3300_hps_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_hps_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_hps_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_res</name>
     <doc>Resolution of 'pp3300_hps_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.01" nom="3.3" map="resolution" base_name="pp3300_hps_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_hps_x" rsense="0.01" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_hps_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_hps_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_hps_x" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_samples</name>
     <doc>Samples per second of 'pp3300_hps_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.01" nom="3.3" map="pac_samples" base_name="pp3300_hps_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_hps_x" rsense="0.01" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_ez_config</name>
     <doc>Good default config for 'pp3300_hps_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_hps_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_hps_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_avg_mw</name>
     <doc>Avg power of 'pp3300_hps_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="3.3" base_name="pp3300_hps_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_hps_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_hps_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_hps_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_hps_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_signed</name>
     <doc>Readings are signed for 'pp3300_hps_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_hps_x">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_hps_x" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="20" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="20" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="20" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="20">
     </params>
   </control>
   <control>
     <name>pp3300_hps_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="20" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="20" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="3.3" base_name="pp3300_sensor_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_sensor_s5" rsense="0.0" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_res</name>
     <doc>Resolution of 'pp3300_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.0" nom="3.3" map="resolution" base_name="pp3300_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp3300_sensor_s5" rsense="0.0" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp3300_sensor_s5" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_samples</name>
     <doc>Samples per second of 'pp3300_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.0" nom="3.3" map="pac_samples" base_name="pp3300_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp3300_sensor_s5" rsense="0.0" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_ez_config</name>
     <doc>Good default config for 'pp3300_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp3300_sensor_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_sensor_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp3300_sensor_s5" tags="accum_clear_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_sensor_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_signed</name>
     <doc>Readings are signed for 'pp3300_sensor_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_sensor_s5">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp3300_sensor_s5" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_mv</name>
     <doc>Bus Voltage of 'pp3300_tchscr_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_mw</name>
     <doc>Power of 'pp3300_tchscr_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ma</name>
     <doc>Current of 'pp3300_tchscr_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_res</name>
     <doc>Resolution of 'pp3300_tchscr_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.02" nom="3.3" map="resolution" base_name="pp3300_tchscr_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_tchscr_x" rsense="0.02" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_tchscr_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_tchscr_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_tchscr_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_samples</name>
     <doc>Samples per second of 'pp3300_tchscr_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.02" nom="3.3" map="pac_samples" base_name="pp3300_tchscr_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_tchscr_x" rsense="0.02" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ez_config</name>
     <doc>Good default config for 'pp3300_tchscr_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_tchscr_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_avg_mw</name>
     <doc>Avg power of 'pp3300_tchscr_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_tchscr_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_tchscr_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_signed</name>
     <doc>Readings are signed for 'pp3300_tchscr_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.02" nom="3.3" map="yesno" base_name="pp3300_tchscr_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_tchscr_x" rsense="0.02" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_mw</name>
     <doc>Power of 'pp1800_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ma</name>
     <doc>Current of 'pp1800_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_res</name>
     <doc>Resolution of 'pp1800_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.005" nom="1.8" map="resolution" base_name="pp1800_s5">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp1800_s5" rsense="0.005" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.005" nom="1.8" map="yesno" base_name="pp1800_s5">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp1800_s5" rsense="0.005" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_samples</name>
     <doc>Samples per second of 'pp1800_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.005" nom="1.8" map="pac_samples" base_name="pp1800_s5">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp1800_s5" rsense="0.005" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ez_config</name>
     <doc>Good default config for 'pp1800_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp1800_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_s5_avg_mw</name>
     <doc>Avg power of 'pp1800_s5' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp1800_s5" tags="accum_clear_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_s5_signed</name>
     <doc>Readings are signed for 'pp1800_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.005" nom="1.8" map="yesno" base_name="pp1800_s5">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp1800_s5" rsense="0.005" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp1800_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp1800_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp1800_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp1800_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp1800_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_mv</name>
     <doc>Bus Voltage of 'pp5000_fan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="5.0" base_name="pp5000_fan">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_fan" rsense="0.0" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_res</name>
     <doc>Resolution of 'pp5000_fan' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.0" nom="5.0" map="resolution" base_name="pp5000_fan">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp5000_fan" rsense="0.0" map="resolution" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp5000_fan' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.0" nom="5.0" map="yesno" base_name="pp5000_fan">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp5000_fan" rsense="0.0" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_samples</name>
     <doc>Samples per second of 'pp5000_fan' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.0" nom="5.0" map="pac_samples" base_name="pp5000_fan">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp5000_fan" rsense="0.0" map="pac_samples" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_ez_config</name>
     <doc>Good default config for 'pp5000_fan' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp5000_fan" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="5.0" base_name="pp5000_fan" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_fan_acc_clear</name>
     <doc>Clear the accumulator for 'pp5000_fan' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp5000_fan" tags="accum_clear_ctrls" nom="5.0" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="5.0" base_name="pp5000_fan" map="yes">
     </params>
   </control>
   <control>
     <name>pp5000_fan_signed</name>
     <doc>Readings are signed for 'pp5000_fan' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.0" nom="5.0" map="yesno" base_name="pp5000_fan">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp5000_fan" rsense="0.0" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp5000_fan_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp5000_fan_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp5000_fan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp5000_fan_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="21" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="21" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_fan_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="21" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="21">
     </params>
   </control>
   <control>
     <name>pp5000_fan_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="21" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="21" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_mv</name>
     <doc>Bus Voltage of 'pp1800_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_mw</name>
     <doc>Power of 'pp1800_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ma</name>
     <doc>Current of 'pp1800_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_res</name>
     <doc>Resolution of 'pp1800_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.01" nom="1.8" map="resolution" base_name="pp1800_dram">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_dram" rsense="0.01" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.01" nom="1.8" map="yesno" base_name="pp1800_dram">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_dram" rsense="0.01" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_samples</name>
     <doc>Samples per second of 'pp1800_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.01" nom="1.8" map="pac_samples" base_name="pp1800_dram">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_dram" rsense="0.01" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ez_config</name>
     <doc>Good default config for 'pp1800_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp1800_dram" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="1.8" base_name="pp1800_dram" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_dram_avg_mw</name>
     <doc>Avg power of 'pp1800_dram' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp1800_dram" tags="accum_clear_ctrls" nom="1.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="1.8" base_name="pp1800_dram" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_dram_signed</name>
     <doc>Readings are signed for 'pp1800_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.01" nom="1.8" map="yesno" base_name="pp1800_dram">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_dram" rsense="0.01" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1800_dram_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1800_dram_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1800_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1800_dram_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1800_dram_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_mv</name>
     <doc>Bus Voltage of 'pp1100_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_mw</name>
     <doc>Power of 'pp1100_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ma</name>
     <doc>Current of 'pp1100_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_res</name>
     <doc>Resolution of 'pp1100_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.002" nom="1.1" map="resolution" base_name="pp1100_dram">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp1100_dram" rsense="0.002" map="resolution" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1100_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.002" nom="1.1" map="yesno" base_name="pp1100_dram">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp1100_dram" rsense="0.002" map="yesno" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_samples</name>
     <doc>Samples per second of 'pp1100_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.002" nom="1.1" map="pac_samples" base_name="pp1100_dram">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp1100_dram" rsense="0.002" map="pac_samples" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ez_config</name>
     <doc>Good default config for 'pp1100_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp1100_dram" tags="adc_ez_config_ctrls" nom="1.1" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.1" base_name="pp1100_dram" map="on">
     </params>
   </control>
   <control>
     <name>pp1100_dram_avg_mw</name>
     <doc>Avg power of 'pp1100_dram' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_acc_clear</name>
     <doc>Clear the accumulator for 'pp1100_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp1100_dram" tags="accum_clear_ctrls" nom="1.1" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.002" nom="1.1" base_name="pp1100_dram" map="yes">
     </params>
   </control>
   <control>
     <name>pp1100_dram_signed</name>
     <doc>Readings are signed for 'pp1100_dram' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.002" nom="1.1" map="yesno" base_name="pp1100_dram">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp1100_dram" rsense="0.002" map="yesno" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1100_dram_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1100_dram_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1100_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1100_dram_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp1100_dram_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_mv</name>
     <doc>Bus Voltage of 'pp0600_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_mw</name>
     <doc>Power of 'pp0600_vddq' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ma</name>
     <doc>Current of 'pp0600_vddq' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_res</name>
     <doc>Resolution of 'pp0600_vddq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.005" nom="0.6" map="resolution" base_name="pp0600_vddq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp0600_vddq" rsense="0.005" map="resolution" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp0600_vddq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.005" nom="0.6" map="yesno" base_name="pp0600_vddq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp0600_vddq" rsense="0.005" map="yesno" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_samples</name>
     <doc>Samples per second of 'pp0600_vddq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.005" nom="0.6" map="pac_samples" base_name="pp0600_vddq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp0600_vddq" rsense="0.005" map="pac_samples" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ez_config</name>
     <doc>Good default config for 'pp0600_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp0600_vddq" tags="adc_ez_config_ctrls" nom="0.6" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="0.6" base_name="pp0600_vddq" map="on">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_avg_mw</name>
     <doc>Avg power of 'pp0600_vddq' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_acc_clear</name>
     <doc>Clear the accumulator for 'pp0600_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp0600_vddq" tags="accum_clear_ctrls" nom="0.6" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="0.6" base_name="pp0600_vddq" map="yes">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_signed</name>
     <doc>Readings are signed for 'pp0600_vddq' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.005" nom="0.6" map="yesno" base_name="pp0600_vddq">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp0600_vddq" rsense="0.005" map="yesno" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_mv</name>
     <doc>Bus Voltage of 'ppvar_vccin_aux' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_mw</name>
     <doc>Power of 'ppvar_vccin_aux' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ma</name>
     <doc>Current of 'ppvar_vccin_aux' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_res</name>
     <doc>Resolution of 'ppvar_vccin_aux' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.002" nom="9.0" map="resolution" base_name="ppvar_vccin_aux">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="ppvar_vccin_aux" rsense="0.002" map="resolution" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'ppvar_vccin_aux' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.002" nom="9.0" map="yesno" base_name="ppvar_vccin_aux">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="ppvar_vccin_aux" rsense="0.002" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_samples</name>
     <doc>Samples per second of 'ppvar_vccin_aux' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.002" nom="9.0" map="pac_samples" base_name="ppvar_vccin_aux">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="ppvar_vccin_aux" rsense="0.002" map="pac_samples" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ez_config</name>
     <doc>Good default config for 'ppvar_vccin_aux' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls" nom="9.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_avg_mw</name>
     <doc>Avg power of 'ppvar_vccin_aux' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="ppvar_vccin_aux" rsense="0.002" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_acc_clear</name>
     <doc>Clear the accumulator for 'ppvar_vccin_aux' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="ppvar_vccin_aux" tags="accum_clear_ctrls" nom="9.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.002" nom="9.0" base_name="ppvar_vccin_aux" map="yes">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_signed</name>
     <doc>Readings are signed for 'ppvar_vccin_aux' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.002" nom="9.0" map="yesno" base_name="ppvar_vccin_aux">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="ppvar_vccin_aux" rsense="0.002" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="22" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="22" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="22" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="22">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="22" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="22" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_mv</name>
     <doc>Bus Voltage of 'pp5000_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_mw</name>
     <doc>Power of 'pp5000_tchpad_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ma</name>
     <doc>Current of 'pp5000_tchpad_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_res</name>
     <doc>Resolution of 'pp5000_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.01" nom="5.0" map="resolution" base_name="pp5000_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp5000_tchpad_x" rsense="0.01" map="resolution" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp5000_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.01" nom="5.0" map="yesno" base_name="pp5000_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp5000_tchpad_x" rsense="0.01" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_samples</name>
     <doc>Samples per second of 'pp5000_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.01" nom="5.0" map="pac_samples" base_name="pp5000_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp5000_tchpad_x" rsense="0.01" map="pac_samples" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ez_config</name>
     <doc>Good default config for 'pp5000_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp5000_tchpad_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_avg_mw</name>
     <doc>Avg power of 'pp5000_tchpad_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp5000_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp5000_tchpad_x" tags="accum_clear_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_signed</name>
     <doc>Readings are signed for 'pp5000_tchpad_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.01" nom="5.0" map="yesno" base_name="pp5000_tchpad_x">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp5000_tchpad_x" rsense="0.01" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_rtc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.0" nom="3.3" base_name="pp3300_rtc_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_rtc_z2" rsense="0.0" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_res</name>
     <doc>Resolution of 'pp3300_rtc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.0" nom="3.3" map="resolution" base_name="pp3300_rtc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_rtc_z2" rsense="0.0" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_rtc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_rtc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_rtc_z2" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_samples</name>
     <doc>Samples per second of 'pp3300_rtc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.0" nom="3.3" map="pac_samples" base_name="pp3300_rtc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_rtc_z2" rsense="0.0" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_ez_config</name>
     <doc>Good default config for 'pp3300_rtc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_rtc_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_rtc_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_rtc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_rtc_z2" tags="accum_clear_ctrls" nom="3.3" rsense="0.0">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.0" nom="3.3" base_name="pp3300_rtc_z2" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_signed</name>
     <doc>Readings are signed for 'pp3300_rtc_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.0" nom="3.3" map="yesno" base_name="pp3300_rtc_z2">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_rtc_z2" rsense="0.0" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_mw</name>
     <doc>Power of 'pp3300_z2' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_ma</name>
     <doc>Current of 'pp3300_z2' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_res</name>
     <doc>Resolution of 'pp3300_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.01" nom="3.3" map="resolution" base_name="pp3300_z2">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_z2" rsense="0.01" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_z2">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_z2" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_samples</name>
     <doc>Samples per second of 'pp3300_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.01" nom="3.3" map="pac_samples" base_name="pp3300_z2">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_z2" rsense="0.01" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_ez_config</name>
     <doc>Good default config for 'pp3300_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_z2_avg_mw</name>
     <doc>Avg power of 'pp3300_z2' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="3.3" base_name="pp3300_z2">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_z2" tags="accum_clear_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_z2" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_z2_signed</name>
     <doc>Readings are signed for 'pp3300_z2' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_z2">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_z2" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_z2_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_z2_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_z2_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_z2_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_z2_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_z2_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mw</name>
     <doc>Power of 'pp3300_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ma</name>
     <doc>Current of 'pp3300_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_res</name>
     <doc>Resolution of 'pp3300_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.005" nom="3.3" map="resolution" base_name="pp3300_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_s5" rsense="0.005" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_s5" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_samples</name>
     <doc>Samples per second of 'pp3300_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.005" nom="3.3" map="pac_samples" base_name="pp3300_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_s5" rsense="0.005" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ez_config</name>
     <doc>Good default config for 'pp3300_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_s5_avg_mw</name>
     <doc>Avg power of 'pp3300_s5' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_s5" tags="accum_clear_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_s5" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_s5_signed</name>
     <doc>Readings are signed for 'pp3300_s5' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.005" nom="3.3" map="yesno" base_name="pp3300_s5">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_s5" rsense="0.005" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_s5_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_s5_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_s5_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="23" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="23" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="23" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="23">
     </params>
   </control>
   <control>
     <name>pp3300_s5_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="23" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="23" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mv</name>
     <doc>Bus Voltage of 'pp5000_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mw</name>
     <doc>Power of 'pp5000_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ma</name>
     <doc>Current of 'pp5000_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_res</name>
     <doc>Resolution of 'pp5000_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.002" nom="5.0" map="resolution" base_name="pp5000_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp5000_z1" rsense="0.002" map="resolution" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp5000_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.002" nom="5.0" map="yesno" base_name="pp5000_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp5000_z1" rsense="0.002" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_samples</name>
     <doc>Samples per second of 'pp5000_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.002" nom="5.0" map="pac_samples" base_name="pp5000_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp5000_z1" rsense="0.002" map="pac_samples" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ez_config</name>
     <doc>Good default config for 'pp5000_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp5000_z1" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="5.0" base_name="pp5000_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_z1_avg_mw</name>
     <doc>Avg power of 'pp5000_z1' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.002" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp5000_z1" rsense="0.002" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_acc_clear</name>
     <doc>Clear the accumulator for 'pp5000_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp5000_z1" tags="accum_clear_ctrls" nom="5.0" rsense="0.002">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.002" nom="5.0" base_name="pp5000_z1" map="yes">
     </params>
   </control>
   <control>
     <name>pp5000_z1_signed</name>
     <doc>Readings are signed for 'pp5000_z1' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.002" nom="5.0" map="yesno" base_name="pp5000_z1">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp5000_z1" rsense="0.002" map="yesno" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp5000_z1_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp5000_z1_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp5000_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp5000_z1_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp5000_z1_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_mv</name>
     <doc>Bus Voltage of 'ppvar_sys_sd' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_mw</name>
     <doc>Power of 'ppvar_sys_sd' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_ma</name>
     <doc>Current of 'ppvar_sys_sd' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_res</name>
     <doc>Resolution of 'ppvar_sys_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.01" nom="9.0" map="resolution" base_name="ppvar_sys_sd">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="ppvar_sys_sd" rsense="0.01" map="resolution" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'ppvar_sys_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.01" nom="9.0" map="yesno" base_name="ppvar_sys_sd">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="ppvar_sys_sd" rsense="0.01" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_samples</name>
     <doc>Samples per second of 'ppvar_sys_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.01" nom="9.0" map="pac_samples" base_name="ppvar_sys_sd">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="ppvar_sys_sd" rsense="0.01" map="pac_samples" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_ez_config</name>
     <doc>Good default config for 'ppvar_sys_sd' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="ppvar_sys_sd" tags="adc_ez_config_ctrls" nom="9.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_avg_mw</name>
     <doc>Avg power of 'ppvar_sys_sd' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="ppvar_sys_sd" rsense="0.01" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_acc_clear</name>
     <doc>Clear the accumulator for 'ppvar_sys_sd' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="ppvar_sys_sd" tags="accum_clear_ctrls" nom="9.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="9.0" base_name="ppvar_sys_sd" map="yes">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_signed</name>
     <doc>Readings are signed for 'ppvar_sys_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.01" nom="9.0" map="yesno" base_name="ppvar_sys_sd">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="ppvar_sys_sd" rsense="0.01" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_sys_sd_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_mv</name>
     <doc>Bus Voltage of 'pp3300_s5_sd' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_mw</name>
     <doc>Power of 'pp3300_s5_sd' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_ma</name>
     <doc>Current of 'pp3300_s5_sd' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_res</name>
     <doc>Resolution of 'pp3300_s5_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.01" nom="3.3" map="resolution" base_name="pp3300_s5_sd">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="pp3300_s5_sd" rsense="0.01" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_s5_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_s5_sd">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="pp3300_s5_sd" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_samples</name>
     <doc>Samples per second of 'pp3300_s5_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.01" nom="3.3" map="pac_samples" base_name="pp3300_s5_sd">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="pp3300_s5_sd" rsense="0.01" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_ez_config</name>
     <doc>Good default config for 'pp3300_s5_sd' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="pp3300_s5_sd" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_avg_mw</name>
     <doc>Avg power of 'pp3300_s5_sd' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_s5_sd" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_s5_sd' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="pp3300_s5_sd" tags="accum_clear_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_s5_sd" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_signed</name>
     <doc>Readings are signed for 'pp3300_s5_sd' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_s5_sd">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="pp3300_s5_sd" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>pp3300_s5_sd_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_kb_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mw</name>
     <doc>Power of 'ppvar_kb_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ma</name>
     <doc>Current of 'ppvar_kb_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_res</name>
     <doc>Resolution of 'ppvar_kb_bl' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.02" nom="9.0" map="resolution" base_name="ppvar_kb_bl">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="ppvar_kb_bl" rsense="0.02" map="resolution" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'ppvar_kb_bl' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.02" nom="9.0" map="yesno" base_name="ppvar_kb_bl">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="ppvar_kb_bl" rsense="0.02" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_samples</name>
     <doc>Samples per second of 'ppvar_kb_bl' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.02" nom="9.0" map="pac_samples" base_name="ppvar_kb_bl">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="ppvar_kb_bl" rsense="0.02" map="pac_samples" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ez_config</name>
     <doc>Good default config for 'ppvar_kb_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls" nom="9.0" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_avg_mw</name>
     <doc>Avg power of 'ppvar_kb_bl' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="ppvar_kb_bl" rsense="0.02" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_acc_clear</name>
     <doc>Clear the accumulator for 'ppvar_kb_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="ppvar_kb_bl" tags="accum_clear_ctrls" nom="9.0" rsense="0.02">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.02" nom="9.0" base_name="ppvar_kb_bl" map="yes">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_signed</name>
     <doc>Readings are signed for 'ppvar_kb_bl' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.02" nom="9.0" map="yesno" base_name="ppvar_kb_bl">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="ppvar_kb_bl" rsense="0.02" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="24" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="24" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="24" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="24">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="24" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="24" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_mv</name>
     <doc>Bus Voltage of 'pp1800_fp_sens' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_mw</name>
     <doc>Power of 'pp1800_fp_sens' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_ma</name>
     <doc>Current of 'pp1800_fp_sens' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_res</name>
     <doc>Resolution of 'pp1800_fp_sens' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" rsense="0.5" nom="1.8" map="resolution" base_name="pp1800_fp_sens">
+    <params interface="servo" drv="pac1934" channel="0" subtype="resolution" base_name="pp1800_fp_sens" rsense="0.5" map="resolution" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp1800_fp_sens' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="slow" rsense="0.5" nom="1.8" map="yesno" base_name="pp1800_fp_sens">
+    <params interface="servo" drv="pac1934" channel="0" subtype="slow" base_name="pp1800_fp_sens" rsense="0.5" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_samples</name>
     <doc>Samples per second of 'pp1800_fp_sens' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="samples" rsense="0.5" nom="1.8" map="pac_samples" base_name="pp1800_fp_sens">
+    <params interface="servo" drv="pac1934" channel="0" subtype="samples" base_name="pp1800_fp_sens" rsense="0.5" map="pac_samples" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_ez_config</name>
     <doc>Good default config for 'pp1800_fp_sens' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" map="on" base_name="pp1800_fp_sens" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.5">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_avg_mw</name>
     <doc>Avg power of 'pp1800_fp_sens' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens">
+    <params cmd="get" interface="servo" drv="pac1934" channel="0" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp1800_fp_sens" rsense="0.5" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_acc_clear</name>
     <doc>Clear the accumulator for 'pp1800_fp_sens' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" map="yes" base_name="pp1800_fp_sens" tags="accum_clear_ctrls" nom="1.8" rsense="0.5">
+    <params cmd="set" interface="servo" drv="pac1934" channel="0" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.5" nom="1.8" base_name="pp1800_fp_sens" map="yes">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_signed</name>
     <doc>Readings are signed for 'pp1800_fp_sens' rail</doc>
-    <params interface="servo" drv="pac1934" channel="0" subtype="signed" rsense="0.5" nom="1.8" map="yesno" base_name="pp1800_fp_sens">
+    <params interface="servo" drv="pac1934" channel="0" subtype="signed" base_name="pp1800_fp_sens" rsense="0.5" map="yesno" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="6" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="3" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="19">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="19" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="4" offset="23">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="23" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp1800_fp_sens_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_mv</name>
     <doc>Bus Voltage of 'pp3300_fp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_mw</name>
     <doc>Power of 'pp3300_fp_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ma</name>
     <doc>Current of 'pp3300_fp_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_res</name>
     <doc>Resolution of 'pp3300_fp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" rsense="0.5" nom="3.3" map="resolution" base_name="pp3300_fp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="resolution" base_name="pp3300_fp_x" rsense="0.5" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_fp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="slow" rsense="0.5" nom="3.3" map="yesno" base_name="pp3300_fp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="slow" base_name="pp3300_fp_x" rsense="0.5" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_samples</name>
     <doc>Samples per second of 'pp3300_fp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="samples" rsense="0.5" nom="3.3" map="pac_samples" base_name="pp3300_fp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="samples" base_name="pp3300_fp_x" rsense="0.5" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ez_config</name>
     <doc>Good default config for 'pp3300_fp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" map="on" base_name="pp3300_fp_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.5">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="3.3" base_name="pp3300_fp_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_avg_mw</name>
     <doc>Avg power of 'pp3300_fp_x' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="pac1934" channel="1" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_fp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" map="yes" base_name="pp3300_fp_x" tags="accum_clear_ctrls" nom="3.3" rsense="0.5">
+    <params cmd="set" interface="servo" drv="pac1934" channel="1" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.5" nom="3.3" base_name="pp3300_fp_x" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_signed</name>
     <doc>Readings are signed for 'pp3300_fp_x' rail</doc>
-    <params interface="servo" drv="pac1934" channel="1" subtype="signed" rsense="0.5" nom="3.3" map="yesno" base_name="pp3300_fp_x">
+    <params interface="servo" drv="pac1934" channel="1" subtype="signed" base_name="pp3300_fp_x" rsense="0.5" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="6" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="4" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="16">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="16" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="20">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="20" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="4" offset="24">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="24" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_mv</name>
     <doc>Bus Voltage of 'ppvar_vbus_in' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_mw</name>
     <doc>Power of 'ppvar_vbus_in' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliwatts" tags="power_rail" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ma</name>
     <doc>Current of 'ppvar_vbus_in' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="milliamps" tags="current_rail" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_res</name>
     <doc>Resolution of 'ppvar_vbus_in' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" rsense="0.001" nom="9.0" map="resolution" base_name="ppvar_vbus_in">
+    <params interface="servo" drv="pac1934" channel="2" subtype="resolution" base_name="ppvar_vbus_in" rsense="0.001" map="resolution" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'ppvar_vbus_in' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="slow" rsense="0.001" nom="9.0" map="yesno" base_name="ppvar_vbus_in">
+    <params interface="servo" drv="pac1934" channel="2" subtype="slow" base_name="ppvar_vbus_in" rsense="0.001" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_samples</name>
     <doc>Samples per second of 'ppvar_vbus_in' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="samples" rsense="0.001" nom="9.0" map="pac_samples" base_name="ppvar_vbus_in">
+    <params interface="servo" drv="pac1934" channel="2" subtype="samples" base_name="ppvar_vbus_in" rsense="0.001" map="pac_samples" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ez_config</name>
     <doc>Good default config for 'ppvar_vbus_in' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" map="on" base_name="ppvar_vbus_in" tags="adc_ez_config_ctrls" nom="9.0" rsense="0.001">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_avg_mw</name>
     <doc>Avg power of 'ppvar_vbus_in' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in">
+    <params cmd="get" interface="servo" drv="pac1934" channel="2" subtype="accum_milliwatts" tags="avg_power_rails" base_name="ppvar_vbus_in" rsense="0.001" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_acc_clear</name>
     <doc>Clear the accumulator for 'ppvar_vbus_in' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" map="yes" base_name="ppvar_vbus_in" tags="accum_clear_ctrls" nom="9.0" rsense="0.001">
+    <params cmd="set" interface="servo" drv="pac1934" channel="2" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.001" nom="9.0" base_name="ppvar_vbus_in" map="yes">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_signed</name>
     <doc>Readings are signed for 'ppvar_vbus_in' rail</doc>
-    <params interface="servo" drv="pac1934" channel="2" subtype="signed" rsense="0.001" nom="9.0" map="yesno" base_name="ppvar_vbus_in">
+    <params interface="servo" drv="pac1934" channel="2" subtype="signed" base_name="ppvar_vbus_in" rsense="0.001" map="yesno" nom="9.0">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="6" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="5" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="17">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="17" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="21">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="21" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="4" offset="25">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="25" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>ppvar_vbus_in_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_mv</name>
     <doc>Bus Voltage of 'pp3300_adc_dbg' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_mw</name>
     <doc>Power of 'pp3300_adc_dbg' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliwatts" tags="power_rail" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_ma</name>
     <doc>Current of 'pp3300_adc_dbg' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="milliamps" tags="current_rail" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_res</name>
     <doc>Resolution of 'pp3300_adc_dbg' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" rsense="0.01" nom="3.3" map="resolution" base_name="pp3300_adc_dbg">
+    <params interface="servo" drv="pac1934" channel="3" subtype="resolution" base_name="pp3300_adc_dbg" rsense="0.01" map="resolution" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_slow_enabled</name>
     <doc>Slow pin ctrl enabled on 'pp3300_adc_dbg' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="slow" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_adc_dbg">
+    <params interface="servo" drv="pac1934" channel="3" subtype="slow" base_name="pp3300_adc_dbg" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_samples</name>
     <doc>Samples per second of 'pp3300_adc_dbg' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="samples" rsense="0.01" nom="3.3" map="pac_samples" base_name="pp3300_adc_dbg">
+    <params interface="servo" drv="pac1934" channel="3" subtype="samples" base_name="pp3300_adc_dbg" rsense="0.01" map="pac_samples" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_ez_config</name>
     <doc>Good default config for 'pp3300_adc_dbg' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" map="on" base_name="pp3300_adc_dbg" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_avg_mw</name>
     <doc>Avg power of 'pp3300_adc_dbg' rail in milliwatts since last clearing the accumulator</doc>
-    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg">
+    <params cmd="get" interface="servo" drv="pac1934" channel="3" subtype="accum_milliwatts" tags="avg_power_rails" base_name="pp3300_adc_dbg" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_acc_clear</name>
     <doc>Clear the accumulator for 'pp3300_adc_dbg' rail</doc>
-    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" map="yes" base_name="pp3300_adc_dbg" tags="accum_clear_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="pac1934" channel="3" subtype="acc_clear" tags="accum_clear_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_adc_dbg" map="yes">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_signed</name>
     <doc>Readings are signed for 'pp3300_adc_dbg' rail</doc>
-    <params interface="servo" drv="pac1934" channel="3" subtype="signed" rsense="0.01" nom="3.3" map="yesno" base_name="pp3300_adc_dbg">
+    <params interface="servo" drv="pac1934" channel="3" subtype="signed" base_name="pp3300_adc_dbg" rsense="0.01" map="yesno" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_refresh_reg</name>
     <doc>Raw register value of refresh on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="0" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="0" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_ctrl_reg</name>
     <doc>Raw register value of ctrl on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="1" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_acc_count_reg</name>
     <doc>Raw register value of acc_count on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="3" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="3" offset="2" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_acc_pwr_reg</name>
     <doc>Raw register value of acc_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="6" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="6" offset="6" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="18">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="18" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="2" offset="22">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="22" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="4" offset="26">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="4" offset="26" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_neg_pwr_reg</name>
     <doc>Raw register value of neg_pwr on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="29">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="29" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_refresh_v_reg</name>
     <doc>Raw register value of refresh_v on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" write_only="" map="refresh" c2d2_interface="4" fmt="hex" addr="25" reg_len="0" offset="31" no_read="">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="0" offset="31" c2d2_interface="4" addr="25" no_read="" map="refresh" write_only="">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_ctrl_act_reg</name>
     <doc>Raw register value of ctrl_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="25" reg_len="1" offset="33">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="33" c2d2_interface="4" addr="25">
     </params>
   </control>
   <control>
     <name>pp3300_adc_dbg_neg_pwr_act_reg</name>
     <doc>Raw register value of neg_pwr_act on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" read_only="" addr="25" reg_len="1" offset="35">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="1" offset="35" c2d2_interface="4" addr="25" read_only="">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rw0.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rw0.xml
index bff7d2d..e71c1d7 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rw0.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rw0.xml
@@ -1,2191 +1,2191 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:47 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:16 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>ppvar_vccin_aux_mv</name>
     <doc>Bus Voltage of 'ppvar_vccin_aux' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.1" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_mw</name>
     <doc>Power of 'ppvar_vccin_aux' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.1" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ma</name>
     <doc>Current of 'ppvar_vccin_aux' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.1" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vccin_aux' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.1" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ez_config</name>
     <doc>Good default config for 'ppvar_vccin_aux' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls" nom="1.1" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.1" base_name="ppvar_vccin_aux" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_soc_s5" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_mw</name>
     <doc>Power of 'pp1800_soc_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_soc_s5" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ma</name>
     <doc>Current of 'pp1800_soc_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_soc_s5" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_soc_s5" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ez_config</name>
     <doc>Good default config for 'pp1800_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_soc_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="1.8" base_name="pp1800_soc_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_soc_s5" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_mw</name>
     <doc>Power of 'pp3300_soc_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_soc_s5" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ma</name>
     <doc>Current of 'pp3300_soc_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_soc_s5" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_soc_s5" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ez_config</name>
     <doc>Good default config for 'pp3300_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_soc_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_soc_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_rtc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_rtc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_rtc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_mw</name>
     <doc>Power of 'pp3300_rtc_z2' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_rtc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_rtc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_ma</name>
     <doc>Current of 'pp3300_rtc_z2' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_rtc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_rtc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_rtc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_rtc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_rtc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_ez_config</name>
     <doc>Good default config for 'pp3300_rtc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_rtc_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_rtc_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_dram_mv</name>
     <doc>Bus Voltage of 'pp1800_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_mw</name>
     <doc>Power of 'pp1800_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ma</name>
     <doc>Current of 'pp1800_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ez_config</name>
     <doc>Good default config for 'pp1800_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_dram" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="1.8" base_name="pp1800_dram" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_dram_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_dram_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_mv</name>
     <doc>Bus Voltage of 'pp1100_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_mw</name>
     <doc>Power of 'pp1100_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ma</name>
     <doc>Current of 'pp1100_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_shuntmv</name>
     <doc>Shunt Voltage of 'pp1100_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ez_config</name>
     <doc>Good default config for 'pp1100_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1100_dram" tags="adc_ez_config_ctrls" nom="1.1" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.1" base_name="pp1100_dram" map="on">
     </params>
   </control>
   <control>
     <name>pp1100_dram_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1100_dram_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_mv</name>
     <doc>Bus Voltage of 'pp0600_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_mw</name>
     <doc>Power of 'pp0600_vddq' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ma</name>
     <doc>Current of 'pp0600_vddq' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_shuntmv</name>
     <doc>Shunt Voltage of 'pp0600_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ez_config</name>
     <doc>Good default config for 'pp0600_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp0600_vddq" tags="adc_ez_config_ctrls" nom="0.6" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="0.6" base_name="pp0600_vddq" map="on">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_mv</name>
     <doc>Bus Voltage of 'pp3300_ssd_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ssd_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_mw</name>
     <doc>Power of 'pp3300_ssd_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ssd_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ma</name>
     <doc>Current of 'pp3300_ssd_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ssd_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ssd_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ssd_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ez_config</name>
     <doc>Good default config for 'pp3300_ssd_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_ssd_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_ssd_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mw</name>
     <doc>Power of 'pp3300_wlan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ma</name>
     <doc>Current of 'pp3300_wlan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_wlan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_wlan_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ez_config</name>
     <doc>Good default config for 'pp3300_wlan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_wlan_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_mv</name>
     <doc>Bus Voltage of 'ppvar_wwan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_wwan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_wwan_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_mw</name>
     <doc>Power of 'ppvar_wwan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="ppvar_wwan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_wwan_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_ma</name>
     <doc>Current of 'ppvar_wwan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="ppvar_wwan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_wwan_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_wwan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_wwan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_wwan_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_ez_config</name>
     <doc>Good default config for 'ppvar_wwan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_wwan_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="ppvar_wwan_x" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_sensor_s5" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_mw</name>
     <doc>Power of 'pp1800_sensor_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_sensor_s5" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_ma</name>
     <doc>Current of 'pp1800_sensor_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_sensor_s5" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_sensor_s5" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_ez_config</name>
     <doc>Good default config for 'pp1800_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_sensor_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_sensor_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_mv</name>
     <doc>Bus Voltage of 'pp5000_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_mw</name>
     <doc>Power of 'pp5000_hdmi_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ma</name>
     <doc>Current of 'pp5000_hdmi_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ez_config</name>
     <doc>Good default config for 'pp5000_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp5000_hdmi_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_mv</name>
     <doc>Bus Voltage of 'pp3300_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_mw</name>
     <doc>Power of 'pp3300_hdmi_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ma</name>
     <doc>Current of 'pp3300_hdmi_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ez_config</name>
     <doc>Good default config for 'pp3300_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_hdmi_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_mw</name>
     <doc>Power of 'pp3300_ec_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ma</name>
     <doc>Current of 'pp3300_ec_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ez_config</name>
     <doc>Good default config for 'pp3300_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_ec_z1" tags="adc_ez_config_ctrls" nom="3.3" rsense="2.2">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_ec_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_mw</name>
     <doc>Power of 'pp3300_ec_z2' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_ec_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ec_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_ma</name>
     <doc>Current of 'pp3300_ec_z2' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_ec_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ec_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ec_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_ec_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ec_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_ez_config</name>
     <doc>Good default config for 'pp3300_ec_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_ec_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_ec_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_mv</name>
     <doc>Bus Voltage of 'pp1800_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_mw</name>
     <doc>Power of 'pp1800_ec_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ma</name>
     <doc>Current of 'pp1800_ec_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ez_config</name>
     <doc>Good default config for 'pp1800_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_ec_z1" tags="adc_ez_config_ctrls" nom="1.8" rsense="2.2">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_mv</name>
     <doc>Bus Voltage of 'ppvar_ec_vref_peci' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_ec_vref_peci">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_ec_vref_peci" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_mw</name>
     <doc>Power of 'ppvar_ec_vref_peci' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="ppvar_ec_vref_peci">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_ec_vref_peci" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_ma</name>
     <doc>Current of 'ppvar_ec_vref_peci' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="ppvar_ec_vref_peci">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_ec_vref_peci" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_ec_vref_peci' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_ec_vref_peci">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_ec_vref_peci" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_ez_config</name>
     <doc>Good default config for 'ppvar_ec_vref_peci' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_ec_vref_peci" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="ppvar_ec_vref_peci" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_mv</name>
     <doc>Bus Voltage of 'ppvar_b' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_b">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_b" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_b_mw</name>
     <doc>Power of 'ppvar_b' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="ppvar_b">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_b" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_b_ma</name>
     <doc>Current of 'ppvar_b' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="ppvar_b">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_b" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_b_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_b' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_b">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_b" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_b_ez_config</name>
     <doc>Good default config for 'ppvar_b' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_b" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="ppvar_b" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_b_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_b_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_mv</name>
     <doc>Bus Voltage of 'pp3300_edp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_mw</name>
     <doc>Power of 'pp3300_edp_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ma</name>
     <doc>Current of 'pp3300_edp_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_edp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ez_config</name>
     <doc>Good default config for 'pp3300_edp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_edp_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_edp_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_sensor_s5" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_mw</name>
     <doc>Power of 'pp3300_sensor_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_sensor_s5" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_ma</name>
     <doc>Current of 'pp3300_sensor_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_sensor_s5" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_sensor_s5" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_ez_config</name>
     <doc>Good default config for 'pp3300_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_sensor_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_sensor_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_mv</name>
     <doc>Bus Voltage of 'pp3300_tchscr_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_mw</name>
     <doc>Power of 'pp3300_tchscr_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ma</name>
     <doc>Current of 'pp3300_tchscr_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_tchscr_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ez_config</name>
     <doc>Good default config for 'pp3300_tchscr_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_tchscr_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_mv</name>
     <doc>Bus Voltage of 'pp5000_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_mw</name>
     <doc>Power of 'pp5000_tchpad_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ma</name>
     <doc>Current of 'pp5000_tchpad_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ez_config</name>
     <doc>Good default config for 'pp5000_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp5000_tchpad_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_mv</name>
     <doc>Bus Voltage of 'pp3300_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_mw</name>
     <doc>Power of 'pp3300_tchpad_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ma</name>
     <doc>Current of 'pp3300_tchpad_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ez_config</name>
     <doc>Good default config for 'pp3300_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_tchpad_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_mv</name>
     <doc>Bus Voltage of 'pp5000_fan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="5.0" base_name="pp5000_fan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_fan_x" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_mw</name>
     <doc>Power of 'pp5000_fan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="5.0" base_name="pp5000_fan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_fan_x" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_ma</name>
     <doc>Current of 'pp5000_fan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="5.0" base_name="pp5000_fan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_fan_x" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_fan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="5.0" base_name="pp5000_fan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_fan_x" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_ez_config</name>
     <doc>Good default config for 'pp5000_fan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp5000_fan_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="5.0" base_name="pp5000_fan_x" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_mw</name>
     <doc>Power of 'pp1800_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ma</name>
     <doc>Current of 'pp1800_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ez_config</name>
     <doc>Good default config for 'pp1800_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mw</name>
     <doc>Power of 'pp3300_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ma</name>
     <doc>Current of 'pp3300_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ez_config</name>
     <doc>Good default config for 'pp3300_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mv</name>
     <doc>Bus Voltage of 'pp5000_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_z1" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mw</name>
     <doc>Power of 'pp5000_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_z1" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ma</name>
     <doc>Current of 'pp5000_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_z1" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_z1" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ez_config</name>
     <doc>Good default config for 'pp5000_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp5000_z1" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_z1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_z1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mv</name>
     <doc>Bus Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mw</name>
     <doc>Power of 'ppvar_sys' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ma</name>
     <doc>Current of 'ppvar_sys' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sys" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sys" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ez_config</name>
     <doc>Good default config for 'ppvar_sys' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_sys" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="ppvar_sys" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="71" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="71">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rw1.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rw1.xml
index a7ca9db..7c33f53 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rw1.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/brya_rw1.xml
@@ -1,2425 +1,2425 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:54 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:25 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>ppvar_vccin_aux_mv</name>
     <doc>Bus Voltage of 'ppvar_vccin_aux' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.1" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_mw</name>
     <doc>Power of 'ppvar_vccin_aux' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.1" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ma</name>
     <doc>Current of 'ppvar_vccin_aux' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.1" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vccin_aux' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.1" base_name="ppvar_vccin_aux">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vccin_aux" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_ez_config</name>
     <doc>Good default config for 'ppvar_vccin_aux' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_vccin_aux" tags="adc_ez_config_ctrls" nom="1.1" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.1" base_name="ppvar_vccin_aux" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>ppvar_vccin_aux_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_soc_s5" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_mw</name>
     <doc>Power of 'pp1800_soc_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_soc_s5" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ma</name>
     <doc>Current of 'pp1800_soc_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_soc_s5" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="1.8" base_name="pp1800_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_soc_s5" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_ez_config</name>
     <doc>Good default config for 'pp1800_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_soc_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="1.8" base_name="pp1800_soc_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_soc_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_soc_s5" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_mw</name>
     <doc>Power of 'pp3300_soc_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_soc_s5" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ma</name>
     <doc>Current of 'pp3300_soc_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_soc_s5" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_soc_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_soc_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_soc_s5" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_ez_config</name>
     <doc>Good default config for 'pp3300_soc_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_soc_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_soc_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_soc_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_rtc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_rtc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_rtc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_mw</name>
     <doc>Power of 'pp3300_rtc_z2' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_rtc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_rtc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_ma</name>
     <doc>Current of 'pp3300_rtc_z2' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_rtc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_rtc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_rtc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_rtc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_rtc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_ez_config</name>
     <doc>Good default config for 'pp3300_rtc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_rtc_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_rtc_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_rtc_z2_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_dram_mv</name>
     <doc>Bus Voltage of 'pp1800_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_mw</name>
     <doc>Power of 'pp1800_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ma</name>
     <doc>Current of 'pp1800_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="1.8" base_name="pp1800_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_dram" rsense="0.01" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_dram_ez_config</name>
     <doc>Good default config for 'pp1800_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_dram" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="1.8" base_name="pp1800_dram" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_dram_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_dram_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1800_dram_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_mv</name>
     <doc>Bus Voltage of 'pp1100_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_mw</name>
     <doc>Power of 'pp1100_dram' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ma</name>
     <doc>Current of 'pp1100_dram' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_shuntmv</name>
     <doc>Shunt Voltage of 'pp1100_dram' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.002" nom="1.1" base_name="pp1100_dram">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1100_dram" rsense="0.002" nom="1.1">
     </params>
   </control>
   <control>
     <name>pp1100_dram_ez_config</name>
     <doc>Good default config for 'pp1100_dram' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1100_dram" tags="adc_ez_config_ctrls" nom="1.1" rsense="0.002">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.002" nom="1.1" base_name="pp1100_dram" map="on">
     </params>
   </control>
   <control>
     <name>pp1100_dram_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1100_dram_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1100_dram_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_mv</name>
     <doc>Bus Voltage of 'pp0600_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_mw</name>
     <doc>Power of 'pp0600_vddq' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ma</name>
     <doc>Current of 'pp0600_vddq' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_shuntmv</name>
     <doc>Shunt Voltage of 'pp0600_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="0.6" base_name="pp0600_vddq">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp0600_vddq" rsense="0.005" nom="0.6">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_ez_config</name>
     <doc>Good default config for 'pp0600_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp0600_vddq" tags="adc_ez_config_ctrls" nom="0.6" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="0.6" base_name="pp0600_vddq" map="on">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp0600_vddq_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_mv</name>
     <doc>Bus Voltage of 'pp3300_ssd_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ssd_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_mw</name>
     <doc>Power of 'pp3300_ssd_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ssd_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ma</name>
     <doc>Current of 'pp3300_ssd_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ssd_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ssd_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_ssd_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ssd_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_ez_config</name>
     <doc>Good default config for 'pp3300_ssd_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_ssd_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_ssd_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_ssd_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_mw</name>
     <doc>Power of 'pp3300_wlan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ma</name>
     <doc>Current of 'pp3300_wlan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_wlan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_wlan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_wlan_x" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_ez_config</name>
     <doc>Good default config for 'pp3300_wlan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_wlan_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_wlan_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_mv</name>
     <doc>Bus Voltage of 'ppvar_wwan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_wwan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_wwan_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_mw</name>
     <doc>Power of 'ppvar_wwan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="ppvar_wwan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_wwan_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_ma</name>
     <doc>Current of 'ppvar_wwan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="ppvar_wwan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_wwan_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_wwan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_wwan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_wwan_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_ez_config</name>
     <doc>Good default config for 'ppvar_wwan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_wwan_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="ppvar_wwan_x" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>ppvar_wwan_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_sensor_s5" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_mw</name>
     <doc>Power of 'pp1800_sensor_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="1.8" base_name="pp1800_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_sensor_s5" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_ma</name>
     <doc>Current of 'pp1800_sensor_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="1.8" base_name="pp1800_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_sensor_s5" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="1.8" base_name="pp1800_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_sensor_s5" rsense="0.1" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_ez_config</name>
     <doc>Good default config for 'pp1800_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_sensor_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="1.8" base_name="pp1800_sensor_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp1800_sensor_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_mv</name>
     <doc>Bus Voltage of 'pp5000_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_mw</name>
     <doc>Power of 'pp5000_hdmi_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ma</name>
     <doc>Current of 'pp5000_hdmi_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_hdmi_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_ez_config</name>
     <doc>Good default config for 'pp5000_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp5000_hdmi_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_hdmi_x" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp5000_hdmi_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_mv</name>
     <doc>Bus Voltage of 'pp3300_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_mw</name>
     <doc>Power of 'pp3300_hdmi_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ma</name>
     <doc>Current of 'pp3300_hdmi_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_hdmi_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_hdmi_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_ez_config</name>
     <doc>Good default config for 'pp3300_hdmi_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_hdmi_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_hdmi_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_hdmi_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_mw</name>
     <doc>Power of 'pp3300_ec_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ma</name>
     <doc>Current of 'pp3300_ec_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ec_z1" rsense="2.2" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_ez_config</name>
     <doc>Good default config for 'pp3300_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_ec_z1" tags="adc_ez_config_ctrls" nom="3.3" rsense="2.2">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="2.2" nom="3.3" base_name="pp3300_ec_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z1_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_ec_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_mw</name>
     <doc>Power of 'pp3300_ec_z2' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_ec_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_ec_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_ma</name>
     <doc>Current of 'pp3300_ec_z2' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_ec_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_ec_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ec_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_ec_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ec_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_ez_config</name>
     <doc>Good default config for 'pp3300_ec_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_ec_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_ec_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_ec_z2_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_mv</name>
     <doc>Bus Voltage of 'pp1800_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_mw</name>
     <doc>Power of 'pp1800_ec_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ma</name>
     <doc>Current of 'pp1800_ec_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_ec_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_ec_z1" rsense="2.2" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_ez_config</name>
     <doc>Good default config for 'pp1800_ec_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_ec_z1" tags="adc_ez_config_ctrls" nom="1.8" rsense="2.2">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="2.2" nom="1.8" base_name="pp1800_ec_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp1800_ec_z1_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j2</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_mv</name>
     <doc>Bus Voltage of 'ppvar_ec_vref_peci' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_ec_vref_peci">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_ec_vref_peci" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_mw</name>
     <doc>Power of 'ppvar_ec_vref_peci' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="ppvar_ec_vref_peci">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_ec_vref_peci" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_ma</name>
     <doc>Current of 'ppvar_ec_vref_peci' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="ppvar_ec_vref_peci">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_ec_vref_peci" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_ec_vref_peci' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_ec_vref_peci">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_ec_vref_peci" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_ez_config</name>
     <doc>Good default config for 'ppvar_ec_vref_peci' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_ec_vref_peci" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="ppvar_ec_vref_peci" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_ec_vref_peci_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_mv</name>
     <doc>Bus Voltage of 'ppvar_b' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="5.0" base_name="ppvar_b">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_b" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_b_mw</name>
     <doc>Power of 'ppvar_b' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="5.0" base_name="ppvar_b">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_b" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_b_ma</name>
     <doc>Current of 'ppvar_b' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="5.0" base_name="ppvar_b">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_b" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_b_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_b' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="5.0" base_name="ppvar_b">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_b" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_b_ez_config</name>
     <doc>Good default config for 'ppvar_b' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_b" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="5.0" base_name="ppvar_b" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_b_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_b_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>ppvar_b_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_mv</name>
     <doc>Bus Voltage of 'pp3300_edp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_mw</name>
     <doc>Power of 'pp3300_edp_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ma</name>
     <doc>Current of 'pp3300_edp_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_edp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_edp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_edp_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_ez_config</name>
     <doc>Good default config for 'pp3300_edp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_edp_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_edp_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_edp_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_sensor_s5" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_mw</name>
     <doc>Power of 'pp3300_sensor_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="3.3" base_name="pp3300_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_sensor_s5" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_ma</name>
     <doc>Current of 'pp3300_sensor_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="3.3" base_name="pp3300_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_sensor_s5" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_sensor_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="3.3" base_name="pp3300_sensor_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_sensor_s5" rsense="0.1" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_ez_config</name>
     <doc>Good default config for 'pp3300_sensor_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_sensor_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="3.3" base_name="pp3300_sensor_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="68" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_sensor_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="68" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="68">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_mv</name>
     <doc>Bus Voltage of 'pp3300_tchscr_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_mw</name>
     <doc>Power of 'pp3300_tchscr_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ma</name>
     <doc>Current of 'pp3300_tchscr_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_tchscr_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_tchscr_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_ez_config</name>
     <doc>Good default config for 'pp3300_tchscr_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_tchscr_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchscr_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchscr_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_mv</name>
     <doc>Bus Voltage of 'pp5000_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_mw</name>
     <doc>Power of 'pp5000_tchpad_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ma</name>
     <doc>Current of 'pp5000_tchpad_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_tchpad_x" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_ez_config</name>
     <doc>Good default config for 'pp5000_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp5000_tchpad_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_tchpad_x" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_tchpad_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_mv</name>
     <doc>Bus Voltage of 'pp3300_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_mw</name>
     <doc>Power of 'pp3300_tchpad_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ma</name>
     <doc>Current of 'pp3300_tchpad_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_tchpad_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_tchpad_x" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_ez_config</name>
     <doc>Good default config for 'pp3300_tchpad_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_tchpad_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_tchpad_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp3300_tchpad_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mv</name>
     <doc>Bus Voltage of 'ppvar_kb_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="5.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_mw</name>
     <doc>Power of 'ppvar_kb_bl' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="5.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ma</name>
     <doc>Current of 'ppvar_kb_bl' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="5.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_kb_bl' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="5.0" base_name="ppvar_kb_bl">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_kb_bl" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_ez_config</name>
     <doc>Good default config for 'ppvar_kb_bl' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_kb_bl" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="5.0" base_name="ppvar_kb_bl" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="69" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>ppvar_kb_bl_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="69" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="69">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_mv</name>
     <doc>Bus Voltage of 'pp5000_fan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.1" nom="5.0" base_name="pp5000_fan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_fan_x" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_mw</name>
     <doc>Power of 'pp5000_fan_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.1" nom="5.0" base_name="pp5000_fan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_fan_x" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_ma</name>
     <doc>Current of 'pp5000_fan_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.1" nom="5.0" base_name="pp5000_fan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_fan_x" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_fan_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.1" nom="5.0" base_name="pp5000_fan_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_fan_x" rsense="0.1" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_ez_config</name>
     <doc>Good default config for 'pp5000_fan_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp5000_fan_x" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.1">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.1" nom="5.0" base_name="pp5000_fan_x" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_fan_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_mv</name>
     <doc>Bus Voltage of 'pp1800_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_mw</name>
     <doc>Power of 'pp1800_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ma</name>
     <doc>Current of 'pp1800_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.8" base_name="pp1800_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_s5" rsense="0.005" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_s5_ez_config</name>
     <doc>Good default config for 'pp1800_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp1800_s5" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.8" base_name="pp1800_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp1800_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mv</name>
     <doc>Bus Voltage of 'pp3300_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_mw</name>
     <doc>Power of 'pp3300_s5' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ma</name>
     <doc>Current of 'pp3300_s5' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_s5' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="3.3" base_name="pp3300_s5">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_s5" rsense="0.005" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_s5_ez_config</name>
     <doc>Good default config for 'pp3300_s5' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_s5" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="3.3" base_name="pp3300_s5" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_s5_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_s5_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp3300_s5_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mv</name>
     <doc>Bus Voltage of 'pp5000_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_z1" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_mw</name>
     <doc>Power of 'pp5000_z1' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp5000_z1" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ma</name>
     <doc>Current of 'pp5000_z1' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp5000_z1" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_z1' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="pp5000_z1">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_z1" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_z1_ez_config</name>
     <doc>Good default config for 'pp5000_z1' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp5000_z1" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="pp5000_z1" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_z1_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="70" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_z1_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>pp5000_z1_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="70" reg_len="2" offset="7">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="70">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mv</name>
     <doc>Bus Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_sys" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_mw</name>
     <doc>Power of 'ppvar_sys' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="5.0" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="ppvar_sys" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ma</name>
     <doc>Current of 'ppvar_sys' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="5.0" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="ppvar_sys" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_sys' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="5.0" base_name="ppvar_sys">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_sys" rsense="0.01" nom="5.0">
     </params>
   </control>
   <control>
     <name>ppvar_sys_ez_config</name>
     <doc>Good default config for 'ppvar_sys' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="ppvar_sys" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="5.0" base_name="ppvar_sys" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="0">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="71" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_sys_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="1">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="2">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="3">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="4">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="5">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="6">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>ppvar_sys_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="5" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="7">
+    <params interface="5" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_mv</name>
     <doc>Bus Voltage of 'pp3300_fp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_mw</name>
     <doc>Power of 'pp3300_fp_x' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ma</name>
     <doc>Current of 'pp3300_fp_x' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_fp_x' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.5" nom="3.3" base_name="pp3300_fp_x">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_fp_x" rsense="0.5" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_ez_config</name>
     <doc>Good default config for 'pp3300_fp_x' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_fp_x" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.5">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.5" nom="3.3" base_name="pp3300_fp_x" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="0">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="71" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="1">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="2">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="3">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="4">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="5">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="6">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_fp_x_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="3" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="7">
+    <params interface="3" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_mv</name>
     <doc>Bus Voltage of 'pp3300_gsc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_gsc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_mw</name>
     <doc>Power of 'pp3300_gsc_z2' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.01" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_gsc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_ma</name>
     <doc>Current of 'pp3300_gsc_z2' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" rsense="0.01" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_gsc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_gsc_z2' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.01" nom="3.3" base_name="pp3300_gsc_z2">
+    <params cmd="get" interface="servo" drv="ina231" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_gsc_z2" rsense="0.01" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_ez_config</name>
     <doc>Good default config for 'pp3300_gsc_z2' rail</doc>
-    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" map="on" base_name="pp3300_gsc_z2" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.01">
+    <params cmd="set" interface="servo" drv="ina231" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.01" nom="3.3" base_name="pp3300_gsc_z2" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" map="ina231_cfg" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="0">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="71" map="ina231_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="1">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="2">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_pwr_reg</name>
     <doc>Raw register value of pwr on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="3">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_cur_reg</name>
     <doc>Raw register value of cur on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="4">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_cal_reg</name>
     <doc>Raw register value of cal on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="5">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="6">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="71">
     </params>
   </control>
   <control>
     <name>pp3300_gsc_z2_alrt_reg</name>
     <doc>Raw register value of alrt on i2c_mux:j3</doc>
-    <params interface="4" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="71" reg_len="2" offset="7">
+    <params interface="4" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="7" c2d2_interface="4" addr="71">
     </params>
   </control>
 </root>
\ No newline at end of file
diff --git a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/careena_r0_inas.xml b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/careena_r0_inas.xml
index c17bcc0..c02b62c 100644
--- a/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/careena_r0_inas.xml
+++ b/chroot/build/arm-generic/usr/lib/python3.6/site-packages/servo/data/careena_r0_inas.xml
@@ -1,655 +1,655 @@
 <?xml version="1.0"?>
 <root>
-<!-- Autogenerated on Thu Sep 15 19:08:54 2022 -->
+<!-- Autogenerated on Fri Sep 16 01:18:25 2022 -->
   <include>
     <name>ina2xx.xml</name>
   </include>
   <control>
     <name>pp3300_a_mv</name>
     <doc>Bus Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_a" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_a_mw</name>
     <doc>Power of 'pp3300_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_a" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_a_ma</name>
     <doc>Current of 'pp3300_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_a" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_a" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_a_ez_config</name>
     <doc>Good default config for 'pp3300_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_a" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_a" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp3300_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp5000_a_mv</name>
     <doc>Bus Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp5000_a" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_mw</name>
     <doc>Power of 'pp5000_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp5000_a" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ma</name>
     <doc>Current of 'pp5000_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.02" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp5000_a" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp5000_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="5.0" base_name="pp5000_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp5000_a" rsense="0.02" nom="5.0">
     </params>
   </control>
   <control>
     <name>pp5000_a_ez_config</name>
     <doc>Good default config for 'pp5000_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp5000_a" tags="adc_ez_config_ctrls" nom="5.0" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="5.0" base_name="pp5000_a" map="on">
     </params>
   </control>
   <control>
     <name>pp5000_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp5000_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp5000_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp5000_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_a_mv</name>
     <doc>Bus Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="1.8" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1800_a" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_a_mw</name>
     <doc>Power of 'pp1800_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="1.8" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp1800_a" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_a_ma</name>
     <doc>Current of 'pp1800_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.02" nom="1.8" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp1800_a" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp1800_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="1.8" base_name="pp1800_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1800_a" rsense="0.02" nom="1.8">
     </params>
   </control>
   <control>
     <name>pp1800_a_ez_config</name>
     <doc>Good default config for 'pp1800_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp1800_a" tags="adc_ez_config_ctrls" nom="1.8" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="1.8" base_name="pp1800_a" map="on">
     </params>
   </control>
   <control>
     <name>pp1800_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="64" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1800_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1800_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="64" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="64">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mv</name>
     <doc>Bus Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="1.2" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp1200_vddq" rsense="0.005" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_mw</name>
     <doc>Power of 'pp1200_vddq' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="1.2" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp1200_vddq" rsense="0.005" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ma</name>
     <doc>Current of 'pp1200_vddq' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.005" nom="1.2" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp1200_vddq" rsense="0.005" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shuntmv</name>
     <doc>Shunt Voltage of 'pp1200_vddq' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="1.2" base_name="pp1200_vddq">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp1200_vddq" rsense="0.005" nom="1.2">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_ez_config</name>
     <doc>Good default config for 'pp1200_vddq' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp1200_vddq" tags="adc_ez_config_ctrls" nom="1.2" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="1.2" base_name="pp1200_vddq" map="on">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp1200_vddq_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_mv</name>
     <doc>Bus Voltage of 'ppvar_vddcr_nb' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="0.875" base_name="ppvar_vddcr_nb">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vddcr_nb" rsense="0.005" nom="0.875">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_mw</name>
     <doc>Power of 'ppvar_vddcr_nb' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="0.875" base_name="ppvar_vddcr_nb">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="ppvar_vddcr_nb" rsense="0.005" nom="0.875">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_ma</name>
     <doc>Current of 'ppvar_vddcr_nb' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.005" nom="0.875" base_name="ppvar_vddcr_nb">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="ppvar_vddcr_nb" rsense="0.005" nom="0.875">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vddcr_nb' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="0.875" base_name="ppvar_vddcr_nb">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vddcr_nb" rsense="0.005" nom="0.875">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_ez_config</name>
     <doc>Good default config for 'ppvar_vddcr_nb' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="ppvar_vddcr_nb" tags="adc_ez_config_ctrls" nom="0.875" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="0.875" base_name="ppvar_vddcr_nb" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_nb_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_mv</name>
     <doc>Bus Voltage of 'ppvar_vddcr' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.005" nom="0.85" base_name="ppvar_vddcr">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="ppvar_vddcr" rsense="0.005" nom="0.85">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_mw</name>
     <doc>Power of 'ppvar_vddcr' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.005" nom="0.85" base_name="ppvar_vddcr">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="ppvar_vddcr" rsense="0.005" nom="0.85">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_ma</name>
     <doc>Current of 'ppvar_vddcr' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.005" nom="0.85" base_name="ppvar_vddcr">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="ppvar_vddcr" rsense="0.005" nom="0.85">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_shuntmv</name>
     <doc>Shunt Voltage of 'ppvar_vddcr' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.005" nom="0.85" base_name="ppvar_vddcr">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="ppvar_vddcr" rsense="0.005" nom="0.85">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_ez_config</name>
     <doc>Good default config for 'ppvar_vddcr' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="ppvar_vddcr" tags="adc_ez_config_ctrls" nom="0.85" rsense="0.005">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.005" nom="0.85" base_name="ppvar_vddcr" map="on">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="65" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>ppvar_vddcr_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="65" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="65">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_mv</name>
     <doc>Bus Voltage of 'pp3300_tcpc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.51" nom="3.3" base_name="pp3300_tcpc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_tcpc" rsense="0.51" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_mw</name>
     <doc>Power of 'pp3300_tcpc' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.51" nom="3.3" base_name="pp3300_tcpc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_tcpc" rsense="0.51" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_ma</name>
     <doc>Current of 'pp3300_tcpc' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.51" nom="3.3" base_name="pp3300_tcpc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_tcpc" rsense="0.51" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_tcpc' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.51" nom="3.3" base_name="pp3300_tcpc">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_tcpc" rsense="0.51" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_ez_config</name>
     <doc>Good default config for 'pp3300_tcpc' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_tcpc" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.51">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.51" nom="3.3" base_name="pp3300_tcpc" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_tcpc_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_mv</name>
     <doc>Bus Voltage of 'pp3300_ec_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" rsense="0.51" nom="3.3" base_name="pp3300_ec_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_ec_a" rsense="0.51" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_mw</name>
     <doc>Power of 'pp3300_ec_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" rsense="0.51" nom="3.3" base_name="pp3300_ec_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliwatts" tags="power_rail" base_name="pp3300_ec_a" rsense="0.51" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_ma</name>
     <doc>Current of 'pp3300_ec_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" rsense="0.51" nom="3.3" base_name="pp3300_ec_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="milliamps" tags="current_rail" base_name="pp3300_ec_a" rsense="0.51" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_ec_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.51" nom="3.3" base_name="pp3300_ec_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="1" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_ec_a" rsense="0.51" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_ez_config</name>
     <doc>Good default config for 'pp3300_ec_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" map="on" base_name="pp3300_ec_a" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.51">
+    <params cmd="set" interface="servo" drv="ina3221" channel="1" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.51" nom="3.3" base_name="pp3300_ec_a" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="3">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="3" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="4">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="4" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_ec_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp950_a_mv</name>
     <doc>Bus Voltage of 'pp950_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="0.95" base_name="pp950_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="millivolts" tags="bus_voltage_rail" base_name="pp950_a" rsense="0.02" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_a_mw</name>
     <doc>Power of 'pp950_a' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="0.95" base_name="pp950_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliwatts" tags="power_rail" base_name="pp950_a" rsense="0.02" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_a_ma</name>
     <doc>Current of 'pp950_a' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" rsense="0.02" nom="0.95" base_name="pp950_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="milliamps" tags="current_rail" base_name="pp950_a" rsense="0.02" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_a_shuntmv</name>
     <doc>Shunt Voltage of 'pp950_a' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="0.95" base_name="pp950_a">
+    <params cmd="get" interface="servo" drv="ina3221" channel="2" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp950_a" rsense="0.02" nom="0.95">
     </params>
   </control>
   <control>
     <name>pp950_a_ez_config</name>
     <doc>Good default config for 'pp950_a' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" map="on" base_name="pp950_a" tags="adc_ez_config_ctrls" nom="0.95" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="2" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="0.95" base_name="pp950_a" map="on">
     </params>
   </control>
   <control>
     <name>pp950_a_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="66" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp950_a_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="5">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="5" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp950_a_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="6">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="6" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp950_a_msken_reg</name>
     <doc>Raw register value of msken on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="66" reg_len="2" offset="15">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="15" c2d2_interface="4" addr="66">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mv</name>
     <doc>Bus Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="millivolts" tags="bus_voltage_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_mw</name>
     <doc>Power of 'pp3300_wlan' rail in milliwatts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliwatts" tags="power_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ma</name>
     <doc>Current of 'pp3300_wlan' rail in milliamps</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="milliamps" tags="current_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shuntmv</name>
     <doc>Shunt Voltage of 'pp3300_wlan' rail in millivolts</doc>
-    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" rsense="0.02" nom="3.3" base_name="pp3300_wlan">
+    <params cmd="get" interface="servo" drv="ina3221" channel="0" subtype="shuntmv" tags="shunt_voltage_rail" base_name="pp3300_wlan" rsense="0.02" nom="3.3">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_ez_config</name>
     <doc>Good default config for 'pp3300_wlan' rail</doc>
-    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" map="on" base_name="pp3300_wlan" tags="adc_ez_config_ctrls" nom="3.3" rsense="0.02">
+    <params cmd="set" interface="servo" drv="ina3221" channel="0" subtype="ez_config" tags="adc_ez_config_ctrls" rsense="0.02" nom="3.3" base_name="pp3300_wlan" map="on">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_cfg_reg</name>
     <doc>Raw register value of cfg on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" map="ina3221_cfg" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="0">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="0" c2d2_interface="4" addr="67" map="ina3221_cfg">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_shv_reg</name>
     <doc>Raw register value of shv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="1">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="1" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_busv_reg</name>
     <doc>Raw register value of busv on i2c_mux:rem</doc>
-    <params interface="2" drv="i2c_reg_drv" c2d2_interface="4" fmt="hex" addr="67" reg_len="2" offset="2">
+    <params interface="2" drv="i2c_reg_drv" fmt="hex" reg_len="2" offset="2" c2d2_interface="4" addr="67">
     </params>
   </control>
   <control>
     <name>pp3300_wlan_msken_reg